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

Set default metricsets in Docker module #6718

Merged
merged 1 commit into from
Apr 4, 2018

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Mar 30, 2018

The following metricests are set as default: container, cpu, diskio, healthcheck, info, memory and network. image is not set as default.

The following metricests are set as default: `container`, `cpu`, `diskio`, `healthcheck`, `info`, `memory` and `network`. `image` is not set as default.
@ruflin
Copy link
Member Author

ruflin commented Apr 3, 2018

Rebased without changelog. Changelog entry is here: #6668 (comment) and will be added as one PR in the end.

panic(err)
}
mb.Registry.MustAddMetricSet("docker", "image", New,
mb.WithHostParser(docker.HostParser),
Copy link
Member

Choose a reason for hiding this comment

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

It had no host parser before 🤔 but I guess it should have had it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, good point. Yes it should have one.

hosts: ["unix:///var/run/docker.sock"]
period: 10s

# Replace dots in labels with `_`. Set to false to keep dots
labels.dedot: true
Copy link
Member

Choose a reason for hiding this comment

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

This is the default, so I guess it is not needed in config.yml.

Copy link
Member Author

Choose a reason for hiding this comment

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

The reason I left this in is because we plan to change the default here in 7.0. So if it is in the config most people use, 7.0 will be less breaking for existing users.

Copy link
Member

Choose a reason for hiding this comment

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

Oh ok, right then.

@@ -1,13 +1,5 @@
- module: docker
metricsets: ["container", "cpu", "diskio", "healthcheck", "info", "memory", "network"]
hosts: ["unix:///var/run/docker.sock"]
Copy link
Member

Choose a reason for hiding this comment

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

Out of the scope, but I think this should be the default.

Copy link
Member Author

Choose a reason for hiding this comment

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

+1 on that.

@ruflin
Copy link
Member Author

ruflin commented Apr 4, 2018

@jsoriano See my comments. Let me know if you need changes or if it is ok to go.

@jsoriano
Copy link
Member

jsoriano commented Apr 4, 2018

It is ok to go :)

@jsoriano jsoriano merged commit 083b66a into elastic:master Apr 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants