diff --git a/example/linux/PrometheusAlert b/example/linux/PrometheusAlert index 60e70c47..47c6284c 100644 Binary files a/example/linux/PrometheusAlert and b/example/linux/PrometheusAlert differ diff --git a/example/linux/db/PrometheusAlertDB.db b/example/linux/db/PrometheusAlertDB.db index 06f590c6..f718e4d8 100644 Binary files a/example/linux/db/PrometheusAlertDB.db and b/example/linux/db/PrometheusAlertDB.db differ diff --git a/example/linux/db/prometheusalert.sql b/example/linux/db/prometheusalert.sql index 071c6100..caa95153 100644 --- a/example/linux/db/prometheusalert.sql +++ b/example/linux/db/prometheusalert.sql @@ -61,3 +61,28 @@ INSERT INTO `prometheus_alert_d_b` VALUES ('26', 'dd', 'Jenkins', 'jenkins-dd-ex INSERT INTO `prometheus_alert_d_b` VALUES ('27', 'fs', 'Prometheus', 'prometheus-fsv2', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n**[Prometheus恢复信息]({{$v.generatorURL}})**\r\n*[{{$v.labels.alertname}}]({{$var}})*\r\n告警级别：{{$v.labels.level}}\r\n开始时间：{{$v.startsAt}}\r\n结束时间：{{$v.endsAt}}\r\n故障主机IP：{{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n**[Prometheus告警信息]({{$v.generatorURL}})**\r\n*[{{$v.labels.alertname}}]({{$var}})*\r\n告警级别：{{$v.labels.level}}\r\n开始时间：{{$v.startsAt}}\r\n结束时间：{{$v.endsAt}}\r\n故障主机IP：{{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:16:15'); INSERT INTO `prometheus_alert_d_b` VALUES ('28', 'workwechat', 'Prometheus', 'prometheus-wechatapp', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n[Prometheus恢复信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n[Prometheus告警信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:07:19'); INSERT INTO `prometheus_alert_d_b` VALUES ('29', 'rl', 'Prometheus', 'prometheus-ruliu', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n[Prometheus恢复信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n[Prometheus告警信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:07:19'); + + +CREATE TABLE `alert_record` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `send_type` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alertname` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_level` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `business_type` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `instance` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `starts_at` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `ends_at` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `summary` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `description` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `handle_status` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_status` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_json` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `revision` int NOT NULL DEFAULT '0', + `created_by` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `created_time` datetime NOT NULL, + `updated_by` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `updated_time` datetime NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + diff --git a/example/linux/views/markdown_test.html b/example/linux/views/markdown_test.html index e21b3d1c..2712ad25 100644 --- a/example/linux/views/markdown_test.html +++ b/example/linux/views/markdown_test.html @@ -6,42 +6,59 @@ {{template "head" .}}
- +
+
- +
- + +
+ +
+ +
+
+ +
+
- +
- - -
+ + + + {{template "endhtml"}} \ No newline at end of file diff --git a/example/linux/views/template.html b/example/linux/views/template.html index 9205e6b9..03e8ab95 100644 --- a/example/linux/views/template.html +++ b/example/linux/views/template.html @@ -57,6 +57,7 @@ {{if eq .Tpltype "email"}}Email{{end}} {{if eq .Tpltype "tg"}}Telegram{{end}} {{if eq .Tpltype "rl"}}百度Hi(如流){{end}} + {{if eq .Tpltype "bark"}}Bark(iPhone推送){{end}} {{if eq .Tpluse "ALiYun"}}阿里云-云监控{{else}}{{.Tpluse}}{{end}} diff --git a/example/linux/views/test.html b/example/linux/views/test.html index bc953003..1786f2b6 100644 --- a/example/linux/views/test.html +++ b/example/linux/views/test.html @@ -124,7 +124,11 @@ 百度Hi(如流) - + + 17 + Bark(iPhone推送) + + diff --git a/example/windows/PrometheusAlert.exe b/example/windows/PrometheusAlert.exe index 254e4050..e66e3276 100644 Binary files a/example/windows/PrometheusAlert.exe and b/example/windows/PrometheusAlert.exe differ diff --git a/example/windows/db/PrometheusAlertDB.db b/example/windows/db/PrometheusAlertDB.db index 06f590c6..f718e4d8 100644 Binary files a/example/windows/db/PrometheusAlertDB.db and b/example/windows/db/PrometheusAlertDB.db differ diff --git a/example/windows/db/prometheusalert.sql b/example/windows/db/prometheusalert.sql index 071c6100..caa95153 100644 --- a/example/windows/db/prometheusalert.sql +++ b/example/windows/db/prometheusalert.sql @@ -61,3 +61,28 @@ INSERT INTO `prometheus_alert_d_b` VALUES ('26', 'dd', 'Jenkins', 'jenkins-dd-ex INSERT INTO `prometheus_alert_d_b` VALUES ('27', 'fs', 'Prometheus', 'prometheus-fsv2', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n**[Prometheus恢复信息]({{$v.generatorURL}})**\r\n*[{{$v.labels.alertname}}]({{$var}})*\r\n告警级别：{{$v.labels.level}}\r\n开始时间：{{$v.startsAt}}\r\n结束时间：{{$v.endsAt}}\r\n故障主机IP：{{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n**[Prometheus告警信息]({{$v.generatorURL}})**\r\n*[{{$v.labels.alertname}}]({{$var}})*\r\n告警级别：{{$v.labels.level}}\r\n开始时间：{{$v.startsAt}}\r\n结束时间：{{$v.endsAt}}\r\n故障主机IP：{{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:16:15'); INSERT INTO `prometheus_alert_d_b` VALUES ('28', 'workwechat', 'Prometheus', 'prometheus-wechatapp', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n[Prometheus恢复信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n[Prometheus告警信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:07:19'); INSERT INTO `prometheus_alert_d_b` VALUES ('29', 'rl', 'Prometheus', 'prometheus-ruliu', '{{ $var := .externalURL}}{{ range $k,$v:=.alerts }}\r\n{{if eq $v.status \"resolved\"}}\r\n[Prometheus恢复信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{else}}\r\n[Prometheus告警信息]($v.generatorURL}})\r\n>**[{{$v.labels.alertname}}]({{$var}})**\r\n>告警级别: {{$v.labels.level}}\r\n开始时间: {{$v.startsAt}}\r\n结束时间: {{$v.endsAt}}\r\n故障主机IP: {{$v.labels.instance}}\r\n**{{$v.annotations.description}}**\r\n{{end}}\r\n{{ end }}', '2020-12-22 03:07:19'); + + +CREATE TABLE `alert_record` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `send_type` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alertname` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_level` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `business_type` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `instance` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `starts_at` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `ends_at` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `summary` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `description` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `handle_status` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_status` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `alert_json` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `remark` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `revision` int NOT NULL DEFAULT '0', + `created_by` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `created_time` datetime NOT NULL, + `updated_by` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '', + `updated_time` datetime NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + diff --git a/example/windows/views/markdown_test.html b/example/windows/views/markdown_test.html index e21b3d1c..2712ad25 100644 --- a/example/windows/views/markdown_test.html +++ b/example/windows/views/markdown_test.html @@ -6,42 +6,59 @@ {{template "head" .}}
- +
+
- +
- + +
+ +
+ +
+
+ +
+
- +
- - -
+ + + + {{template "endhtml"}} \ No newline at end of file diff --git a/example/windows/views/template.html b/example/windows/views/template.html index 9205e6b9..03e8ab95 100644 --- a/example/windows/views/template.html +++ b/example/windows/views/template.html @@ -57,6 +57,7 @@ {{if eq .Tpltype "email"}}Email{{end}} {{if eq .Tpltype "tg"}}Telegram{{end}} {{if eq .Tpltype "rl"}}百度Hi(如流){{end}} + {{if eq .Tpltype "bark"}}Bark(iPhone推送){{end}} {{if eq .Tpluse "ALiYun"}}阿里云-云监控{{else}}{{.Tpluse}}{{end}} diff --git a/example/windows/views/test.html b/example/windows/views/test.html index bc953003..1786f2b6 100644 --- a/example/windows/views/test.html +++ b/example/windows/views/test.html @@ -124,7 +124,11 @@ 百度Hi(如流) - + + 17 + Bark(iPhone推送) + +