Add SAP and HA dashboards to grafana formula

Makefile

@@ -3,7 +3,7 @@ LOCALE_VERSION=0.2
 CPU_MITIGATIONS_VERSION=0.2
 PROMETHEUS_VERSION=0.2.1
 PROMETHEUS_EXPORTERS_VERSION=0.7.4
-GRAFANA_VERSION=0.2.2
+GRAFANA_VERSION=0.3.0
 VIRTUALIZATION_HOST_VERSION=0.5
 SYSTEM_LOCK_VERSION=0.1
 UYUNI_CONFIG_VERSION=0.1

grafana-formula/grafana-formula.changes

@@ -1,8 +1,14 @@
 -------------------------------------------------------------------
 Fri Oct  2 12:37:21 UTC 2020 - Witek Bedyk <[email protected]>
 
+- Version 0.3.0
 - Use variable for product name
 
+-------------------------------------------------------------------
+Tue Aug  4 12:26:03 UTC 2020 - Dario Maiocchi <[email protected]>
+
+- Add HA/SAP dashboards
+
 -------------------------------------------------------------------
 Tue Jun  9 13:05:22 UTC 2020 - Joao Cavalheiro <[email protected]>
 

grafana-formula/grafana-formula.spec

@@ -19,7 +19,7 @@
 %define fname grafana
 %define fdir  %{_datadir}/susemanager/formulas
 Name:           grafana-formula
-Version:        0.2.2
+Version:        0.3.0
 Release:        0
 Summary:        Salt formula for installing and configuring Grafana
 License:        Apache-2.0

grafana-formula/grafana/init.sls

@@ -65,7 +65,7 @@
   file.absent
 {%- endif %}
 
-{%- if salt['pillar.get']('grafana:dashboards:add_k8s_dashboard', False) %}
+{%- if salt['pillar.get']('grafana:dashboards:kubernetes:add_k8s_dashboard', False) %}
 /etc/grafana/provisioning/dashboards/caasp-cluster.json:
   file.managed:
     - source: "salt://grafana/files/caasp-cluster.json"
@@ -75,7 +75,7 @@
   file.absent
 {%- endif %}
 
-{%- if salt['pillar.get']('grafana:dashboards:add_etcd_dashboard', False) %}
+{%- if salt['pillar.get']('grafana:dashboards:kubernetes:add_etcd_dashboard', False) %}
 /etc/grafana/provisioning/dashboards/caasp-etcd-cluster.json:
   file.managed:
     - source: "salt://grafana/files/caasp-etcd-cluster.json"
@@ -85,7 +85,7 @@
   file.absent
 {%- endif %}
 
-{%- if salt['pillar.get']('grafana:dashboards:add_k8s_namespaces_dashboard', False) %}
+{%- if salt['pillar.get']('grafana:dashboards:kubernetes:add_k8s_namespaces_dashboard', False) %}
 /etc/grafana/provisioning/dashboards/caasp-namespaces.json:
   file.managed:
     - source: "salt://grafana/files/caasp-namespaces.json"
@@ -95,6 +95,29 @@
   file.absent
 {%- endif %}
 
+# HA and SAP dashboards
+# * HA:
+grafana-ha-cluster-dashboards:
+{%- if salt['pillar.get']('grafana:dashboards:sap:add_ha_dashboard', False) %}
+  pkg.installed
+{%- else %}
+  pkg.removed
+{%- endif %}
+# * SAP HANA:
+grafana-sap-hana-dashboards:
+{%- if salt['pillar.get']('grafana:dashboards:sap:add_sap_hana_dashboard', False) %}
+  pkg.installed
+{%- else %}
+  pkg.removed
+{%- endif %}
+# * SAP Netweaver:
+grafana-sap-netweaver-dashboards:
+{%- if salt['pillar.get']('grafana:dashboards:sap:add_sap_netweaver_dashboard', False) %}
+  pkg.installed
+{%- else %}
+  pkg.removed
+{%- endif %}
+
 grafana-server:
   pkg.installed:
     - names:
@@ -103,8 +126,7 @@ grafana-server:
     - enable: True
     - watch_any:
       - file: /etc/grafana/provisioning/datasources/datasources.yml
-      - file: /etc/grafana/provisioning/dashboards/dashboard-provider.yml
-      - file: /etc/grafana/provisioning/*/*.json
+      - file: /etc/grafana/provisioning/dashboards/*
       - file: /etc/grafana/grafana.ini
 
 {%- else %}

grafana-formula/metadata/form.yml

@@ -73,20 +73,49 @@ grafana:
       $help: Add dashboard for monitoring an Apache HTTPD server
       $default: True
 
-    add_k8s_dashboard:
-      $type: boolean
-      $name: Kubernetes cluster dashboard
-      $help: Add dashboard for monitoring a Kubernetes cluster
-      $default: False
+    kubernetes:
+      $type: group
+      $disabled: "!formValues.grafana.enabled"
+      $help: CaaSP dashboards to install.
 
-    add_etcd_dashboard:
-      $type: boolean
-      $name: Kubernetes etcd dashboard
-      $help: Add dashboard for monitoring an etcd daemon
-      $default: False
+      add_k8s_dashboard:
+        $type: boolean
+        $name: Kubernetes cluster dashboard
+        $help: Add dashboard for monitoring a Kubernetes cluster
+        $default: False
 
-    add_k8s_namespaces_dashboard:
-      $type: boolean
-      $name: Kubernetes namespaces dashboard
-      $help: Add dashboard for monitoring Kubernetes namespaces
-      $default: False
+      add_etcd_dashboard:
+        $type: boolean
+        $name: Kubernetes etcd dashboard
+        $help: Add dashboard for monitoring an etcd daemon
+        $default: False
+
+      add_k8s_namespaces_dashboard:
+        $type: boolean
+        $name: Kubernetes namespaces dashboard
+        $help: Add dashboard for monitoring Kubernetes namespaces
+        $default: False
+
+    sap:
+      $name: SAP
+      $type: group
+      $disabled: "!formValues.grafana.enabled"
+      $help: SAP dashboards to install.
+
+      add_ha_dashboard:
+        $type: boolean
+        $name: HA pacemaker cluster dashboards
+        $help: Add dashboard for monitoring HA pacemaker clusters components
+        $default: False
+
+      add_sap_hana_dashboard:
+        $type: boolean
+        $name: SAP HANA dashboards
+        $help: Add dashboard for monitoring SAP HANA components
+        $default: False
+
+      add_sap_netweaver_dashboard:
+        $type: boolean
+        $name: SAP NETWEAVER dashboards
+        $help: Add dashboard for monitoring SAP NETWAVER components
+        $default: False