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

Jump to bottom

Add beat field back to beat.stats #29094

Merged
merged 2 commits into from
Nov 23, 2021
Merged

Add beat field back to beat.stats #29094

merged 2 commits into from
Nov 23, 2021

Conversation

sayden
Copy link
Contributor

@sayden sayden commented Nov 23, 2021

What does this PR do?

On this PR #28782 Beats renamed field beat.stats.beat.* to a new value beat.stats.info.*. This PR brings back the old value beat.stats.beat.*, along beat.stats.info.* to avoid breaking stuff.

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.

@sayden sayden self-assigned this Nov 23, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/stack-monitoring (Stack monitoring)

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 23, 2021
@botelastic
Copy link

botelastic bot commented Nov 23, 2021

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

@mergify
Copy link
Contributor

mergify bot commented Nov 23, 2021

This pull request does not have a backport label. Could you fix it @sayden? 🙏
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.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@jsoriano
Copy link
Member

Please, cherry-pick this change into #29052.

jsoriano
jsoriano approved these changes Nov 23, 2021
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

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

Thanks @sayden!

@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 23, 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

  • Start Time: 2021-11-23T11:08:53.242+0000

  • Duration: 86 min 30 sec

  • Commit: 1d67bd7

Test stats 🧪

Test Results
Failed 0
Passed 9361
Skipped 2422
Total 11783

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

@sayden sayden added the backport-v8.0.0 Automated backport with mergify label Nov 23, 2021
@mergify mergify bot removed the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2021
@jsoriano jsoriano mentioned this pull request Nov 23, 2021
Merged
@kvch kvch mentioned this pull request Nov 23, 2021
Merged
3 tasks
@sayden sayden merged commit 24f4410 into elastic:master Nov 23, 2021
mergify bot pushed a commit that referenced this pull request Nov 23, 2021
@sayden
Add beat field back to beat.stats (#29094)
8ca69a1 
(cherry picked from commit 24f4410)

# Conflicts:
#	metricbeat/module/beat/fields.go
@mergify mergify bot mentioned this pull request Nov 23, 2021
Merged
v1v added a commit to v1v/beats that referenced this pull request Nov 24, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/support-a…
3c5dac0 
…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)
v1v added a commit to v1v/beats that referenced this pull request Nov 30, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-debian-9
53d5763 
* 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)
  ...
sayden pushed a commit that referenced this pull request Dec 14, 2021
@mergify
[8.0](backport #29094) Add beat field back to beat.stats (#29100)
c99e920
@sayden sayden deleted the bugfix/beats/add-beats-key-in-stats-metricset branch August 25, 2022 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@sayden sayden

Labels
backport-v8.0.0 Automated backport with mergify bug Feature:Stack Monitoring 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.
3 participants
@sayden @elasticmachine @jsoriano