Merge "Add prometheus main dashboard"
diff --git a/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json b/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
index 8692b06..801052f 100755
--- a/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
+++ b/glusterfs/files/grafana_dashboards/glusterfs_prometheus.json
@@ -18,7 +18,7 @@
{
"cacheTimeout": null,
"colorBackground": false,
- "colorValue": false,
+ "colorValue": true,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
@@ -78,7 +78,7 @@
"step": 60
}
],
- "thresholds": "",
+ "thresholds": "0.5,0.5",
"title": "Status",
"type": "singlestat",
"valueFontSize": "80%",
diff --git a/glusterfs/map.jinja b/glusterfs/map.jinja
index 8206478..3771e54 100644
--- a/glusterfs/map.jinja
+++ b/glusterfs/map.jinja
@@ -9,14 +9,21 @@
},
}, merge=salt['pillar.get']('glusterfs:server')) %}
+{% if salt['grains.get']('init') == "systemd" -%}
+ {% set mount_defaults = "defaults" %}
+{% else %}
+ {% set mount_defaults = "defaults,nobootwait" %}
+{% endif %}
+
{% set client = salt['grains.filter_by']({
'Debian': {
'pkgs': ['glusterfs-client', 'attr'],
- 'mount_defaults': 'defaults,nobootwait',
+ 'mount_defaults': mount_defaults,
},
'RedHat': {
'pkgs': ['glusterfs-fuse'],
'mount_defaults': 'defaults',
+ 'systemd_mount_defaults': 'defaults',
},
}, merge=salt['pillar.get']('glusterfs:client')) %}