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

This reverts commit 2da03082ec.

Makefile

@@ -1,9 +1,9 @@
 ################################
-# Makefile pour XXX-XXX
+# Makefile pour eole-prometheus
 ################################
 
 SOURCE=eole-prometheus
-VERSION=0.1
+VERSION=0.0.1
 EOLE_VERSION=2.7
 EOLE_RELEASE=2.7.0
 PKGAPPS=non

README.md

@@ -14,7 +14,7 @@ L'exporter système (node-exporter) est dans la configuration par défaut (Prome
     ```
     Mode expert > Dépot tiers > Ajouter un dépot
             Dépôt officiel Grafana
-                Libellé du dépot = Dépôt officiel Grafana
+                Libellé du dépot = Cadoles
                 Déclaration du dépôt = deb https://packages.grafana.com/oss/deb stable main
                 Méthode de récupération de la clé = URL de la clé
                 URL de la clé = https://packages.grafana.com/gpg.key

debian/dirs

@@ -1 +0,0 @@
-/var/lib/grafana/dashboards

debian/postinst

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-    configure)
-    chown grafana:grafana /var/lib/grafana/dashboards
-    ;;
-esac

debian/rules

@@ -5,4 +5,4 @@
 # export DH_VERBOSE=1
 
 %:
-	dh $@
+	dh $@

dicos/70_prometheus.xml

@@ -7,9 +7,7 @@
         <file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/>
         <file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/predict-rules.yml' mkdir='True' rm='True'/>
         <file filelist='grafana'      name='/etc/grafana/grafana.ini'                mkdir='True' rm='True'/>
-        <file filelist='grafana'      name='/etc/grafana/provisioning/dashboards/eole.yml' source='grafana-dashboards.yml'     mkdir='True' rm='True'/>
-        <file filelist='grafana'      name='/etc/grafana/provisioning/datasources/eole.yml' source='grafana-datasources.yml'     mkdir='True' rm='True'/>
-        <file filelist='grafana'      name='/var/lib/grafana/dashboards/eole.json' source='grafana-node-dashboard.json'     mkdir='True' rm='True'/>
+        <file filelist='grafana'      name='/etc/grafana/grafana-dashboards.yml'     mkdir='True' rm='True'/>
 
         <service>prometheus</service>
         <service>prometheus-alertmanager</service>
@@ -96,23 +94,23 @@
         </family>
 
         <family name="grafana">
-            <variable name='grafana_domain' type='string' description="Nom de Domaine ou IP pour accèder à l'interface Grafana" mandatory='True'>
-                <value>localhost</value>
-            </variable>
-            <variable name='grafana_session_max_lifetime' type='string' description="Durée avant déconnexion de l'interface Grafana (en seconde)">
-                <value>86400</value>
-            </variable>
-            <variable name='grafana_admin_passwd' type='string' description="Mot de passe admin pour la première connexion">
-                <value>admin</value>
-            </variable>
-            <variable name='grafana_sign_up' type='string' description="Activer l'enregistrement automatique">
-                <value>false</value>
-            </variable>
-            <variable name='grafana_auth_anonymous' type='string' description="Activer l'accès aux utilisateurs non enregistrés">
-                <value>false</value>
-            </variable>
-            <variable name='grafanaRootURL' type='string' description='Url publique de grafana (avec http:// ou https://)' mode='expert'/>
-        </family>
+                    <variable name='grafana_domain' type='string' description="Nom de Domaine ou IP pour accèder à l'interface Grafana" mandatory='True'>
+                        <value>localhost</value>
+                    </variable>
+                    <variable name='grafana_session_max_lifetime' type='string' description="Durée avant déconnexion de l'interface Grafana (en seconde)">
+                        <value>86400</value>
+                    </variable>
+                    <variable name='grafana_admin_passwd' type='string' description="Mot de passe admin pour la première connexion">
+                        <value>admin</value>
+                    </variable>
+                    <variable name='grafana_sign_up' type='string' description="Activer l'enregistrement automatique">
+                        <value>false</value>
+                    </variable>
+                    <variable name='grafana_auth_anonymous' type='string' description="Activer l'accès aux utilisateurs non enregistrés">
+                        <value>false</value>
+                    </variable>
+					<variable name='grafanaRootURL' type='string' description='Url publique de grafana (avec http:// ou https://)' mode='expert'/>
+                </family>
 
         <family name="alertes prometheus">
 			<variable name='alSMTPUseSys' type='oui/non' description="Utiliser la passerelle SMTP du système ?">

postservice/88_grafana

@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+
+function importDataSource()
+{
+    local grURL="${1}/api/datasources"  # Grafana API URL
+    local dsName=${2} # Datasource Name
+    local dsURL="${3}" # Datasource URL
+    local dsType="prometheus" # Datasource type
+
+    cmd="curl"
+
+
+    data=$(cat <<__EOF__
+{"name":"${dsName}","type":"${dsType}","url":"${dsURL}","access":"direct"}
+__EOF__
+    )
+
+    echo -ne "\tCreating datasource for Prometheus "
+    res=$(${cmd} "${grURL}" -H "Content-Type: application-json" --data-binary "${data}" 2>&1 )
+    excode=${?}
+    case $res in
+        *"already exists"*)
+            echo " ... [Exists]"
+            ;;
+        *"Datasource added"*)
+            echo " ... [OK]"
+            ;;
+        *)
+            echo " ... Ooops ${res}"
+            ;;
+    esac
+}
+
+function importDashboardFromMarket()
+{
+    local grURL="${1}/api/dashboards/import" # API URL to create new Dashboard
+    local dsName="${2}"                  # Datasource name (to link dashboard to data)
+    local dhID="${3}"                    # Dashboard ID in the market
+    local dhRev="${4}"                   # Dashboard Revision to download
+    local tmpFile=$(mktemp)
+    local dhFile=$(mktemp)
+
+    # URL To download the json file for dashboard
+    local pubDashBoardURL="https://grafana.com/api/dashboards/${dhID}/revisions/${dhRev}/download"
+
+    local cmd="curl"
+
+    local dh=$(${cmd} --silent ${pubDashBoardURL} 2>&1)
+
+    cat <<_EOF_ > ${tmpFile}
+{
+  "inputs": [ { "name":"DS_LOCALHOST", "type":"datasource", "pluginId":"prometheus", "value":"${dsName}" } ],
+  "dashboard": { "title": "Surveillance Système", ${dh:1:-1} },
+  "folderId": 0,
+  "overwrite": true
+}
+_EOF_
+
+    res=$(${cmd} "${grURL}" -H "Content-Type: application-json" --data-binary "@${tmpFile}" 2>&1 )
+    excode=${?}
+    case $res in
+        *"\"imported\":true"*)
+            echo " ... [Overwrited]"
+            ;;
+        *"Datasource added"*)
+            echo " ... [OK]"
+            ;;
+        *)
+            echo " ... Ooops ${res}"
+            ;;
+    esac
+#    rm -rf ${tmpFile}
+}
+
+grafanaHost=$(CreoleGet srvGrafanaIP 127.0.0.1)
+grafanaPort=$(CreoleGet srvGrafanaPort 3000)
+grafanaUser="admin"
+grafanaPasswd=$(CreoleGet grafana_admin_passwd admin)
+grafanaURL="http://${grafanaUser}:${grafanaPasswd}@${grafanaHost}:${grafanaPort}"
+datasource_name=$(CreoleGet promDataSource "prometheus")
+promHost=$(CreoleGet adresse_ip_eth0)
+promPort='9090'
+datasourceURL="http://${promHost}:${promPort}"
+
+importDataSource ${grafanaURL} ${datasource_name} ${datasourceURL}
+echo
+echo -ne "\tImporting Node Exporter Full Dashboard "
+importDashboardFromMarket ${grafanaURL} ${datasource_name} 1860 11
+
+rm -rf ${dashBoardFile}

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
-

tmpl/grafana-datasources.yml

@@ -1,11 +0,0 @@
-apiVersion: 1
-
-datasources:
-- name: Prometheus
-  type: prometheus
-  access: proxy
-  orgId: 1
-  url: http://%%adresse_ip_eth0:9090
-  isDefault: true
-  version: 1
-  editable: false

tmpl/grafana.ini

@@ -21,7 +21,7 @@
 ;plugins = /var/lib/grafana/plugins
 
 # folder that contains provisioning config files that grafana will apply on startup and while running.
-provisioning = /etc/grafana/provisioning
+provisioning = conf/provisioning
 
 #################################### Server ####################################
 [server]