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.

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

[8.x](backport #40968) Restore docker.network.in.* and docker.network.out.* fields in docker module #41026

Merged
merged 1 commit into from
Sep 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 27, 2024

Proposed commit message

  • WHAT: Restore docker.network.in.* and docker.network.out.* fields in docker module
  • WHY: These fields contain network incoming and outgoing stats per seconds and should not have been deprecated
    in favour of docker.network.inbound and docker.network.outbound which contain network stats since the container started.

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.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

  1. Package metricbeat for docker PLATFORMS=linux/arm64 PACKAGES=docker mage package
  2. Bring up elastic-stack elastic-package stack up -d -v --version 9.0.0-SNAPSHOT
  3. In a machine (VM or local) with docker installed run Metricbeat by:
docker run -d \                                                                             
  --name=metricbeat \ 
  --user=root \
  --volume="$(pwd)/metricbeat.docker.yml:/usr/share/metricbeat/metricbeat.yml:ro" \
  --volume="/var/run/docker.sock:/var/run/docker.sock:ro" \
  --volume="/sys/fs/cgroup:/hostfs/sys/fs/cgroup:ro" \
  --volume="/proc:/hostfs/proc:ro" \
  --volume="/:/hostfs:ro" \
  docker.elastic.co/beats/metricbeat-oss:9.0.0 metricbeat -e \
  -E output.elasticsearch.hosts=["https://elasticsearch:9200"] -E output.elasticsearch.ssl.verification_mode=none -E  output.elasticsearch.username=elastic -E output.elasticsearch.password=changeme
  1. Explore the docker.network.in.* and docker.network.out.* in Kibana discover

Related issues

Screenshots

docker network


This is an automatic backport of pull request #40968 done by [Mergify](https://mergify.com).

… module (#40968)

* Restore docker.network.in.* and docker.network.out.* fields in docker module

* Update CHANGELOG.next.asciidoc

* Change git email

* Trigger tests

* Add pre-commit step to beats pipelines (#40560)

Added pre-commit check to beats pipelines to validate if no merge-conflicts exist

* Remove extra punctuation in some fields description

---------

Co-authored-by: Olga Naydyonock <[email protected]>
(cherry picked from commit fc17d84)
@mergify mergify bot requested a review from a team as a code owner September 27, 2024 09:30
@mergify mergify bot removed the request for review from a team September 27, 2024 09:30
@mergify mergify bot added the backport label Sep 27, 2024
@mergify mergify bot requested review from faec and VihasMakwana September 27, 2024 09:30
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 27, 2024
@mauri870 mauri870 added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Sep 27, 2024
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@MichaelKatsoulis MichaelKatsoulis merged commit d130d84 into 8.x Sep 27, 2024
32 checks passed
@MichaelKatsoulis MichaelKatsoulis deleted the mergify/bp/8.x/pr-40968 branch September 27, 2024 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants