Skip to content

[8.7](backport #34946) Log any FQDN lookup errors and fallback to OS-reported hostname#34971

Merged
ycombinator merged 4 commits into8.7from
mergify/bp/8.7/pr-34946
Apr 6, 2023
Merged

[8.7](backport #34946) Log any FQDN lookup errors and fallback to OS-reported hostname#34971
ycombinator merged 4 commits into8.7from
mergify/bp/8.7/pr-34946

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Mar 30, 2023 •
edited by zube bot
Loading

This is an automatic backport of pull request #34946 done by Mergify.
Cherry-pick of 895505c has failed:

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

You are currently cherry-picking commit 895505cffe.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/cmd/instance/beat.go
	both modified:   libbeat/processors/add_host_metadata/add_host_metadata.go
	both modified:   libbeat/processors/add_host_metadata/add_host_metadata_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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 March 30, 2023 01:14
@mergify mergify bot requested review from fearful-symmetry and ycombinator and removed request for a team March 30, 2023 01:14
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 30, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 30, 2023
@botelastic
Copy link
Copy Markdown

botelastic bot commented Mar 30, 2023

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Mar 30, 2023 •
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

  • Start Time: 2023-04-06T04:17:05.518+0000

  • Duration: 98 min 22 sec

Test stats 🧪

Test Results
Failed 0
Passed 25969
Skipped 1968
Total 27937

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 3, 2023

This pull request has not been merged yet. Could you please review and merge it @ycombinator? 🙏

@ycombinator ycombinator force-pushed the mergify/bp/8.7/pr-34946 branch from 0e5689c to 52419c8 Compare April 5, 2023 14:48
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 5, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.7/pr-34946 upstream/mergify/bp/8.7/pr-34946
git merge upstream/8.7
git push upstream mergify/bp/8.7/pr-34946

@ycombinator ycombinator force-pushed the mergify/bp/8.7/pr-34946 branch from 52419c8 to a01047d Compare April 5, 2023 18:26
@ycombinator
Copy link
Copy Markdown
Contributor

ycombinator commented Apr 5, 2023

/test

@ycombinator ycombinator mentioned this pull request Apr 5, 2023
Merged
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 6, 2023

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.7/pr-34946 upstream/mergify/bp/8.7/pr-34946
git merge upstream/8.7
git push upstream mergify/bp/8.7/pr-34946

@ycombinator
Log any FQDN lookup errors and fallback to OS-reported hostname (#34946)
64a1a32 
* Log any FQDN lookup errors, fallback to OS hostname, and move on.

* Implement fallback logic

* Bumping up go-sysinfo dependency version

* Update call to host.ReportInfo

* Better log message

* Bumping up version on elastic-agent-system-metrics dependency

* Updating NOTICE.txt

* Log FQDN lookup failure as warning

* Move FQDN initialization to after logging has been configured

* Better log message

* Add metric + test

* Update NOTICE.txt

* Use a single namespace for all add_host_metadata processor instances' monitoring

* Fixing imports

* Create monitoring registry only once

* Check errors

(cherry picked from commit 895505c)
@ycombinator
Making changes lost in rebase
5381052
@ycombinator
Fixing conflicts
1d27cda
@ycombinator
Reordering imports
32c23eb
@ycombinator ycombinator force-pushed the mergify/bp/8.7/pr-34946 branch from 0beb891 to 32c23eb Compare April 6, 2023 04:16
@ycombinator ycombinator merged commit e3fc145 into 8.7 Apr 6, 2023
@ycombinator ycombinator deleted the mergify/bp/8.7/pr-34946 branch April 6, 2023 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ycombinator ycombinator Awaiting requested review from ycombinator ycombinator is a code owner automatically assigned from elastic/elastic-agent-data-plane

@fearful-symmetry fearful-symmetry Awaiting requested review from fearful-symmetry fearful-symmetry is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@ycombinator ycombinator

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @ycombinator