From d171f7d3d7edae4c2a0fa101147d868ee9d95648 Mon Sep 17 00:00:00 2001
From: Greg Dubicki <grzegorz.dubicki@gmail.com>
Date: Sun, 27 Feb 2022 21:12:20 +0000
Subject: [PATCH 1/5] This takes too much of the precious vertical space
---
puppetboard/templates/layout.html | 5 -----
1 file changed, 5 deletions(-)
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 342560f3c..0b532c87d 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -106,10 +106,5 @@
<i class="large arrow up icon"></i>
</div>
- <footer class="ui absolute fixed bottom">
- <div>
- Copyright © 2013-{{ now('%Y') }} <a href="https://github.com/voxpupuli" target="_blank">Puppet Community</a>. <span style="float:right">Live from PuppetDB.</span>
- </div>
- </footer>
</body>
</html>
From 84106304cfb60e5fda4d2e334ba5c81186ac2950 Mon Sep 17 00:00:00 2001
From: Greg Dubicki <grzegorz.dubicki@gmail.com>
Date: Sun, 27 Feb 2022 22:57:39 +0000
Subject: [PATCH 2/5] Show the puppet run duration explicitly
---
puppetboard/templates/report.html | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/puppetboard/templates/report.html b/puppetboard/templates/report.html
index d68005093..c787a835d 100644
--- a/puppetboard/templates/report.html
+++ b/puppetboard/templates/report.html
@@ -8,6 +8,7 @@ <h1>Summary</h1>
<th>Configuration version</th>
<th>Start time</th>
<th>End time</th>
+ <th>Duration</th>
</tr>
</thead>
<tbody>
@@ -22,6 +23,9 @@ <h1>Summary</h1>
<td rel="utctimestamp">
{{report.end}}
</td>
+ <td>
+ {{report.end - report.start}}
+ </td>
</tr>
</tbody>
</table>
From b1c9adc48d6948e7070b2a54a9824bfbf79c309a Mon Sep 17 00:00:00 2001
From: Greg Dubicki <grzegorz.dubicki@gmail.com>
Date: Sun, 27 Feb 2022 22:57:58 +0000
Subject: [PATCH 3/5] Add padding to prevent ugly layout
---
puppetboard/templates/node.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/puppetboard/templates/node.html b/puppetboard/templates/node.html
index 3f27e1e55..833c629f5 100644
--- a/puppetboard/templates/node.html
+++ b/puppetboard/templates/node.html
@@ -47,7 +47,7 @@ <h1>Details</h1>
</tbody>
</table>
</div>
- <div class='row'>
+ <div class='row' style="padding-top: 2em;">
<h1>Reports</h1>
{% if config.DAILY_REPORTS_CHART_ENABLED %}
<div id="dailyReportsChartContainer" class="one column row">
From a75114424d04c8e81324a54ecea6337b909a1cde Mon Sep 17 00:00:00 2001
From: Greg Dubicki <grzegorz.dubicki@gmail.com>
Date: Sun, 27 Feb 2022 22:59:48 +0000
Subject: [PATCH 4/5] Use header that explain which nodes are listed below
---
puppetboard/templates/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html
index f22309958..6a47ea2a9 100644
--- a/puppetboard/templates/index.html
+++ b/puppetboard/templates/index.html
@@ -76,7 +76,7 @@ <h1 class="ui header darkblue no-margin-bottom">{{metrics['avg_resources_node']}
<div class="one column row">
<div class="column">
{% if nodes %}
- <h2>Nodes status detail ({{nodes|length}})</h2>
+ <h2>Nodes, except with status unchanged ({{nodes|length}})</h2>
<table class='ui sortable very compact very basic table'>
<thead>
<tr>
@@ -118,7 +118,7 @@ <h2>Nodes status detail ({{nodes|length}})</h2>
</tbody>
</table>
{% else %}
- <h2>Nodes status detail</h2>
+ <h2>Nodes, except with status unchanged</h2>
<div class="ui info message">
Nothing seems to be changing.
</div>
From 69993a233e49502cb0cca60f08cbc12f647e669a Mon Sep 17 00:00:00 2001
From: Greg Dubicki <grzegorz.dubicki@gmail.com>
Date: Sun, 27 Feb 2022 23:00:35 +0000
Subject: [PATCH 5/5] Move most critical nodes lists to top-left
and add missing number of nodes that are
unchanged.
---
puppetboard/static/css/puppetboard.css | 4 ++++
puppetboard/templates/index.html | 15 +++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/puppetboard/static/css/puppetboard.css b/puppetboard/static/css/puppetboard.css
index 43801db48..02670f266 100644
--- a/puppetboard/static/css/puppetboard.css
+++ b/puppetboard/static/css/puppetboard.css
@@ -77,6 +77,10 @@ h1.ui.header.no-margin-bottom {
background-color: #989898;
}
+.ui.header.unchanged {
+ color: #89A54E;
+}
+
.ui.label.unchanged {
background-color: #89A54E;
}
diff --git a/puppetboard/templates/index.html b/puppetboard/templates/index.html
index 6a47ea2a9..2e201fd29 100644
--- a/puppetboard/templates/index.html
+++ b/puppetboard/templates/index.html
@@ -41,6 +41,17 @@ <h1 class="ui header changed no-margin-bottom">
</a>
<span>with status changed</span>
</div>
+ <div class="column">
+ <a href="{{url_for('nodes', env=current_env, status='unchanged')}}">
+ <h1 class="ui header unchanged no-margin-bottom">
+ {{stats['unchanged']}}
+ <small>{% if stats['unchanged'] == 1 %} node {% else %} nodes {% endif %}</small>
+ </h1>
+ </a>
+ <span>with status unchanged</span>
+ </div>
+ </div>
+ <div class="four column row">
<div class="column">
<a href="{{url_for('nodes', env=current_env, status='unreported')}}">
<h1 class="ui header unreported no-margin-bottom">
@@ -50,10 +61,6 @@ <h1 class="ui header unreported no-margin-bottom">
</a>
<span>unreported in the last {{ config.UNRESPONSIVE_HOURS }} hours</span>
</div>
- </div>
- <div class="four column row">
- <div class="column">
- </div>
<div class="column">
<h1 class="ui header darkblue no-margin-bottom">{{metrics['num_nodes']}}</h1>
<span>Population</span>