[stable/grafana] Notification channel provisioning (Resolves issue #12334) (#12351)

* Resolves issue 12334.  Adds notification channel provisioning capability.

Signed-off-by: Brendan Holmes <5072156+holmesb@users.noreply.github.com>

* Bumping version

Signed-off-by: Brendan Holmes <5072156+holmesb@users.noreply.github.com>

* Bumping to 2.3.0

Signed-off-by: Brendan Holmes <5072156+holmesb@users.noreply.github.com>
This commit is contained in:
holmesb
2019-03-18 11:28:21 -07:00
committed by Kubernetes Prow Robot
parent db0a021c18
commit b898f4cb8d
5 changed files with 32 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 2.2.5
version: 2.3.0
appVersion: 6.0.0
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
+1
View File
@@ -70,6 +70,7 @@ The command removes all the Kubernetes components associated with the chart and
| `extraConfigmapMounts` | Additional grafana server configMap volume mounts | `[]` |
| `plugins` | Plugins to be loaded along with Grafana | `[]` |
| `datasources` | Configure grafana datasources (passed through tpl) | `{}` |
| `notifiers` | Configure grafana notifiers | `{}` |
| `dashboardProviders` | Configure grafana dashboard providers | `{}` |
| `dashboards` | Dashboards to import | `{}` |
| `dashboardsConfigMaps` | ConfigMaps reference that contains dashboards | `{}` |
+7
View File
@@ -27,6 +27,13 @@ data:
{{- end -}}
{{- end -}}
{{- if .Values.notifiers }}
{{- range $key, $value := .Values.notifiers }}
{{ $key }}: |
{{ toYaml $value | indent 4 }}
{{- end -}}
{{- end -}}
{{- if .Values.dashboardProviders }}
{{- range $key, $value := .Values.dashboardProviders }}
{{ $key }}: |
+5
View File
@@ -177,6 +177,11 @@ spec:
mountPath: "/etc/grafana/provisioning/datasources/datasources.yaml"
subPath: datasources.yaml
{{- end }}
{{- if .Values.notifiers }}
- name: config
mountPath: "/etc/grafana/provisioning/notifiers/notifiers.yaml"
subPath: notifiers.yaml
{{- end }}
{{- if .Values.dashboardProviders }}
- name: config
mountPath: "/etc/grafana/provisioning/dashboards/dashboardproviders.yaml"
+18
View File
@@ -211,6 +211,24 @@ datasources: {}
# access: proxy
# isDefault: true
## Configure notifiers
## ref: http://docs.grafana.org/administration/provisioning/#alert-notification-channels
##
notifiers: {}
# notifiers.yaml:
# notifiers:
# - name: email-notifier
# type: email
# uid: email1
# # either:
# org_id: 1
# # or
# org_name: Main Org.
# is_default: true
# settings:
# addresses: an_email_address@example.com
# delete_notifiers:
## Configure grafana dashboard providers
## ref: http://docs.grafana.org/administration/provisioning/#dashboards
##