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

helm chart: Add support for additional labels and scrapeTimeout for serviceMonitors #937

Merged
merged 2 commits into from
Sep 9, 2019
Merged

Conversation

minhdanh
Copy link
Contributor

What this PR does / why we need it:
This PR adds support for additional labels and scrapeTimeout for the serviceMonitors.
It helps in some cases the labels are needed for the serviceMonitor to work properly.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@CLAassistant
Copy link

CLAassistant commented Aug 26, 2019

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM, can you bump the loki-stack chart version please.

@minhdanh
Copy link
Contributor Author

minhdanh commented Sep 7, 2019

@cyriltovena Done. Please check.

@cyriltovena cyriltovena merged commit 43d9cc9 into grafana:master Sep 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants