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: Allow additional scrape_configs to be added #1134

Merged
merged 2 commits into from
Oct 10, 2019
Merged

Helm chart: Allow additional scrape_configs to be added #1134

merged 2 commits into from
Oct 10, 2019

Conversation

minhdanh
Copy link
Contributor

@minhdanh minhdanh commented Oct 9, 2019

What this PR does / why we need it:
When I need to add additional scrape_configs for promtail, I'll need to override the default ones. This PR allows the scrape_configs to be added instead of replacing the default ones.

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@cyriltovena
Copy link
Contributor

Thanks @minhdanh , can you also bump the loki-chart version please ?

@minhdanh
Copy link
Contributor Author

minhdanh commented Oct 10, 2019

@cyriltovena I guess you mean the loki-stack chart. I've just done it. Please check.

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 eb9d732 into grafana:master Oct 10, 2019
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
* Allow additional scrape_configs to be added

* Bump version of loki-stack chart
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.

2 participants