Support Operator 0.7.0 (#91)

* Operator 0.7.0 expect configs to be secrets. Secret have different format. Support rules selector * Fix configmap for rules specified in values
cloudposse · Apr 3, 2017 · 2c8ce38 · 2c8ce38
1 parent 1ac9ee8
commit 2c8ce38
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 5 deletions.
diff --git a/incubator/alertmanager/Chart.yaml b/incubator/alertmanager/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: alertmanager
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.1.0
+version: 0.2.0
diff --git a/incubator/alertmanager/templates/_alertmanager.yaml.tpl b/incubator/alertmanager/templates/_alertmanager.yaml.tpl
@@ -0,0 +1,16 @@
+{{- if .Values.config }}
+{{ .Values.config }}
+{{- else }}
+global:
+  resolve_timeout: 5m
+receivers:
+  - name: 'webhook'
+    webhook_configs:
+      - url: 'http://alertmanagerwh:30500/'
+route:
+  group_by: ['job']
+  group_interval: 5m
+  group_wait: 30s
+  receiver: 'webhook'
+  repeat_interval: 12h
+{{- end }}
diff --git a/incubator/alertmanager/templates/secret.yaml b/incubator/alertmanager/templates/secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    alertmanager: {{ .Release.Name }}
+    app: {{ template "name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: alertmanager-{{ .Release.Name }}
+data:
+  alertmanager.yaml: {{ include (print  (dir $.Template.Name) "/_alertmanager.yaml.tpl") . | b64enc | quote }}
diff --git a/incubator/prometheus/Chart.yaml b/incubator/prometheus/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.1.0
+version: 0.2.0
diff --git a/incubator/prometheus/templates/_configmaps.json.tpl b/incubator/prometheus/templates/_configmaps.json.tpl
@@ -0,0 +1,8 @@
+{ "items": [
+{{- if and .Values.rules.specifiedInValues .Values.rules.value }}
+  {
+    "key": "{{ .Release.Namespace }}/prometheus-{{ .Release.Name }}-rules",
+    "checksum": "33bbd11f3d6ecfa14af3d46c46e91de4906fe86d2429f34ba6ee74082f9d6414"
+  }
+{{- end }}
+]}
diff --git a/incubator/prometheus/templates/prometheus.yaml b/incubator/prometheus/templates/prometheus.yaml
@@ -30,9 +30,23 @@ spec:
 {{- if .Values.routePrefix }}
   routePrefix: "{{ .Values.routePrefix }}"
 {{- end }}
-{{- if .Values.serviceMonitors }}
+{{- if .Values.serviceMonitorsSelector }}
   serviceMonitorSelector:
     matchLabels:
+{{ toYaml .Values.serviceMonitorsSelector | indent 6 }}
+{{- else if  .Values.serviceMonitors }}
+  serviceMonitorSelector:
+    matchLabels:
+      app: {{ template "name" . }}
+      release: {{ .Release.Name }}
+{{- end }}
+{{- if .Values.rulesSelector }}
+  ruleSelector:
+    matchLabels:
+{{ toYaml .Values.rulesSelector | indent 6 }}
+{{- else if  .Values.rules.value }}
+  ruleSelector:
+    matchLabels:
       app: {{ template "name" . }}
       release: {{ .Release.Name }}
 {{- end }}

diff --git a/incubator/prometheus/templates/rules.yaml b/incubator/prometheus/templates/rules.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rules.specifiedInValues -}}
+{{- if and .Values.rules.specifiedInValues .Values.rules.value }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,7 +8,8 @@ metadata:
     heritage: {{ .Release.Service }}
     prometheus: {{ .Release.Name }}
     release: {{ .Release.Name }}
+{{ toYaml .Values.rulesSelector | indent 4 }}
   name: prometheus-{{ .Release.Name }}-rules
 data:
 {{ toYaml .Values.rules.value | indent 2 }}
-{{- end -}}
+{{- end }}
diff --git a/incubator/prometheus/templates/secret.yaml b/incubator/prometheus/templates/secret.yaml
@@ -0,0 +1,16 @@
+{{- if and (and .Values.config.specifiedInValues .Values.config.value ) ( not .Values.serviceMonitorSelector ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    app: {{ template "name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    heritage: {{ .Release.Service }}
+    prometheus: {{ .Release.Name }}
+    release: {{ .Release.Name }}
+{{ toYaml .Values.serviceMonitorsSelector | indent 4 }}
+  name: prometheus-{{ .Release.Name }}
+data:
+  configmaps.json: {{ include (print  (dir $.Template.Name) "/_configmaps.json.tpl") . | b64enc | quote }}
+  prometheus.yaml: {{ toYaml .Values.config.value | b64enc | quote }}
+{{- end }}
diff --git a/incubator/prometheus/templates/servicemonitors.yaml b/incubator/prometheus/templates/servicemonitors.yaml
@@ -16,6 +16,7 @@ items:
         chart: {{ $chartName }}-{{ $chartVersion }}
         heritage: {{ $releaseService }}
         release: {{ $releaseName }}
+{{ toYaml .Values.serviceMonitorSelector | indent 8 }}
       name: {{ .name }}
     spec:
       endpoints:

diff --git a/incubator/prometheus/values.yaml b/incubator/prometheus/values.yaml
@@ -75,6 +75,11 @@ retention: 24h
 ##
 routePrefix: /
 
+## Rules configmap selector
+## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/design.md
+##
+rulesSelector: {}
+
 ## Prometheus alerting & recording rules
 ## Ref: https://prometheus.io/docs/querying/rules/
 ## Ref: https://prometheus.io/docs/alerting/rules/
@@ -115,6 +120,11 @@ service:
   ##
   type: ClusterIP
 
+## Service monitors selector
+## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/design.md
+##
+serviceMonitorsSelector: {}
+
 ## ServiceMonitor TPRs to create & be scraped by the Prometheus instance.
 ## Ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/service-monitor.md
 ##