Skip to content

Commit

Permalink
[Observability] Fix integrations detected twice (#198670)
Browse files Browse the repository at this point in the history
Resolves [#195912](#195912)

## Summary

Fixes an issue where integrations were displayed twice in the list of
detected log files.

Co-authored-by: Joe Reuter <[email protected]>
(cherry picked from commit f410085)
  • Loading branch information
thomheymann committed Nov 6, 2024
1 parent 4e53ca9 commit e5aad9a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,31 @@ apply_elastic_agent_config() {

read_open_log_file_list() {
local exclude_patterns=(
"^\/Users\/.+?\/Library\/Application Support"
"^\/Users\/.+?\/Library\/Group Containers"
"^\/Users\/.+?\/Library\/Containers"
"^\/Users\/.+?\/Library\/Caches"
"^\/private"
"^\/Users\/.+?\/Library\/Application Support\/"
"^\/Users\/.+?\/Library\/Group Containers\/"
"^\/Users\/.+?\/Library\/Containers\/"
"^\/Users\/.+?\/Library\/Caches\/"
"^\/private\/"

# Integrations only ingest a subset of application logs so there are scenarios where additional
# log files could be detected and displayed as a "custom log" alongside the detected integration
# they belong to. To avoid this UX issue we exclude all log files inside application directories
# from the custom log file detection
"^\/var\/log\/nginx\/"
"^\/var\/log\/apache2\/"
"^\/var\/log\/httpd\/"
"^\/var\/log\/mysql\/"
"^\/var\/log\/postgresql\/"
"^\/var\/log\/redis\/"
"^\/var\/log\/rabbitmq\/"
"^\/var\/log\/kafka\/"
"^\/var\/log\/mongodb\/"
"^\/opt\/tomcat\/logs\/"
"^\/var\/log\/prometheus\/"

# Exclude previous installation logs
"\/opt\/Elastic\/Agent\/"
"\/Library\/Elastic\/Agent\/"
"^\/opt\/Elastic\/Agent\/"
"^\/Library\/Elastic\/Agent\/"
)

# Excluding all patterns that correspond to known integrations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ patterns=
title=PostgreSQL Logs
patterns=
/var/log/postgresql/postgresql-*-*.log*
/var/log/postgresql/postgresql-*-*.csv*
/*/postgresql-logs/*.log
/etc/postgresql/*/main/postgresql.conf
/var/log/postgresql/postgresql-*-*.csv*

[redis]
title=Redis Logs
Expand Down

0 comments on commit e5aad9a

Please sign in to comment.