Merge branch 'master' into dist/eole/2.7.0/master

packaging stable
2019-04-15 14:20:33 +02:00 · 2019-04-12 10:12:46 +02:00
2 changed files with 2 additions and 11 deletions
--- a/4
+++ b/4
@@ -1,9 +1,9 @@
 ################################
-# Makefile pour eole-prometheus
+# Makefile pour XXX-XXX
 ################################

 SOURCE=eole-prometheus
-VERSION=0.0.1
+VERSION=0.1
 EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.0
 PKGAPPS=non
--- a/tmpl/alert-rules.yml
+++ b/tmpl/alert-rules.yml
@@ -39,12 +39,3 @@ groups:
        a value of {{ $value }}.
      summary: Instance {{ $labels.instance }} filesystem usage is dangerously high

-  # Heavy CPU temperature
-  - alert: cpu_temp_threshold_exceeded
-    expr: avg(node_hwmon_temp_celsius{job="node"}) BY (instance)
-      > 50
-    annotations:
-      description: This device's cpu temperature has exceeded the threshold with a value
-        of {{ $value }}.
-      summary: Instance {{ $labels.instance }} CPU temperature is dangerously high
-
Author	SHA1	Message	Date
William Petit	81a1679f43	Merge branch 'master' into dist/eole/2.7.0/master	2019-04-15 14:20:33 +02:00
vincent	0359dafc7c	packaging stable	2019-04-12 10:12:46 +02:00