Merge pull request #81 from AweSim-OSC/grafana

Use updated grafana config schema
OSC · Mar 4, 2020 · c58238f · c58238f
2 parents fe103f3 + df0b7fe
commit c58238f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app.rb b/app.rb
@@ -73,6 +73,18 @@ def version_from_git(dir)
   erb :system_status
 end
 
+get '/clusters/:id/grafana' do
+  @id = params[:id].to_sym
+  cluster = CLUSTERS[@id]
+  if cluster.nil? || ! cluster.custom_config.key?(:grafana)
+    raise Sinatra::NotFound
+  end
+  grafana = cluster.custom_config[:grafana]
+  dashboard_url = "#{grafana['dashboard']['uid']}/#{grafana['dashboard']['name']}"
+  theme = grafana['theme'] || 'light'
+  grafana_url = "#{grafana['host']}/d/#{dashboard_url}?orgId=#{grafana['orgId']}&theme=#{theme}&var-cluster=#{@id}"
+  redirect(grafana_url)
+end
 
 # redirect to /clusters/:id/hour/report_moab_nodes page
 get '/clusters/:id*' do

diff --git a/views/layout.erb b/views/layout.erb
@@ -130,7 +130,7 @@
                 <% if cluster.custom_config.key?(:ganglia) %>
                   <a href="<%= url("/clusters/#{cluster.id}/hour/report_moab_nodes") %>"><span><i class="fa fa-chart-area"></i></span>  <%=cluster.metadata.title %> Cluster</a>
                 <% elsif cluster.custom_config.key?(:grafana) %>
-                  <a href="<%= cluster.custom_config[:grafana]['dashboard'] %>" target="_blank"><span><i class="fa fa-chart-area"></i></span>  <%=cluster.metadata.title %> Cluster</a>
+                  <a href="<%= url("/clusters/#{cluster.id}/grafana") %>" target="_blank"><span><i class="fa fa-chart-area"></i></span>  <%=cluster.metadata.title %> Cluster</a>
                 <% end %>
               </li>
           <% end %>