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

This commit is contained in:
vincent 2018-05-25 17:24:38 +02:00
commit 290231b394
2 changed files with 4 additions and 3 deletions

View File

@ -1,10 +1,10 @@
#!/bin/bash
if [ $(CreoleGet activer_prometheus = "oui" ];then
if [ $(CreoleGet activer_prometheus) = "oui" ];then
. /usr/lib/eole/diagnose.sh
EchoGras "*** Accès au serveur Prometheus"
TestHHTPPage "Prometheus server" "http://localhost:9090"
TestHTTPPage "Prometheus server" "http://localhost:9090"
echo
fi

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<creole>
<files>
<package>prometheus</package>
<file filelist='prometheus' name='/etc/prometheus/prometheus.yml' source='prometheus.yml' mkdir='True' rm='True'/>
<service>prometheus</service>
<service_access service='prometheus'>