Merge pull request #21 from OSC/grafana

Support grafana in cluster configs

manifests/cluster.pp

@@ -33,6 +33,13 @@
 # @param ganglia_req_query
 # @param ganglia_opt_query
 # @param ganglia_version
+# @param grafana_host
+# @param grafana_org_id
+# @param grafana_theme
+# @param grafana_dashboard_name
+# @param grafana_dashboard_uid
+# @param grafana_dashboard_panels
+# @param grafana_labels
 # @param batch_connect
 #
 define openondemand::cluster (
@@ -68,9 +75,29 @@
   Hash $ganglia_req_query = {'c' => $name},
   Hash $ganglia_opt_query = {'h' => "%{h}.${::domain}"},
   String $ganglia_version = '3',
+  Optional[Variant[Stdlib::HTTPSUrl,Stdlib::HTTPUrl]] $grafana_host = undef,
+  Integer $grafana_org_id = 1,
+  Optional[String] $grafana_theme = undef,
+  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 = {},
 ) {
 
+  if $grafana_host {
+    if $grafana_dashboard_name == undef or $grafana_dashboard_uid == undef or $grafana_dashboard_panels == undef or $grafana_labels == undef {
+      fail('Must define grafana_dashboard_name, grafana_dashboard_uid, grafana_dashboard_panels and grafana_labels')
+    }
+  }
+
   include openondemand
 
   file { "/etc/ood/config/clusters.d/${name}.yml":

spec/defines/cluster_spec.rb

@@ -11,7 +11,7 @@
         'test'
       end
 
-      let :params do
+      let :default_params do
         {
           acls: [
             {
@@ -44,6 +44,8 @@
         }
       end
 
+      let(:params) { default_params }
+
       it do
         is_expected.to contain_file('/etc/ood/config/clusters.d/test.yml').with('ensure' => 'file',
                                                                                 'owner'   => 'root',
@@ -55,6 +57,51 @@
         content = catalogue.resource('file', '/etc/ood/config/clusters.d/test.yml').send(:parameters)[:content]
         puts content
       end
+
+      context 'with grafana defined' do
+        let :params do
+          default_params.merge!(
+            ganglia_host: nil,
+            grafana_host: 'https://grafana.domain',
+            grafana_dashboard_name: 'test',
+            grafana_dashboard_uid: 'foo',
+            grafana_dashboard_panels: { 'cpu' => 1, 'memory' => 2 },
+            grafana_labels: { 'cluster' => 'cluster', 'host' => 'host' },
+          )
+        end
+
+        it { is_expected.to compile.with_all_deps }
+
+        context 'with partial params' do
+          let :params do
+            default_params.merge!(
+              ganglia_host: nil,
+              grafana_host: 'https://grafana.domain',
+            )
+          end
+
+          it 'fails with lack of parameters' do
+            is_expected.to compile.and_raise_error(%r{Must define grafana})
+          end
+        end
+
+        context 'require cpu and memory panels' do
+          let :params do
+            default_params.merge!(
+              ganglia_host: nil,
+              grafana_host: 'https://grafana.domain',
+              grafana_dashboard_name: 'test',
+              grafana_dashboard_uid: 'foo',
+              grafana_dashboard_panels: { 'cpu' => 1 },
+              grafana_labels: { 'cluster' => 'cluster', 'host' => 'host' },
+            )
+          end
+
+          it 'fails' do
+            is_expected.to compile.and_raise_error(%r{expects a value for key 'memory'})
+          end
+        end
+      end
     end
   end
 end

templates/cluster/main.yml.erb

@@ -130,6 +130,24 @@ v2:
       <%- end -%>
       version: "<%= @ganglia_version %>"
   <%- end -%>
+  <%- if @grafana_host -%>
+    grafana:
+      host: "<%= @grafana_host %>"
+      orgId: <%= @grafana_ord_id %>
+      <%- if @grafana_theme -%>
+      theme: "<%= @grafana_theme %>"
+      <%- end -%>
+      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: