Skip to content

Commit

Permalink
Update: monitoring mixins set to v1.12.0 for alertmanager-mixin (#926)
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
  • Loading branch information
github-actions[bot] and nlamirault authored Nov 23, 2024
1 parent 6cb7f05 commit b2e2300
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 12 deletions.
6 changes: 3 additions & 3 deletions charts/alertmanager-mixin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ keywords:
- alertmanager
- monitoring-mixin
- portefaix
version: 1.9.0
appVersion: 0.26.0
version: 1.10.0
appVersion: 0.27.0

maintainers:
- name: nlamirault
Expand All @@ -52,4 +52,4 @@ annotations:
url: https://keybase.io/nlamirault/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: alertmanager-mixin v0.26.0
description: alertmanager-mixin v0.27.0
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
"style": "dark",
"tags": [
"alertmanager-mixin",
"monitoring-mixins-v1.6.0",
"monitoring-mixins-v1.12.0",
"portefaix"
],
"templating": {
Expand Down
9 changes: 6 additions & 3 deletions charts/alertmanager-mixin/templates/alerts.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.monitor.enabled -}}
---
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
Expand All @@ -8,6 +9,7 @@ metadata:
{{- include "alertmanager-mixin.annotations" . | indent 4 }}
labels:
{{- include "alertmanager-mixin.labels" . | indent 4 }}
app.kubernetes.io/component: metrics
{{- if .Values.monitor.additionalLabels }}
{{- toYaml .Values.monitor.additionalLabels | nindent 4 }}
{{- end }}
Expand Down Expand Up @@ -47,7 +49,7 @@ spec:
(
rate(alertmanager_notifications_failed_total{job="alertmanager"}[5m])
/
rate(alertmanager_notifications_total{job="alertmanager"}[5m])
ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager"}[5m])
)
> 0.01
for: 5m
Expand All @@ -61,7 +63,7 @@ spec:
min by (job, integration) (
rate(alertmanager_notifications_failed_total{job="alertmanager", integration=~`.*`}[5m])
/
rate(alertmanager_notifications_total{job="alertmanager", integration=~`.*`}[5m])
ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager", integration=~`.*`}[5m])
)
> 0.01
for: 5m
Expand All @@ -75,7 +77,7 @@ spec:
min by (job, integration) (
rate(alertmanager_notifications_failed_total{job="alertmanager", integration!~`.*`}[5m])
/
rate(alertmanager_notifications_total{job="alertmanager", integration!~`.*`}[5m])
ignoring (reason) group_left rate(alertmanager_notifications_total{job="alertmanager", integration!~`.*`}[5m])
)
> 0.01
for: 5m
Expand Down Expand Up @@ -129,3 +131,4 @@ spec:
for: 5m
labels:
severity: critical
{{- end }}
36 changes: 31 additions & 5 deletions charts/alertmanager-mixin/templates/configmap-dashboards.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,50 @@
---
{{ if .Values.grafanaDashboard.enabled -}}
{{- $files := .Files.Glob "dashboards/*.json" }}
{{- if $files }}
---
apiVersion: v1
kind: ConfigMapList
items:
{{- range $path, $fileContents := $files }}
{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" | lower }}
- apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "dashboard-alertmanager-mixin-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
namespace: {{ include "alertmanager-mixin.namespace" $ }}
annotations:
grafana-folder: {{ $.Values.grafana.folder }}
grafana-folder: {{ $.Values.grafanaDashboard.folder }}
{{- include "alertmanager-mixin.annotations" $ | indent 6 }}
labels:
grafana-dashboard: {{ $dashboardName }}
{{- include "alertmanager-mixin.labels" $ | indent 6 }}
app.kubernetes.io/component: dashboard
name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
namespace: {{ include "alertmanager-mixin.namespace" $ }}
data:
{{ $dashboardName }}.json: |-
{{ $.Files.Get $path | indent 6}}
{{- end }}
{{ if $.Values.grafanaDashboard.grafanaOperator.enabled -}}
{{- range $path, $fileContents := $files }}
{{- $dashboardName := regexReplaceAll "(^.*/)(.*)\\.json$" $path "${2}" }}
---
apiVersion: grafana.integreatly.org/v1beta1
kind: GrafanaDashboard
metadata:
labels:
{{- include "alertmanager-mixin.labels" $ | indent 4 }}
app.kubernetes.io/component: dashboard
name: {{ printf "%s" $dashboardName | trunc 63 | trimSuffix "-" | lower }}
namespace: {{ $.Release.Namespace }}
spec:
allowCrossNamespaceImport: {{ $.Values.grafanaDashboard.grafanaOperator.allowCrossNamespaceImport }}
folder: {{ $.Values.grafanaDashboard.folder }}
instanceSelector:
matchLabels:
{{- toYaml $.Values.grafanaDashboard.grafanaOperator.matchLabels | nindent 6 }}
configMapRef:
name: {{ printf "dashboard-%s" $dashboardName | trunc 63 | trimSuffix "-" }}
key: {{ $dashboardName }}.json
{{- end }}
{{- end }}
{{- end }}
{{- end }}

0 comments on commit b2e2300

Please sign in to comment.