Support grafana in cluster configs

OSC · Feb 21, 2020 · 3b58276 · 3b58276
1 parent 28322f4
commit 3b58276
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/manifests/cluster.pp b/manifests/cluster.pp
@@ -33,6 +33,12 @@
 # @param ganglia_req_query
 # @param ganglia_opt_query
 # @param ganglia_version
+# @param grafana_host
+# @param grafana_org_id
+# @param grafana_dashboard_name
+# @param grafana_dashboard_uid
+# @param grafana_dashboard_panels
+# @param grafana_labels
 # @param batch_connect
 #
 define openondemand::cluster (
@@ -68,6 +74,19 @@
   Hash $ganglia_req_query = {'c' => $name},
   Hash $ganglia_opt_query = {'h' => "%{h}.${::domain}"},
   String $ganglia_version = '3',
+  Optional[Stdlib::HTTPSUrl,Stdlib::HTTPUrl] $grafana_host = undef,
+  Integer $grafana_org_id = 1,
+  Optional[String] $grafana_dashboard_name = undef,
+  Optional[String] $grafana_dashboard_uid = undef,
+  Optional[Struct[{
+    'cpu' => Integer,
+    'memory' => Integer,
+  }]] $grafana_dashboard_panels = undef,
+  Optional[Struct[{
+    'cluster' => String,
+    'host' => String,
+    'jobid' => Optional[String],
+  }]] $grafana_labels = undef,
   Hash[String, Openondemand::Batch_connect] $batch_connect = {},
 ) {
 

diff --git a/templates/cluster/main.yml.erb b/templates/cluster/main.yml.erb
@@ -130,6 +130,21 @@ v2:
       <%- end -%>
       version: "<%= @ganglia_version %>"
   <%- end -%>
+  <%- if @grafana_host -%>
+    grafana:
+      host: "<%= @grafana_host %>"
+      orgId: <%= @grafana_ord_id %>
+      dashboard:
+        name: "<%= @grafana_dashboard_name %>"
+        uid: "<%= @grafana_dashboard_uid %>"
+        panels:
+          cpu: <%= @grafana_dashboard_panels['cpu'] %>
+          memory: <%= @grafana_dashboard_panels['memory'] %>
+      labels:
+      <%- @grafana_labels.each_pair do |k, v| -%>
+        <%= k %>: "<%= v %>"
+      <%- end -%>
+  <%- end -%>
 <% end -%>
 <% if ! @batch_connect.empty? -%>
   batch_connect: