Compare commits

..

13 Commits

10 changed files with 19605 additions and 150 deletions

View File

@ -4,8 +4,8 @@
SOURCE=eole-prometheus SOURCE=eole-prometheus
VERSION=0.1 VERSION=0.1
EOLE_VERSION=2.6 EOLE_VERSION=2.7
EOLE_RELEASE=2.6.2 EOLE_RELEASE=2.7.0
PKGAPPS=non PKGAPPS=non
################################ ################################

View File

@ -1,42 +1,34 @@
## eole-prometheus # eole-prometheus
Eolisation de la solution de surveillance Prometheus. Eolisation de la solution de surveillance Prometheus.
Grafana est pris en charge dans l'eolisation et peut ou non être activé. Grafana est pris en charge dans l'eolisation et peut ou non être activé.
L'exporter système (node-exporter) est dans la configuration par défaut (Prométheus se surveille lui même).
### eole-prometheus : L'exporter système (node-exporter) est dans la configuration par défaut (Prometheus se surveille lui même).
### Installation
1. gen_config #### Installer `eole-prometheus`
1. Ajouter le dépôt officiel de [Grafana](http://docs.grafana.org/installation/debian/#apt-repository). Dans l'interface `GenConfig`
``` ```
Mode expert > Dépot tiers > Ajouter un dépot Mode expert > Dépot tiers > Ajouter un dépot
Cadoles pour environnement de Qualification Dépôt officiel Grafana
Libellé du dépot = Cadoles Libellé du dépot = Dépôt officiel Grafana
Déclaration du dépôt = deb https://vulcain.cadoles.com 2.6.2-staging main 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é Méthode de récupération de la clé = URL de la clé
URL de la clé = https://vulcain.cadoles.com/cadoles.gpg URL de la clé = https://packages.grafana.com/gpg.key
``` ```
2. Ajouter le dépôt Cadoles. Dans l'interface `GenConfig`
* Pour ajouter une sonde sur eole :
1. gen_config
``` ```
Mode expert > Dépot tiers > Ajouter un dépot Mode expert > Dépot tiers > Ajouter un dépot
Cadoles pour environnement de Qualification Cadoles pour environnement de Dev
Libellé du dépot = Cadoles Libellé du dépot = Cadoles
Déclaration du dépôt = deb https://vulcain.cadoles.com xenial-staging main Déclaration du dépôt = deb https://vulcain.cadoles.com 2.7.0-dev main
Méthode de récupération de la clé = URL de la clé Méthode de récupération de la clé = URL de la clé
URL de la clé = https://vulcain.cadoles.com/cadoles.gpg URL de la clé = https://vulcain.cadoles.com/cadoles.gpg
``` ```
* Pour ajouter une sonde sur ubuntu xenial:
```
echo "deb https://vulcain.cadoles.com xenial-staging main" > /etc/apt/sources.list.d/cadoles.list
wget -O - https://vulcain.cadoles.com/cadoles.gpg|apt-key add -
```
Il faut ouvrir les ports en fonction des exporters. Tous les exporters n'utilisent pas le même port. Il faut ouvrir les ports en fonction des exporters. Tous les exporters n'utilisent pas le même port.
Le paquet eole-prometheus ouvre les ports sur le serveur où Prometheus sera installé : Le paquet eole-prometheus ouvre les ports sur le serveur où Prometheus sera installé :
@ -44,4 +36,3 @@ Le paquet eole-prometheus ouvre les ports sur le serveur où Prometheus sera ins
* 9090 pour le serveur prometheus * 9090 pour le serveur prometheus
* 9100 pour la sonde node-exporter * 9100 pour la sonde node-exporter
* 3000 pour le serveur Grafana * 3000 pour le serveur Grafana

View File

@ -3,17 +3,20 @@
<files> <files>
<file filelist='prometheus' name='/etc/default/prometheus' source='prometheus.defaults' mkdir='True' rm='True'/> <file filelist='prometheus' name='/etc/default/prometheus' source='prometheus.defaults' mkdir='True' rm='True'/>
<file filelist='prometheus' name='/etc/prometheus/prometheus.yml' mkdir='True' rm='True'/> <file filelist='prometheus' name='/etc/prometheus/prometheus.yml' mkdir='True' rm='True'/>
<file filelist='alertmanager' name='/etc/prometheus/alertmanager.yml' mkdir='True' rm='True'/> <file filelist='prometheus-alertmanager' name='/etc/prometheus/alertmanager.yml' mkdir='True' rm='True'/>
<file filelist='alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/> <file filelist='prometheus-alertmanager' name='/etc/prometheus/rules.d/alert-rules.yml' mkdir='True' rm='True'/>
<file filelist='alertmanager' name='/etc/prometheus/rules.d/predict-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/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'/>
<service>prometheus</service> <service>prometheus</service>
<service>alertmanager</service> <service>prometheus-alertmanager</service>
<service>grafana-server</service> <service>grafana-server</service>
<service_access service='prometheus'> <service_access service='prometheus'>
<port service_accesslist="prometheus">9090</port> <port service_accesslist="prometheus">9090</port>
<port service_accesslist="alertmanager">9093</port> <port service_accesslist="prometheus-alertmanager">9093</port>
</service_access> </service_access>
<service_access service='grafana-server'> <service_access service='grafana-server'>
<port service_accesslist="grafana">3000</port> <port service_accesslist="grafana">3000</port>
@ -257,8 +260,8 @@
<condition name='disabled_if_in' source='activerAlertmanager'> <condition name='disabled_if_in' source='activerAlertmanager'>
<param>non</param> <param>non</param>
<target type='family'>alertes prometheus</target> <target type='family'>alertes prometheus</target>
<target type='filelist'>alertmanager</target> <target type='filelist'>prometheus-alertmanager</target>
<target type='service_accesslist'>alertmanager</target> <target type='service_accesslist'>prometheus-alertmanager</target>
</condition> </condition>
<condition name='disabled_if_in' source='addTargetPrometheus'> <condition name='disabled_if_in' source='addTargetPrometheus'>

View File

@ -1,91 +0,0 @@
#!/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}

View File

@ -39,3 +39,12 @@ groups:
a value of {{ $value }}. a value of {{ $value }}.
summary: Instance {{ $labels.instance }} filesystem usage is dangerously high 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)
> 70
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

View File

@ -81,6 +81,7 @@ route:
- match: - match:
%%{sroute.alSubRouteMatchSource}: %%alSubRouteMatchValue %%{sroute.alSubRouteMatchSource}: %%alSubRouteMatchValue
receiver: %%alSubRouteMatchReceiver receiver: %%alSubRouteMatchReceiver
continue: true
%end if %end if
%end for %end for
%end if %end if
@ -89,6 +90,7 @@ route:
- match: - match:
%%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue} %%{rt.alRouteMatchSource}: %%{rt.alRouteMatchValue}
receiver: %%rt.alRouteMatchReceiver receiver: %%rt.alRouteMatchReceiver
continue: true
%if not %%is_empty('alSubRoute') %if not %%is_empty('alSubRoute')
routes: routes:
@ -97,6 +99,7 @@ route:
- match: - match:
%%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue} %%{sroute.alSubRouteMatchSource}: %%{sroute.alSubRouteMatchValue}
receiver: %%sroute.alSubRouteMatchReceiver receiver: %%sroute.alSubRouteMatchReceiver
continue: true
%end if %end if
%end for %end for
%end if %end if

View File

@ -0,0 +1,10 @@
# # config file version
apiVersion: 1
providers:
- name: 'eole'
orgId: 1
folder: ''
type: file
options:
path: /var/lib/grafana/dashboards

View File

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

File diff suppressed because it is too large Load Diff

View File

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