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

MichaelKatsoulis · 2024-09-24T13:02:07Z

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

Package metricbeat for docker PLATFORMS=linux/arm64 PACKAGES=docker mage package
Bring up elastic-stack elastic-package stack up -d -v --version 9.0.0-SNAPSHOT
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

Explore the docker.network.in.* and docker.network.out.* in Kibana discover

Related issues

Screenshots

cla-checker-service · 2024-09-24T13:02:13Z

💚 CLA has been signed

mergify · 2024-09-24T13:02:57Z

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @MichaelKatsoulis? 🙏.
For such, you'll need to label your PR with:

The upcoming major version of the Elastic Stack
The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

mergify · 2024-09-24T13:02:58Z

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

elasticmachine · 2024-09-24T13:03:07Z

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

pierrehilbert · 2024-09-24T13:08:32Z

@MichaelKatsoulis it seems strange to me to see the CLA being unhappy with your contribution.

gizas · 2024-09-24T13:10:22Z

@MichaelKatsoulis we will need an integration upgrade right? As I dont see the fields there

MichaelKatsoulis · 2024-09-24T13:12:02Z

@MichaelKatsoulis it seems strange to me to see the CLA being unhappy with your contribution.

Maybe it is because I just got new laptop and I wrongly configured the email for git

MichaelKatsoulis · 2024-09-24T13:12:53Z

@MichaelKatsoulis we will need an integration upgrade right? As I dont see the fields there

Yes the package will be updated accordingly whet it is time.

… module

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

…ork-metrics

MichaelKatsoulis · 2024-09-26T11:54:57Z

@rdner could you take a look on behalf of agent team?

rdner · 2024-09-26T13:20:44Z

metricbeat/module/docker/network/_meta/fields.yml

+        - name: dropped
+          type: scaled_float
+          description: >
+            Dropped incoming packets per second..


Is the .. at the end intended?

It's in a few places down the file.

No. Thanks for noticing!

rdner

Just a small question about punctuation in the field description.

… 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)

… module (#40968) (#41026) * 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) Co-authored-by: Michael Katsoulis <[email protected]>

…k.out.* fields in docker module (#41025) * Restore docker.network.in.* and docker.network.out.* fields in docker 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) * Update CHANGELOG.next.asciidoc --------- Co-authored-by: Michael Katsoulis <[email protected]> Co-authored-by: Pierre HILBERT <[email protected]>

MichaelKatsoulis requested a review from a team as a code owner September 24, 2024 13:02

MichaelKatsoulis requested review from rdner and VihasMakwana September 24, 2024 13:02

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024

MichaelKatsoulis requested a review from gizas September 24, 2024 13:02

mergify bot assigned MichaelKatsoulis Sep 24, 2024

mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Sep 24, 2024

pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Sep 24, 2024

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024

MichaelKatsoulis added 8.16-candidate backport-8.15 Automated backport to the 8.15 branch with mergify labels Sep 24, 2024

gizas approved these changes Sep 24, 2024

View reviewed changes

MichaelKatsoulis and others added 5 commits September 25, 2024 10:03

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

e55ae73

… module

Update CHANGELOG.next.asciidoc

d9193f6

Change git email

0d8670e

Trigger tests

db70fa9

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

63cc0cb

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

MichaelKatsoulis force-pushed the restore-docker-network-metrics branch from 8f7e1ec to 63cc0cb Compare September 25, 2024 07:05

MichaelKatsoulis requested a review from a team as a code owner September 25, 2024 07:05

Merge remote-tracking branch 'upstream/main' into restore-docker-netw…

3638c96

…ork-metrics

rdner reviewed Sep 26, 2024

View reviewed changes

rdner approved these changes Sep 26, 2024

View reviewed changes

MichaelKatsoulis added 2 commits September 27, 2024 09:32

Remove extra punctuation in some fields description

3d3ff6a

Merge branch 'main' into restore-docker-network-metrics

8d63a58

MichaelKatsoulis merged commit fc17d84 into elastic:main Sep 27, 2024
32 checks passed

mergify bot mentioned this pull request Sep 27, 2024

[8.15](backport #40968) Restore docker.network.in.* and docker.network.out.* fields in docker module #41025

Merged

6 tasks

mergify bot mentioned this pull request Sep 27, 2024

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

Merged

6 tasks

MichaelKatsoulis mentioned this pull request Dec 23, 2024

Add new docker network in and out group fields elastic/integrations#12183

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

MichaelKatsoulis commented Sep 24, 2024 •

edited

Loading

cla-checker-service bot commented Sep 24, 2024 •

edited

Loading

mergify bot commented Sep 24, 2024

mergify bot commented Sep 24, 2024

elasticmachine commented Sep 24, 2024

pierrehilbert commented Sep 24, 2024

gizas commented Sep 24, 2024

MichaelKatsoulis commented Sep 24, 2024

MichaelKatsoulis commented Sep 24, 2024

MichaelKatsoulis commented Sep 26, 2024

rdner Sep 26, 2024

rdner Sep 26, 2024

MichaelKatsoulis Sep 27, 2024

rdner left a comment

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

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

Conversation

MichaelKatsoulis commented Sep 24, 2024 • edited Loading

Proposed commit message

Checklist

Disruptive User Impact

Author's Checklist

How to test this PR locally

Related issues

Screenshots

cla-checker-service bot commented Sep 24, 2024 • edited Loading

mergify bot commented Sep 24, 2024

mergify bot commented Sep 24, 2024

elasticmachine commented Sep 24, 2024

pierrehilbert commented Sep 24, 2024

gizas commented Sep 24, 2024

MichaelKatsoulis commented Sep 24, 2024

MichaelKatsoulis commented Sep 24, 2024

MichaelKatsoulis commented Sep 26, 2024

rdner Sep 26, 2024

Choose a reason for hiding this comment

rdner Sep 26, 2024

Choose a reason for hiding this comment

MichaelKatsoulis Sep 27, 2024

Choose a reason for hiding this comment

rdner left a comment

Choose a reason for hiding this comment

MichaelKatsoulis commented Sep 24, 2024 •

edited

Loading

cla-checker-service bot commented Sep 24, 2024 •

edited

Loading