Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] [Observability] Fix integrations detected twice (#198670) #199184

Merged
merged 1 commit into from
Nov 6, 2024
+24 −8
Merged

[8.x] [Observability] Fix integrations detected twice (#198670) #199184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions x-pack/plugins/observability_solution/observability_onboarding/public/assets/auto_detect.sh
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...k/plugins/observability_solution/observability_onboarding/public/assets/integrations.conf
View file
Open in desktop
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