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: Added service monitor #824

Merged
merged 4 commits into from
Aug 1, 2019
Merged

Helm chart: Added service monitor #824

merged 4 commits into from
Aug 1, 2019

Conversation

amartorelli
Copy link
Contributor

What this PR does / why we need it:
I've added the option to use a Prometheus-operator serviceMonitor. When using the Prometheus-operator, the prometheus.io/* annotations don't work.

Special notes for your reviewer:
I've bumped the minor version because it's a backward compatible feature, hope I've done the right thing.

@CLAassistant
Copy link

CLAassistant commented Jul 31, 2019

CLA assistant check
All committers have signed the CLA.

@cyriltovena
Copy link
Contributor

cyriltovena commented Aug 1, 2019

Awesome can you bump the chart version again another PR has been merged in the Meantime.

@amartorelli
Copy link
Contributor Author

@cyriltovena done!

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

@cyriltovena cyriltovena merged commit f7d30e2 into grafana:master Aug 1, 2019
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
* Helm chart: Added service monitor

* Bumped loki-stack chart version

* Bumped loki chart version
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.

3 participants