From 7018b9f18faf9f1ab94d666ddb57575e78f644db Mon Sep 17 00:00:00 2001
From: Rick van der Zwet <rickvanderzwet@optiver.com>
Date: Fri, 15 Feb 2013 09:26:56 +0100
Subject: [PATCH] Report errors details in Failed Tab.

This allows easy indentification of what went wrong, instead of clicking
a few times to pull up the details.

Committer: Rick van der Zwet <rickvanderzwet@optiver.com>
---
 app/views/nodes/_log_detail.html.haml | 36 +++++++++++++++++++++++++++
 app/views/nodes/index.html.haml       |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 app/views/nodes/_log_detail.html.haml

diff --git a/app/views/nodes/_log_detail.html.haml b/app/views/nodes/_log_detail.html.haml
new file mode 100644
index 000000000..42f1fce88
--- /dev/null
+++ b/app/views/nodes/_log_detail.html.haml
@@ -0,0 +1,36 @@
+- nodes           = paginate_scope(local_assigns[:nodes])
+
+- unless nodes.empty?
+  %table.inspector
+    %thead
+      %tr
+        %th{:scope => :col} Hostname
+        %th{:scope => :col} Level
+        %th{:scope => :col} Message
+        %th{:scope => :col} Source
+        %th{:scope => :col} File
+        %th{:scope => :col} Line
+        %th{:scope => :col} Time
+    %tbody
+      - nodes.each do |node|
+        - if node.last_apply_report.logs.present?
+          - node.last_apply_report.logs.each do |log|
+            - if (log.level == 'err')
+              %tr.puppet_log
+                %td.node
+                  = link_to h(node.name), node
+                %td.loglevel
+                  = log.level
+                %td
+                  = log.message
+                %td
+                  = log.source
+                %td
+                  = log.file
+                %td
+                  = log.line
+                %td.nowrap
+                  = link_to h(node.last_apply_report.time), node.last_apply_report
+- else
+  %p
+    = describe_no_matches_for :nodes
diff --git a/app/views/nodes/index.html.haml b/app/views/nodes/index.html.haml
index 1c6b2340a..3e6143845 100644
--- a/app/views/nodes/index.html.haml
+++ b/app/views/nodes/index.html.haml
@@ -18,3 +18,7 @@
     .section
       %h3 Nodes
       = render 'nodes', :nodes => @nodes, :selected_status => action_name
+    - if action_name == 'failed'
+      .section
+        %h3 Latest report errors
+        = render 'log_detail', :nodes => @nodes