Merge pull request #63 from sebastien-prudhomme/prometheus-operator

Support for Prometheus operator
kubecost · Jun 11, 2019 · 7de45d2 · 7de45d2
2 parents 1f140dc + 267af36
commit 7de45d2
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -19,3 +19,8 @@ Parameter | Description | Default
 `ingress.hosts` | Ingress hostnames | `[cost-analyzer.local]`
 `ingress.tls` | Ingress TLS configuration (YAML) | `[]`
 `networkPolicy.enabled` | If true, create a NetworkPolicy to deny egress  | `false`
+`serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false`
+`serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}`
+`prometheusRule.enabled` | Set this to `true` to create PrometheusRule for Prometheus operator | `false`
+`prometheusRule.additionalLabels` | Additional labels that can be used so PrometheusRule will be discovered by Prometheus | `{}`
+`grafana.sidecar.datasources.defaultDatasourceEnabled` | Set this to `false` to disable creation of Prometheus datasource in Grafana | `true`
diff --git a/cost-analyzer/templates/_helpers.tpl b/cost-analyzer/templates/_helpers.tpl
@@ -50,4 +50,13 @@ app.kubernetes.io/name: {{ include "cost-analyzer.name" . }}
 helm.sh/chart: {{ include "cost-analyzer.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app: cost-analyzer
+{{- end -}}
+
+{{/*
+Create the selector labels.
+*/}}
+{{- define "cost-analyzer.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "cost-analyzer.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: cost-analyzer
+        {{ include "cost-analyzer.selectorLabels" . | nindent 8 }}
 {{- if .Values.global.podAnnotations}}
       annotations:
 {{- with .Values.global.podAnnotations }}

diff --git a/cost-analyzer/templates/cost-analyzer-network-policy.yaml b/cost-analyzer/templates/cost-analyzer-network-policy.yaml
@@ -9,7 +9,7 @@ metadata:
 spec:
   podSelector:
     matchLabels:
-      app: cost-analyzer
+      {{ include "cost-analyzer.selectorLabels" . | nindent 6 }}
   policyTypes:
   - Egress
   egress:

diff --git a/cost-analyzer/templates/cost-analyzer-prometheusrule-template.yaml b/cost-analyzer/templates/cost-analyzer-prometheusrule-template.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.prometheus }}
+{{- if .Values.prometheus.serverFiles }}
+{{- if .Values.prometheus.serverFiles.rules }}
+{{- if .Values.prometheusRule }}
+{{- if .Values.prometheusRule.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ include "cost-analyzer.fullname" . }}
+  labels:
+    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- if .Values.prometheusRule.additionalLabels }}
+    {{ toYaml .Values.prometheusRule.additionalLabels | nindent 4 }}
+    {{- end }}
+spec:
+  {{ toYaml .Values.prometheus.serverFiles.rules | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/cost-analyzer/templates/cost-analyzer-service-template.yaml b/cost-analyzer/templates/cost-analyzer-service-template.yaml
@@ -6,7 +6,7 @@ metadata:
     {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
 spec:
   selector:
-    app: cost-analyzer
+    {{ include "cost-analyzer.selectorLabels" . | nindent 4 }}
 {{- if .Values.service -}}
 {{- if .Values.service.type }}
   type: "{{ .Values.service.type }}"

diff --git a/cost-analyzer/templates/cost-analyzer-servicemonitor-template.yaml b/cost-analyzer/templates/cost-analyzer-servicemonitor-template.yaml
@@ -0,0 +1,27 @@
+{{- if .Values.serviceMonitor }}
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "cost-analyzer.fullname" . }}
+  labels:
+    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    {{- if .Values.serviceMonitor.additionalLabels }}
+    {{ toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - port: model
+      honorLabels: true
+      interval: 1m
+      scrapeTimeout: 10s
+      path: /metrics
+      scheme: http
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{ include "cost-analyzer.selectorLabels" . | nindent 6 }}
+{{- end }}
+{{- end }}
diff --git a/cost-analyzer/templates/grafana-datasource-template.yaml b/cost-analyzer/templates/grafana-datasource-template.yaml
@@ -2,12 +2,14 @@
 {{- if .Values.grafana.sidecar -}}
 {{- if .Values.grafana.sidecar.datasources -}}
 {{- if .Values.grafana.sidecar.datasources.enabled -}}
+{{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: grafana-datasource
   labels:
-     grafana_datasource: "1"
+    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+    grafana_datasource: "1"
 data:
   datasource.yaml: |-
     # config file version
@@ -25,4 +27,5 @@ data:
 {{- end -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 {{- end -}}
diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml
@@ -94,9 +94,19 @@ prometheus:
               record: cluster:cpu_usage:rate5m
             - expr: rate(container_cpu_usage_seconds_total{container_name!=""}[5m])
               record: cluster:cpu_usage_nosum:rate5m
+
+serviceMonitor:
+  enabled: false
+  additionalLabels: {}
+
+prometheusRule:
+  enabled: false
+  additionalLabels: {}
+
 grafana:
   sidecar:
     dashboards:
       enabled: true 
     datasources:
       enabled: true
+      defaultDatasourceEnabled: true