Skip to content

[7.16](backport #29041) [Heartbeat] Log error on dupe monitor ID instead of strict req#29082

Merged
vigneshshanmugam merged 2 commits into7.16from
mergify/bp/7.16/pr-29041
Nov 23, 2021
Merged

[7.16](backport #29041) [Heartbeat] Log error on dupe monitor ID instead of strict req#29082
vigneshshanmugam merged 2 commits into7.16from
mergify/bp/7.16/pr-29041

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Nov 22, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #29041 done by Mergify.
Cherry-pick of dbca099 has failed:

On branch mergify/bp/7.16/pr-29041
Your branch is up to date with 'origin/7.16'.

You are currently cherry-picking commit dbca099f0c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   heartbeat/monitors/factory_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   heartbeat/beater/heartbeat.go
	both modified:   heartbeat/monitors/factory.go
	both modified:   heartbeat/monitors/monitor.go
	both modified:   heartbeat/monitors/monitor_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team as a code owner November 22, 2021 21:47
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 22, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 22, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

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

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 72 min 8 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 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!)

@andrewvc andrewvc force-pushed the mergify/bp/7.16/pr-29041 branch from 320a8a8 to 96cbf50 Compare November 22, 2021 23:53
@andrewvc
Copy link
Copy Markdown
Contributor

andrewvc commented Nov 23, 2021

I couldn't merge this backport cleanly without also cherry-picking #8023. This actually removes a feature, "watch poll files" which were marked as obsolete in 6.5.0 , over 3 years ago. It was rarely used then, and 7.x users have received the warning "Obsolete option 'watch.poll_file' declared. This will be removed in a future release.
See https://www.elastic.co/guide/en/beats/heartbeat/current/configuration-heartbeat-options.html for more info" since that time. Unless there's an objection I think it's OK to merge this as-is.

@andrewvc andrewvc added the Team:obs-ds-hosted-services Label for the Observability Hosted Services team label Nov 23, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 23, 2021

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 23, 2021
vigneshshanmugam
vigneshshanmugam approved these changes Nov 23, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

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

LGTM

justinkambic
justinkambic approved these changes Nov 23, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@justinkambic justinkambic left a comment

Choose a reason for hiding this comment

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

LGTM

@vigneshshanmugam vigneshshanmugam merged commit 1badd70 into 7.16 Nov 23, 2021
@vigneshshanmugam vigneshshanmugam deleted the mergify/bp/7.16/pr-29041 branch November 23, 2021 01:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vigneshshanmugam vigneshshanmugam vigneshshanmugam approved these changes

@justinkambic justinkambic justinkambic approved these changes

Assignees

@andrewvc andrewvc

Labels

backport conflicts There is a conflict in the backported pull request Team:obs-ds-hosted-services Label for the Observability Hosted Services team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @andrewvc @vigneshshanmugam @justinkambic