Skip config check in autodiscover for duplicated configurations #29048

jsoriano · 2021-11-19T10:28:17Z

What does this PR do?

Skips configuration checks for configurations that are already running,
and were then already checked.

Why is it important?

If the configuration is already running, it has been already checked,
don't try to check it again to avoid problems with configuration checks
that fail if some resource already exist with the same identifiers.

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

[ ]

How to test this PR locally

Related issues

Related to [Heartbeat] Autodiscover monitor config collisions #29015.

Use cases

Heartbeat configurations cannot have the same ID, this is checked already in CheckConfig. On these case, if there is a configuration already running, autodiscover shouldn't need to check the config again, that is going to fail.

Screenshots

Logs

If the configuration is already running, it has been already checked, don't try to check it again to avoid problems with configuration checks that fail if some resource already exist with the same identifiers.

elasticmachine · 2021-11-19T10:28:19Z

Pinging @elastic/integrations (Team:Integrations)

elasticmachine · 2021-11-19T10:28:19Z

Pinging @elastic/uptime (Team:Uptime)

jsoriano · 2021-11-19T10:28:39Z

/package

mergify · 2021-11-19T10:28:40Z

This pull request does not have a backport label. Could you fix it @jsoriano? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-v./d./d./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

ChrsMark

lgtm

elasticmachine · 2021-11-19T12:24:27Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2021-11-23T17:30:01.123+0000
Duration: 106 min 3 sec
Commit: 91fd5da

Test stats 🧪

Test	Results
Failed	0
Passed	48528
Skipped	4286
Total	52814

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

libbeat/autodiscover/autodiscover.go

…heck-config-not-used

jsoriano · 2021-11-22T14:38:44Z

Failure is unrelated, it looks related to the recent changes in beat module fields.

ChrsMark

lgtm, feel free to merge since CI is already broken.

jsoriano · 2021-11-22T14:56:54Z

/package

jsoriano · 2021-11-23T09:34:45Z

E2E failures may be related, I will check.

jsoriano · 2021-11-23T14:33:08Z

E2E tests use the file output to check events, this output seems to be affected by this change: #28927, investigating...

jsoriano · 2021-11-23T16:51:51Z

PR to address changes in the file output elastic/e2e-testing#1829

…heck-config-not-used

jsoriano · 2021-11-23T19:41:40Z

/package

If the configuration is already running, it has been already checked, don't try to check it again to avoid problems with configuration checks that fail if some resource already exist with the same identifiers. (cherry picked from commit 1207d63)

…ws-on-file-changes * upstream/master: override host on statsd metricset (elastic#29103) Skip config check in autodiscover for duplicated configurations (elastic#29048) Change "filebeat.config.modules.enabled" to "true" (elastic#28769) Remove deprecated spool queue from Beats (elastic#28869) Add `beat` field back to beat.stats (elastic#29094) Revert "Move labels and annotations under kubernetes.namespace. (elastic#27917)" (elastic#29069) heartbeat: remove w2008 in the CI (elastic#29093) Remove deprecated `--template` and `--index-policy` flags (elastic#28870) Fix parsing of apache trace log levels (elastic#28717) [Elastic-Agent] IUse itnernal port for local fleet server (elastic#28993) [Heartbeat] Log error on dupe monitor ID instead of strict req (elastic#29041) Enable pprof for elastic-agent and beats (elastic#28983)

…) (#29119) If the configuration is already running, it has been already checked, don't try to check it again to avoid problems with configuration checks that fail if some resource already exist with the same identifiers. (cherry picked from commit 1207d63) Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

…) (#29118) If the configuration is already running, it has been already checked, don't try to check it again to avoid problems with configuration checks that fail if some resource already exist with the same identifiers. (cherry picked from commit 1207d63) Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co>

* upstream/master: (577 commits) Remove Journalbeat (elastic#29131) Add note that there is no warranty or support for generator code (elastic#28797) packetbeat: preparation for npcap addition (elastic#29017) Use the generic helper for opening file to read in filestream (elastic#29180) Workflow for macos (elastic#29174) Fix `decode_json_fields` processor to always add error key (elastic#29107) Workflow for macos (elastic#29156) Fix agent download timeout values in yaml files (elastic#29039) Added workflow file for builds with macos (elastic#29148) CI: enable AWS cloud testing on a PR basis if changes in certain files (elastic#29047) Remove links to Journalbeat (elastic#29134) Fix rds metadata in cloudwatch metricset (elastic#29106) [mergify]: notify conflicts in PRs that are still open (elastic#29122) Use NamedWatcher in Agent's k8s provider (elastic#29095) override host on statsd metricset (elastic#29103) Skip config check in autodiscover for duplicated configurations (elastic#29048) Change "filebeat.config.modules.enabled" to "true" (elastic#28769) Remove deprecated spool queue from Beats (elastic#28869) Add `beat` field back to beat.stats (elastic#29094) Revert "Move labels and annotations under kubernetes.namespace. (elastic#27917)" (elastic#29069) ...

Skip config check in autodiscover for duplicated configurations

9f85ce0

If the configuration is already running, it has been already checked, don't try to check it again to avoid problems with configuration checks that fail if some resource already exist with the same identifiers.

jsoriano added Team:Integrations Label for the Integrations team Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Nov 19, 2021

jsoriano requested review from andrewvc and ChrsMark November 19, 2021 10:28

jsoriano self-assigned this Nov 19, 2021

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Nov 19, 2021

mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 19, 2021

Add changelog

bd3b87e

jsoriano added backport-v7.16.0 Automated backport with mergify backport-v8.0.0 Automated backport with mergify labels Nov 19, 2021

mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 19, 2021

ChrsMark approved these changes Nov 19, 2021

View reviewed changes

andrewvc reviewed Nov 19, 2021

View reviewed changes

libbeat/autodiscover/autodiscover.go Show resolved Hide resolved

jsoriano added 2 commits November 19, 2021 17:20

Add tests

74e7167

Merge remote-tracking branch 'origin/master' into autodiscover-dont-c…

096cd00

…heck-config-not-used

ChrsMark mentioned this pull request Nov 22, 2021

Improve performance of autodiscover #28524

Closed

6 tasks

jsoriano requested a review from ChrsMark November 22, 2021 14:52

ChrsMark approved these changes Nov 22, 2021

View reviewed changes

andrewvc approved these changes Nov 22, 2021

View reviewed changes

Merge remote-tracking branch 'origin/master' into autodiscover-dont-c…

91fd5da

…heck-config-not-used

jsoriano merged commit 1207d63 into elastic:master Nov 24, 2021

jsoriano deleted the autodiscover-dont-check-config-not-used branch November 24, 2021 08:40

mergify bot mentioned this pull request Nov 24, 2021

[7.16](backport #29048) Skip config check in autodiscover for duplicated configurations #29118

Merged

mergify bot mentioned this pull request Nov 24, 2021

[8.0](backport #29048) Skip config check in autodiscover for duplicated configurations #29119

Merged

justinkambic mentioned this pull request Jan 11, 2022

[Heartbeat] Autodiscover monitor config collisions #29015

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Skip config check in autodiscover for duplicated configurations #29048

Skip config check in autodiscover for duplicated configurations #29048

jsoriano commented Nov 19, 2021 •

edited

Loading

elasticmachine commented Nov 19, 2021

elasticmachine commented Nov 19, 2021

jsoriano commented Nov 19, 2021

mergify bot commented Nov 19, 2021

ChrsMark left a comment

elasticmachine commented Nov 19, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

jsoriano commented Nov 22, 2021

ChrsMark left a comment

jsoriano commented Nov 22, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

Skip config check in autodiscover for duplicated configurations #29048

Skip config check in autodiscover for duplicated configurations #29048

Conversation

jsoriano commented Nov 19, 2021 • edited Loading

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

elasticmachine commented Nov 19, 2021

elasticmachine commented Nov 19, 2021

jsoriano commented Nov 19, 2021

mergify bot commented Nov 19, 2021

ChrsMark left a comment

Choose a reason for hiding this comment

elasticmachine commented Nov 19, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

jsoriano commented Nov 22, 2021

ChrsMark left a comment

Choose a reason for hiding this comment

jsoriano commented Nov 22, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 23, 2021

jsoriano commented Nov 19, 2021 •

edited

Loading

elasticmachine commented Nov 19, 2021 •

edited by jenkins-beats-ci bot

Loading