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

Add kubernetes autodiscover docs #6065

Merged
merged 1 commit into from
Jan 15, 2018
Merged

Conversation

vjsamuel
Copy link
Contributor

No description provided.

@elasticmachine
Copy link
Collaborator

Can one of the admins verify this patch?

@@ -130,6 +130,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
- Add the ability to log to the Windows Event Log. {pull}5913[5813]
- Improve Elasticsearch output metrics to count number of dropped and duplicate (if event ID is given) events. {pull}5811[5811]
- Add autodiscover for kubernetes. {pull}6055[6055]
- Add kubernetes autodiscover docs {pull}6065[6065]
Copy link
Contributor

Choose a reason for hiding this comment

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

there is no need for this line this time, as Add autodiscover for kubernetes is already there :)

templates:
- condition:
contains:
kubernetes.labels.project: "prometheus"
Copy link
Contributor

Choose a reason for hiding this comment

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

This is a very good example for the configuration! Perhaps we should use the prometheus.io.scrape: "true" annotation?

@exekias
Copy link
Contributor

exekias commented Jan 15, 2018

Thank you for taking this @vjsamuel, I left some comments

@vjsamuel
Copy link
Contributor Author

@exekias done

Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

LGTM

@exekias
Copy link
Contributor

exekias commented Jan 15, 2018

ok to test

@exekias exekias merged commit 30e8ccb into elastic:master Jan 15, 2018
@vjsamuel vjsamuel deleted the kube_autodocs branch January 15, 2018 20:47
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.

3 participants