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.

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

[Observability] Fix integrations detected twice #198670

Merged

Conversation

thomheymann
Copy link
Contributor

@thomheymann thomheymann commented Nov 1, 2024

Resolves #195912

Summary

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

@thomheymann thomheymann added release_note:skip Skip the PR/issue when compiling release notes backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) labels Nov 1, 2024
@thomheymann thomheymann marked this pull request as ready for review November 1, 2024 15:35
@thomheymann thomheymann requested a review from a team as a code owner November 1, 2024 15:35
@thomheymann thomheymann requested a review from a team November 1, 2024 15:35
@@ -34,9 +34,9 @@ patterns=
title=PostgreSQL
patterns=
/var/log/postgresql/postgresql-*-*.log*
/var/log/postgresql/postgresql-*-*.csv*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this change important?

Copy link
Contributor

@mykolaharmash mykolaharmash Nov 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

postres integration has this pattern in its data stream manifest, we need to detect it as well

@botelastic botelastic bot added the ci:project-deploy-observability Create an Observability project label Nov 4, 2024
Copy link
Contributor

github-actions bot commented Nov 4, 2024

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ux-onboarding-team (Feature: Observability Onboarding)

@flash1293 flash1293 added the Team:obs-ux-logs Observability Logs User Experience Team label Nov 6, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ux-logs-team (Team:obs-ux-logs)

@elasticmachine
Copy link
Contributor

⏳ Build in-progress

  • Buildkite Build
  • Commit: 0d2237c
  • Kibana Serverless Image: docker.elastic.co/kibana-ci/kibana-serverless:pr-198670-0d2237c1ecb0

History

@flash1293 flash1293 added release_note:fix and removed release_note:skip Skip the PR/issue when compiling release notes labels Nov 6, 2024
@flash1293 flash1293 added v8.16.0 and removed v8.16.1 labels Nov 6, 2024
@flash1293 flash1293 merged commit f410085 into elastic:main Nov 6, 2024
41 of 42 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.x

https://github.com/elastic/kibana/actions/runs/11708248378

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 6, 2024
Resolves [elastic#195912](elastic#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)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 6, 2024
Resolves [elastic#195912](elastic#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)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.16
8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Nov 6, 2024
)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Observability] Fix integrations detected twice
(#198670)](#198670)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Thom
Heymann","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-06T16:55:33Z","message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-logs","Feature:
Observability Onboarding","v8.16.0","v8.17.0"],"title":"[Observability]
Fix integrations detected
twice","number":198670,"url":"https://github.com/elastic/kibana/pull/198670","mergeCommit":{"message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198670","number":198670,"mergeCommit":{"message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Thom Heymann <[email protected]>
kibanamachine added a commit that referenced this pull request Nov 6, 2024
…9183)

# Backport

This will backport the following commits from `main` to `8.16`:
- [[Observability] Fix integrations detected twice
(#198670)](#198670)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Thom
Heymann","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-06T16:55:33Z","message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-logs","Feature:
Observability Onboarding","v8.16.0","v8.17.0"],"title":"[Observability]
Fix integrations detected
twice","number":198670,"url":"https://github.com/elastic/kibana/pull/198670","mergeCommit":{"message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198670","number":198670,"mergeCommit":{"message":"[Observability]
Fix integrations detected twice (#198670)\n\nResolves
[#195912](https://github.com/elastic/kibana/issues/195912)\r\n\r\n##
Summary\r\n\r\nFixes an issue where integrations were displayed twice in
the list of\r\ndetected log files.\r\n\r\nCo-authored-by: Joe Reuter
<[email protected]>","sha":"f410085ffc6e37f284ff72b034ca177f536f7121"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Thom Heymann <[email protected]>
mgadewoll pushed a commit to mgadewoll/kibana that referenced this pull request Nov 7, 2024
Resolves [elastic#195912](elastic#195912)

## Summary

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

Co-authored-by: Joe Reuter <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (8.x) the previous minor version (i.e. one version back from main) ci:project-deploy-observability Create an Observability project Feature: Observability Onboarding release_note:fix Team:obs-ux-logs Observability Logs User Experience Team v8.16.0 v8.17.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Observability Onboarding] Auto-detect flow: Postgres detected twice
5 participants