Merge branch 'develop' into dist/eole/2.7.0/develop
This commit is contained in:
commit
f14d388e83
|
@ -9,6 +9,7 @@
|
|||
<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-alertmanager</service>
|
||||
|
@ -95,23 +96,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 ?">
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -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 = conf/provisioning
|
||||
provisioning = /etc/grafana/provisioning
|
||||
|
||||
#################################### Server ####################################
|
||||
[server]
|
||||
|
|
Loading…
Reference in New Issue