Merge pull request #128 from camilb/update-components

Update components versions
camilb · Apr 2, 2019 · 674a9d3 · 674a9d3
2 parents 4f8f12b + caeb9d6
commit 674a9d3
Show file tree

Hide file tree

Showing 6 changed files with 453 additions and 123 deletions.
diff --git a/assets/alertmanager/alertmanager.yaml b/assets/alertmanager/alertmanager.yaml
@@ -15,7 +15,7 @@ route:
   receiver: default-receiver
   routes:
   - match:
-      alertname: DeadMansSwitch
+      alertname: Watchdog
     receiver: 'null'
 inhibit_rules:
 - source_match:
@@ -28,16 +28,33 @@ receivers:
 - name: 'default-receiver'
   slack_configs:
   - channel: '#your_slack_channel'
-    title: '[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] Prometheus Event Notification'
+    title: |-
+      [{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
+      {{- if gt (len .CommonLabels) (len .GroupLabels) -}}
+        {{" "}}(
+        {{- with .CommonLabels.Remove .GroupLabels.Names }}
+          {{- range $index, $label := .SortedPairs -}}
+            {{ if $index }}, {{ end }}
+            {{- $label.Name }}="{{ $label.Value -}}"
+          {{- end }}
+        {{- end -}}
+        )
+      {{- end }}
     text: >-
-        {{ range .Alerts }}
-           *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}`
-          *Description:* {{ .Annotations.description }}
-          *Graph:* <{{ .GeneratorURL }}|:chart_with_upwards_trend:> *Runbook:* <{{ .Annotations.runbook }}|:spiral_note_pad:>
-          *Details:*
-          {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
-          {{ end }}
+      {{ with index .Alerts 0 -}}
+        :chart_with_upwards_trend: *<{{ .GeneratorURL }}|Graph>*
+        {{- if .Labels.runbook }}   :notebook: *<{{ .Labels.runbook }}|Runbook>*{{ end }}
+      {{ end }}
+
+      *Alert details*:
+
+      {{ range .Alerts -}}
+        *Alert:* {{ .Annotations.title }}{{ if .Labels.severity }} - `{{ .Labels.severity }}`{{ end }}
+      *Description:* {{ .Annotations.description }}
+      *Details:*
+        {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}`
         {{ end }}
+      {{ end }}
     send_resolved: true
   email_configs:
   - to: 'your_alert_email_address'

diff --git a/deploy b/deploy
@@ -3,15 +3,15 @@
 #########################################################################################
 #components default version
 #########################################################################################
-GRAFANA_DEFAULT_VERSION=5.2.2
-PROMETHEUS_DEFAULT_VERSION=v2.3.2
-PROMETHEUS_OPERATOR_DEFAULT_VERSION=v0.23.1
+GRAFANA_DEFAULT_VERSION=6.0.2
+PROMETHEUS_DEFAULT_VERSION=v2.8.1
+PROMETHEUS_OPERATOR_DEFAULT_VERSION=v0.29.0
 PROMETHEUS_STORAGE_DEFAULT_RETENTION=168h
 PROMETHEUS_STORAGE_DEFAULT_VOLUME_SIZE=40Gi
 PROMETHEUS_DEFAULT_MEMORY_REQUEST=1Gi
-ALERTMANAGER_DEFAULT_VERSION=v0.15.1
-NODE_EXPORTER_DEFAULT_VERSION=v0.16.0
-KUBE_STATE_METRICS_DEFAULT_VERSION=v1.3.1
+ALERTMANAGER_DEFAULT_VERSION=v0.16.1
+NODE_EXPORTER_DEFAULT_VERSION=v0.17.0
+KUBE_STATE_METRICS_DEFAULT_VERSION=v1.5.0
 NODE_LABEL_DEFAULT_KEY=beta.kubernetes.io/monit
 NODE_LABEL_DEFAULT_VALUE=prometheus
 DEFAULT_NAMESPACE=monitoring

diff --git a/manifests/prometheus-operator/prometheus-operator.yaml b/manifests/prometheus-operator/prometheus-operator.yaml
@@ -18,7 +18,7 @@ spec:
       - args:
         - --kubelet-service=kube-system/kubelet
         - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
-        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.23.0
+        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.29.0
         image: quay.io/coreos/prometheus-operator:PROMETHEUS_OPERATOR_VERSION
         name: prometheus-operator
         ports:
@@ -32,6 +32,7 @@ spec:
             cpu: 100m
             memory: 50Mi
       securityContext:
+        fsGroup: 2000
         runAsNonRoot: true
         runAsUser: 65534
       serviceAccountName: prometheus-operator