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

[kube-prometheus-stack] Add config.templates #563

Merged
merged 4 commits into from
Jan 20, 2021
+7 −1
Merged

[kube-prometheus-stack] Add config.templates #563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbab7fd
[kube-prometheus-stack] Add config.templates
kmaris Jan 11, 2021
dfed119
Merge branch 'main' into main
monotek Jan 19, 2021
e555703
Update Chart.yaml
monotek Jan 19, 2021
fee214e
Merge branch 'main' into main
Jan 20, 2021
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
Next Next commit
[kube-prometheus-stack] Add config.templates 
Without config.templates defined any templates defined in templateFiles
will not be loaded. The default location and suffix are in line with the
examples in the alertmanager and kube-prometheus-stack docs.

Signed-off-by: Kevin Maris <kevin@kmaris.net>
  • Loading branch information
@kmaris
kmaris committed Jan 11, 2021
commit bbab7fd0fc2e7cfa836d25612f2c80a26701dea2
2 changes: 1 addition & 1 deletion charts/kube-prometheus-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ name: kube-prometheus-stack
sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
version: 12.11.3
version: 12.11.4
appVersion: 0.44.0
kubeVersion: ">=1.16.0-0"
home: https://github.com/prometheus-operator/kube-prometheus
Expand Down
6 changes: 6 additions & 0 deletions charts/kube-prometheus-stack/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ alertmanager:
receiver: 'null'
receivers:
- name: 'null'
templates:
- '/etc/alertmanager/config/*.tmpl'

## Pass the Alertmanager configuration directives through Helm's templating
## engine. If the Alertmanager configuration contains Alertmanager templates,
Expand All @@ -170,6 +172,10 @@ alertmanager:
tplConfig: false

## Alertmanager template files to format alerts
## By default, templateFiles are placed in /etc/alertmanager/config/ and if
## they have a .tmpl file suffix will be loaded. See config.templates above
## to change, add other suffixes. If adding other suffixes, be sure to update
## config.templates above to include those suffixes.
## ref: https://prometheus.io/docs/alerting/notifications/
## https://prometheus.io/docs/alerting/notification_examples/
##
Expand Down