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.

Sign up for GitHub

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

Jump to bottom

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825bb24
Allow additional scrape_configs to be added
minhdanh Oct 9, 2019
8ec9e59
Bump version of loki-stack chart
minhdanh Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion production/helm/loki-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: loki-stack
version: 0.17.0
version: 0.17.1
appVersion: v0.3.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
2 changes: 1 addition & 1 deletion production/helm/promtail/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: promtail
version: 0.12.2
version: 0.12.3
appVersion: v0.3.0
kubeVersion: "^1.10.0-0"
description: "Responsible for gathering logs and sending them to Loki"
Expand Down
3 changes: 3 additions & 0 deletions production/helm/promtail/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,3 +262,6 @@ data:
- __meta_kubernetes_pod_container_name
target_label: __path__
{{- end }}
{{- if .Values.extraScrapeConfigs }}
{{- toYaml .Values.extraScrapeConfigs | nindent 4 }}
{{- end }}
3 changes: 3 additions & 0 deletions production/helm/promtail/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ resources: {}
# Custom scrape_configs to override the default ones in the configmap
scrapeConfigs: []

# Custom scrape_configs together with the default ones in the configmap
extraScrapeConfigs: []

securityContext:
readOnlyRootFilesystem: true
runAsGroup: 0
Expand Down