dashboard: add grafana dashboard support on Debian based OS

download grafana dashboard files from github when running on Debian based OS

Signed-off-by: liuxu <liuxu623@gmail.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 8ecb105e45fb592bfcd9c15bffb31b735c79602c..4005e5ca26f1bab43cbe65385373eaf03166998b 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -734,6 +734,19 @@ dummy:
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+#grafana_dashboard_version: master
+#grafana_dashboard_files:
+#  - ceph-cluster.json
+#  - cephfs-overview.json
+#  - host-details.json
+#  - hosts-overview.json
+#  - osd-device-details.json
+#  - osds-overview.json
+#  - pool-detail.json
+#  - pool-overview.json
+#  - radosgw-detail.json
+#  - radosgw-overview.json
+#  - rbd-overview.json
 #grafana_plugins:
 #  - vonage-status-panel
 #  - grafana-piechart-panel

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 479e6a2a42c3b4d24bfb7cc1e020ecfa35f36a16..2484c4f571c4b70a938715c9fe92ac0d863e4b50 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -734,6 +734,19 @@ grafana_container_image: registry.redhat.io/openshift4/ose-grafana:v4.1
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+#grafana_dashboard_version: master
+#grafana_dashboard_files:
+#  - ceph-cluster.json
+#  - cephfs-overview.json
+#  - host-details.json
+#  - hosts-overview.json
+#  - osd-device-details.json
+#  - osds-overview.json
+#  - pool-detail.json
+#  - pool-overview.json
+#  - radosgw-detail.json
+#  - radosgw-overview.json
+#  - rbd-overview.json
 #grafana_plugins:
 #  - vonage-status-panel
 #  - grafana-piechart-panel

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index ef441451a0f4889ea4317b683d8102549d3b8548..a96f10d80e31df34c974af534e5798b9fac6e683 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -726,6 +726,19 @@ grafana_container_memory: 4
 grafana_uid: 472
 grafana_datasource: Dashboard
 grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+grafana_dashboard_version: master
+grafana_dashboard_files:
+  - ceph-cluster.json
+  - cephfs-overview.json
+  - host-details.json
+  - hosts-overview.json
+  - osd-device-details.json
+  - osds-overview.json
+  - pool-detail.json
+  - pool-overview.json
+  - radosgw-detail.json
+  - radosgw-overview.json
+  - rbd-overview.json
 grafana_plugins:
   - vonage-status-panel
   - grafana-piechart-panel

diff --git a/roles/ceph-grafana/tasks/configure_grafana.yml b/roles/ceph-grafana/tasks/configure_grafana.yml
index 70963491cb402dc3dbc7ead30e74f85d1c72c92b..ce1dabe11d96b68d071d00648905db0a1342b5ec 100644 (file)
--- a/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -34,6 +34,15 @@
     - "/etc/grafana/provisioning/dashboards"
     - "/etc/grafana/provisioning/notifiers"
 
+- name: download ceph grafana dashboards
+  get_url:
+    url: "https://raw.githubusercontent.com/ceph/ceph/{{ grafana_dashboard_version }}/monitoring/grafana/dashboards/{{ item }}"
+    dest: "/etc/grafana/dashboards/ceph-dashboard/{{ item }}"
+  with_items: "{{ grafana_dashboard_files }}"
+  when:
+    - not containerized_deployment | bool
+    - not ansible_os_family in ['RedHat', 'Suse']
+
 - name: write grafana.ini
   template:
     src: grafana.ini.j2

diff --git a/site.yml.sample b/site.yml.sample
index 7bb8b103b4f76f72c01eec5b236df81809bead41..fbf534b5d69340bee839431fb597f157bcc0596c 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -485,4 +485,3 @@
   when:
     - dashboard_enabled | bool
     - groups.get(grafana_server_group_name, []) | length > 0
-    - ansible_os_family in ['RedHat', 'Suse']