Skip to content

Commit

Permalink
Merge pull request #45 from jfrog/PTRENG-5967
Browse files Browse the repository at this point in the history
Fix artifactory access log regex to match input
  • Loading branch information
benharosh authored Apr 11, 2024
2 parents ffbf241 + bc6fad1 commit a55203a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# User-specific stuff
/.idea/
.DS_Store

# Gradle
/.gradle
build/
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,52 @@
# JFrog Log Analytics Changelog

All changes to the log analytics integration will be documented in this file.

## [1.0.1] - April 11, 2023

* Fix Artifactory access's regex to match log input changes

## [1.0.0] - Jun 22, 2023

* Supporting only OS/VM, Docker and k8s installation types
* Adding .env files instead of setting/filling variables in fluentd config
* Adding jfrog and heap callhome in fluentd config
* Supporting only Artifactory and Xray Fluentd config

## [0.8.0] - Feb 09, 2022

* Added call home functionality to artifactory fluent configuration.

## [0.7.0] - Oct 20, 2020

* Fixing issue with ip_address in access logs having space and . at the end

## [0.6.0] - Sept 25, 2020

* [BREAKING] Datadog fluentd configs updated to use JF_PRODUCT_DATA_INTERNAL env.

## [0.5.0] - Sept 8, 2020

* Adding JFrog Pipelines fluent configuration files to capture logs

## [0.4.0] - Sept 4, 2020

* Adding JFrog Mission Control fluent configuration files to capture logs

## [0.3.0] - Aug 26, 2020

* Adding JFrog Distribution fluent configuration files to capture logs

## [0.2.0] - Aug 24, 2020

* Splunk updates to launch new version of Splunkbase app v1.1.0

## [0.1.1] - June 1, 2020

* Removing the need for user to specify splunk host , user, and token twice
* Fixing issue with regex on the audit security log
* Fixed issue with the repo and image when not docker api url

## [0.1.0] - May 12, 2020
* Initial release of Jfrog Logs Analytic integration

* Initial release of Jfrog Logs Analytic integration
2 changes: 1 addition & 1 deletion fluent.conf.rt
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
tag jfrog.rt.artifactory.access
<parse>
@type regexp
expression /^(?<log_timestamp>[^ ]*) \[(?<trace_id>[^\]]*)\] \[(?<action_response>[^\]]*)\] (?<repo_path>.*) for client : (?<username>.+)\/(?<ip>\s*\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3})\.(?<message>.+)?$/
expression /^(?<log_timestamp>[^\s]*) \[(?<trace_id>[^\s\]]*)\s*\] \[(?<action_response>[^\]\r\n]*)\] (?<repo_path>[^\s]*)? *for client : *(?<username>[^\s]*) *\/ *(?<ip>[^\s]*)? ?(\[(?<token>[^\s]*)\])?$/
</parse>
</source>
## AUDIT LOG
Expand Down

0 comments on commit a55203a

Please sign in to comment.