From 6b708789e3fb3155bfe24071c35f20341dbdd846 Mon Sep 17 00:00:00 2001 From: dellnoantechnp Date: Wed, 28 Feb 2024 18:52:50 +0800 Subject: [PATCH] bugfix: Update PrometheusAlert version 1.1.5 Update template-dd --- charts/prometheusalert/Chart.yaml | 2 +- charts/prometheusalert/values.yaml | 49 ++++++++++++++++++------------ 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/charts/prometheusalert/Chart.yaml b/charts/prometheusalert/Chart.yaml index d414c37..1f17ee0 100644 --- a/charts/prometheusalert/Chart.yaml +++ b/charts/prometheusalert/Chart.yaml @@ -18,4 +18,4 @@ maintainers: sources: - https://github.com/feiyu563/PrometheusAlert type: application -version: 1.1.4 \ No newline at end of file +version: 1.1.5 \ No newline at end of file diff --git a/charts/prometheusalert/values.yaml b/charts/prometheusalert/values.yaml index 11f9ec0..146c4df 100644 --- a/charts/prometheusalert/values.yaml +++ b/charts/prometheusalert/values.yaml @@ -351,28 +351,37 @@ config: -- ---------------------------- -- Records of prometheus_alert_d_b -- ---------------------------- - INSERT INTO prometheus_alert_d_b (id, tpltype, tpluse, tplname, tpl, created) VALUES (1, 'dd', 'Prometheus', 'prometheus-dd', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }} + INSERT INTO prometheus_alert_d_b (id, tpltype, tpluse, tplname, tpl, created) VALUES (1, 'dd', 'Prometheus', 'prometheus-dd', '{{ $var := .externalURL}} + {{ range $k,$v:=.alerts }} {{if eq $v.status "resolved"}} - ## [Prometheus恢复信息]({{$v.generatorURL}}) - #### [{{$v.labels.alertname}}]({{$var}}) - ###### 告警级别：{{$v.labels.level}} - ###### 开始时间：{{TimeFormat $v.startsAt "2006-01-02 15:04:05"}} - ###### 结束时间：{{TimeFormat $v.endsAt "2006-01-02 15:04:05"}} - ###### 故障主机IP：{{$v.labels.instance}} - ##### {{$v.annotations.description}} - ![Prometheus](https://raw.githubusercontent.com/feiyu563/PrometheusAlert/master/doc/alert-center.png) + ## **Prometheus 恢复通知** + --- + * 🟡【告警名称】{{$v.labels.alertname}} + * 🚨【告警级别】{{ $v.labels.severity}} + * ✅【告警状态】{{$v.status}} + * 🧭【开始时间】{{GetCSTtime $v.startsAt}} + * 🧭【结束时间】{{GetCSTtime $v.endsAt}} + * 🏷️【命名空间】{{$v.labels.namespace}} + * 📡【实例名称】{{$v.labels.host}}{{$v.labels.pod}}{{$v.labels.job}}{{$v.labels.deployment}}{{$v.labels.statefulset}} + * 📝【告警详情】{{ $v.annotations.message }}{{ $v.annotations.description}};{{$v.annotations.summary}} {{else}} - ## [Prometheus告警信息]({{$v.generatorURL}}) - #### [{{$v.labels.alertname}}]({{$var}}) - ###### 告警级别：{{$v.labels.level}} - ###### 开始时间：{{TimeFormat $v.startsAt "2006-01-02 15:04:05"}} - ###### 结束时间：{{TimeFormat $v.endsAt "2006-01-02 15:04:05"}} - ###### 故障主机IP：{{$v.labels.instance}} - ##### {{$v.annotations.description}} - ![Prometheus](https://raw.githubusercontent.com/feiyu563/PrometheusAlert/master/doc/alert-center.png) - {{end}} - {{ end }} - {{ $urimsg:=""}}{{ range $key,$value:=.commonLabels }}{{$urimsg = print $urimsg $key "%3D%22" $value "%22%2C" }}{{end}}[*** 点我屏蔽该告警]({{$var}}/#/silences/new?filter=%7B{{SplitString $urimsg 0 -3}}%7D)', '2022-05-26 10:00:05'); + ## **Prometheus 告警通知** + --- + * 🟡【告警名称】{{$v.labels.alertname}} + * 🚨【告警级别】{{ $v.labels.severity}} + * 🔥【告警状态】{{$v.status}} + * 🧭【开始时间】{{GetCSTtime $v.startsAt}} + * 🏷️【命名空间】{{$v.labels.namespace}} + * 📡【实例名称】{{$v.labels.host}}{{$v.labels.pod}}{{$v.labels.job}}{{$v.labels.deployment}}{{$v.labels.statefulset}} + * 📝【告警详情】{{ $v.annotations.message }}{{ $v.annotations.description}};{{$v.annotations.summary}} + {{ end }} + {{ end }} + {{ $urimsg:="" }} + {{ range $key,$value:=.commonLabels }} + {{$urimsg = print $urimsg $key "%3D%22" $value "%22%2C" }} + {{end}} + --- + 🤫*[屏蔽该告警]({{$var}}/#/silences/new?filter=%7B{{SplitString $urimsg 0 -3}}%7D)*', '2024-02-26 10:00:00'); INSERT INTO prometheus_alert_d_b (id, tpltype, tpluse, tplname, tpl, created) VALUES (2, 'wx', 'Prometheus', 'prometheus-wx', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}{{if eq $v.status "resolved"}}[PROMETHEUS-恢复信息]({{$v.generatorURL}}) > **[{{$v.labels.alertname}}]({{$var}})** > 告警级别: {{$v.labels.level}}