Skip to content

[8.3](backport #32197) [Stack Monitoring] Switch cgroup memory fields to keyword#32295

Merged
matschaffer merged 4 commits into8.3from
mergify/bp/8.3/pr-32197
Jul 13, 2022
Merged

[8.3](backport #32197) [Stack Monitoring] Switch cgroup memory fields to keyword#32295
matschaffer merged 4 commits into8.3from
mergify/bp/8.3/pr-32197

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 11, 2022

This is an automatic backport of pull request #32197 done by Mergify.
Cherry-pick of 1f2895e has failed:

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

You are currently cherry-picking commit 1f2895e0b6.
  (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:   metricbeat/docs/fields.asciidoc
	modified:   metricbeat/module/elasticsearch/node_stats/_meta/fields.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/elasticsearch/fields.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

* [Stack Monitoring] Switch cgroup memory fields to keyword

Per https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html they should be strings. data.go appears to also consider them strings, so just updating the field definitions might be enough.

* make update

* Update changelog

(cherry picked from commit 1f2895e)

# Conflicts:
#	metricbeat/module/elasticsearch/fields.go
@mergify mergify bot requested a review from a team as a code owner July 11, 2022 08:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 11, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 11, 2022
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jul 11, 2022

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 11, 2022

💚 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: 2022-07-13T04:59:05.615+0000

  • Duration: 58 min 44 sec

Test stats 🧪

Test Results
Failed 0
Passed 3572
Skipped 880
Total 4452

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

@matschaffer matschaffer requested a review from klacabane July 12, 2022 05:23
@matschaffer matschaffer force-pushed the mergify/bp/8.3/pr-32197 branch from bcc9e7a to eeeecf3 Compare July 13, 2022 04:53
@matschaffer matschaffer requested a review from a team July 13, 2022 04:59
@matschaffer matschaffer merged commit 6f05426 into 8.3 Jul 13, 2022
@mergify mergify bot deleted the mergify/bp/8.3/pr-32197 branch July 13, 2022 05:57
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
… fields to keyword (elastic#32295)

* [Stack Monitoring] Switch cgroup memory fields to keyword (elastic#32197)

* [Stack Monitoring] Switch cgroup memory fields to keyword

Per https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html they should be strings. data.go appears to also consider them strings, so just updating the field definitions might be enough.

* make update

* Update changelog

(cherry picked from commit 05417e4)

# Conflicts:
#	metricbeat/module/elasticsearch/fields.go

* make update

* Remove unrelated changelog entries

* Put trailing lines back

Co-authored-by: Mat Schaffer <mat@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

3 participants