Skip to content

Commit 14c7ba8

Browse files
jdwelchmrzarquon
jdwelch
authored and
mrzarquon
committed
Add time range picker and other small UI fixes (#6)
* add time range picker Previously, dashboards and reports lacked useful time range pickers. This commit adds reasonable-default pickers to the following views: + Overview + Details + Bolt + Reports/all_reports + Reports/hosts_with_failures + Reports/hosts_with_corrective_changes Also: + removes auto-refresh in panels throughout + ensures consistent panel loading behaviour throughout Signed-off-by: JD Welch <[email protected]> * add time range to bolt dashboard Signed-off-by: JD Welch <[email protected]>
1 parent 0d9969e commit 14c7ba8

File tree

6 files changed

+112
-62
lines changed

6 files changed

+112
-62
lines changed

‎default/data/ui/views/all_reports.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
<dashboard theme="light">
1+
<form theme="light">
22
<label>All summary reports by last submission time</label>
3+
<fieldset submitButton="false">
4+
<input type="time" token="reportTimeRange" searchWhenChanged="true">
5+
<label>Time range:</label>
6+
<default>
7+
<earliest>-7d@h</earliest>
8+
<latest>now</latest>
9+
</default>
10+
</input>
11+
</fieldset>
312
<row>
413
<panel>
514
<table>
@@ -13,15 +22,16 @@
1322
| rename run_time_rnd as "Execution Time (seconds)"
1423
| sort - "Report Time"
1524
| table Host, "Report Time", "Execution Time (seconds)"</query>
16-
<earliest>-24h@h</earliest>
17-
<latest>now</latest>
25+
<earliest>0</earliest>
26+
<latest></latest>
1827
</search>
19-
<option name="count">40</option>
28+
<option name="count">20</option>
2029
<option name="dataOverlayMode">none</option>
2130
<option name="drilldown">cell</option>
2231
<option name="percentagesRow">false</option>
32+
<option name="refresh.display">progressbar</option>
2333
<option name="totalsRow">false</option>
2434
</table>
2535
</panel>
2636
</row>
27-
</dashboard>
37+
</form>

‎default/data/ui/views/bolt.xml‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
<dashboard script="overview.js" theme="light">
1+
<form script="overview.js" theme="light">
22
<label>Bolt</label>
3+
<fieldset submitButton="false">
4+
<input type="time" token="boltTimeRange" searchWhenChanged="true">
5+
<label>Time range:</label>
6+
<default>
7+
<earliest>-7d@h</earliest>
8+
<latest>now</latest>
9+
</default>
10+
</input>
11+
</fieldset>
312
<row>
413
<panel>
5-
<title>All Bolt runs (last 7 days)</title>
14+
<title>All Bolt runs</title>
615
<chart>
716
<search>
817
<query>sourcetype="puppet:bolt" event_type="bolt_apply"
918
| timechart count(_raw)</query>
10-
<earliest>-7d@h</earliest>
11-
<latest>now</latest>
19+
<earliest>$boltTimeRange.earliest$</earliest>
20+
<latest>$boltTimeRange.latest$</latest>
1221
</search>
1322
<option name="charting.axisTitleX.text">Time</option>
1423
<option name="charting.axisTitleX.visibility">visible</option>
@@ -19,7 +28,7 @@
1928
<option name="charting.chart.showDataLabels">all</option>
2029
<option name="charting.drilldown">all</option>
2130
<option name="charting.legend.placement">none</option>
22-
<option name="refresh.display">progressbar</option>
31+
<option name="refresh.display">preview</option>
2332
</chart>
2433
</panel>
2534
</row>
@@ -36,12 +45,12 @@
3645
| rename "log" as "Log"
3746
| table Host, "Report Time", "Log"
3847
| sort - "Report Time"</query>
39-
<earliest>-7d@h</earliest>
40-
<latest>now</latest>
48+
<earliest>$boltTimeRange.earliest$</earliest>
49+
<latest>$boltTimeRange.latest$</latest>
4150
</search>
4251
<option name="drilldown">cell</option>
43-
<option name="refresh.display">progressbar</option>
52+
<option name="refresh.display">preview</option>
4453
</table>
4554
</panel>
4655
</row>
47-
</dashboard>
56+
</form>

‎default/data/ui/views/details.xml‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
1-
<dashboard script="overview.js" theme="light">
1+
<form script="overview.js" theme="light">
22
<label>Details</label>
3+
<fieldset submitButton="false">
4+
<input type="time" token="detailsTimeRange" searchWhenChanged="true">
5+
<label>Time range:</label>
6+
<default>
7+
<earliest>-7d@h</earliest>
8+
<latest>now</latest>
9+
</default>
10+
</input>
11+
</fieldset>
312
<row>
413
<panel>
514
<title>Hosts by OS family</title>
615
<chart>
716
<search>
817
<query>sourcetype="puppet:detailed"
918
| top facts.osfamily limit=100</query>
10-
<earliest>-24h@h</earliest>
11-
<latest>now</latest>
19+
<earliest>$detailsTimeRange.earliest$</earliest>
20+
<latest>$detailsTimeRange.latest$</latest>
1221
</search>
1322
<option name="charting.chart">pie</option>
1423
<option name="charting.drilldown">none</option>
24+
<option name="refresh.display">preview</option>
1525
</chart>
1626
</panel>
1727
<panel>
18-
<title>Free memory by host (avg, last 7d)</title>
28+
<title>Free memory by host (average)</title>
1929
<chart>
2030
<search>
2131
<query>sourcetype="puppet:detailed"
2232
| chart avg(facts.memoryfree_mb) by host</query>
23-
<earliest>-7d@h</earliest>
24-
<latest>now</latest>
33+
<earliest>$detailsTimeRange.earliest$</earliest>
34+
<latest>$detailsTimeRange.latest$</latest>
2535
</search>
2636
<option name="charting.axisLabelsX.majorLabelStyle.rotation">0</option>
2737
<option name="charting.axisLabelsY.majorUnit">1000</option>
@@ -49,15 +59,15 @@
4959
| search "logs.data{}.source"=Class*
5060
| rename "logs.data{}.source" as "Class"
5161
| table Class</query>
52-
<earliest>-7d@h</earliest>
53-
<latest>now</latest>
62+
<earliest>$detailsTimeRange.earliest$</earliest>
63+
<latest>$detailsTimeRange.latest$</latest>
5464
<sampleRatio>1</sampleRatio>
5565
</search>
5666
<option name="count">20</option>
5767
<option name="dataOverlayMode">none</option>
5868
<option name="drilldown">row</option>
5969
<option name="percentagesRow">false</option>
60-
<option name="refresh.display">progressbar</option>
70+
<option name="refresh.display">preview</option>
6171
<option name="rowNumbers">false</option>
6272
<option name="totalsRow">false</option>
6373
<option name="wrap">true</option>
@@ -81,19 +91,19 @@
8191
| rename strf_time as "Report Time"
8292
| sort -"Report Time"
8393
| table "Host" "OS Family" "Architecture" "Uptime" "IPv4 address" "Report Time"</query>
84-
<earliest>-24h@h</earliest>
85-
<latest>now</latest>
94+
<earliest>$detailsTimeRange.earliest$</earliest>
95+
<latest>$detailsTimeRange.latest$</latest>
8696
<sampleRatio>1</sampleRatio>
8797
</search>
8898
<option name="count">20</option>
8999
<option name="dataOverlayMode">none</option>
90100
<option name="drilldown">none</option>
91101
<option name="percentagesRow">false</option>
92-
<option name="refresh.display">progressbar</option>
102+
<option name="refresh.display">preview</option>
93103
<option name="rowNumbers">false</option>
94104
<option name="totalsRow">false</option>
95105
<option name="wrap">true</option>
96106
</table>
97107
</panel>
98108
</row>
99-
</dashboard>
109+
</form>

‎default/data/ui/views/hosts_with_corrective_changes.xml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
<dashboard theme="light">
2-
<label>Hosts with corrective changes (last 24h)</label>
1+
<form theme="light">
2+
<label>Hosts with corrective changes</label>
3+
<fieldset submitButton="false">
4+
<input type="time" token="reportTimeRange">
5+
<label>Time range:</label>
6+
<default>
7+
<earliest>-7d@h</earliest>
8+
<latest>now</latest>
9+
</default>
10+
</input>
11+
</fieldset>
312
<row>
413
<panel>
514
<table>
@@ -16,16 +25,16 @@
1625
| rename run_time_rnd as "Execution Time (seconds)"
1726
| sort -"Report Time"
1827
| table Host, "Corrective Change", "Report Time", "Execution Time (seconds)"</query>
19-
<earliest>-24h@h</earliest>
20-
<latest>now</latest>
28+
<earliest>$reportTimeRange.earliest$</earliest>
29+
<latest>$reportTimeRange.latest$</latest>
2130
</search>
2231
<option name="count">20</option>
2332
<option name="dataOverlayMode">none</option>
2433
<option name="drilldown">row</option>
2534
<option name="percentagesRow">false</option>
26-
<option name="refresh.display">progressbar</option>
35+
<option name="refresh.display">preview</option>
2736
<option name="totalsRow">false</option>
2837
</table>
2938
</panel>
3039
</row>
31-
</dashboard>
40+
</form>

‎default/data/ui/views/hosts_with_failures.xml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
<dashboard theme="light">
2-
<label>Hosts with resource failures (last 24h)</label>
1+
<form theme="light">
2+
<label>Hosts with resource failures</label>
3+
<fieldset submitButton="false">
4+
<input type="time" token="reportTimeRange" searchWhenChanged="true">
5+
<label>Time range:</label>
6+
<default>
7+
<earliest>-7d@h</earliest>
8+
<latest>now</latest>
9+
</default>
10+
</input>
11+
</fieldset>
312
<row>
413
<panel>
514
<table>
@@ -15,16 +24,17 @@
1524
| rename run_time_rnd as "Execution Time (seconds)"
1625
| sort -"Report Time"
1726
| table Host, "Report Time", "Execution Time (seconds)"</query>
18-
<earliest>-24h@h</earliest>
19-
<latest>now</latest>
27+
<earliest>$reportTimeRange.earliest$</earliest>
28+
<latest>$reportTimeRange.latest$</latest>
2029
</search>
2130
<option name="count">20</option>
2231
<option name="dataOverlayMode">none</option>
2332
<option name="drilldown">cell</option>
2433
<option name="percentagesRow">false</option>
34+
<option name="refresh.display">progressbar</option>
2535
<option name="totalsRow">false</option>
2636
<option name="wrap">false</option>
2737
</table>
2838
</panel>
2939
</row>
30-
</dashboard>
40+
</form>

‎default/data/ui/views/overview.xml‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1-
<dashboard script="overview.js" theme="light">
1+
<form script="overview.js" theme="light">
22
<label>Overview</label>
33
<description>Report data generated by Puppet</description>
4+
<fieldset submitButton="false">
5+
<input type="time" token="overviewTimeRange" searchWhenChanged="true">
6+
<label>Time range:</label>
7+
<default>
8+
<earliest>-7d@h</earliest>
9+
<latest>now</latest>
10+
</default>
11+
</input>
12+
</fieldset>
413
<row>
514
<panel>
615
<title>All hosts</title>
@@ -9,11 +18,9 @@
918
<query>sourcetype="puppet:summary"
1019
| stats count by host
1120
| stats count</query>
12-
<earliest>-24h@h</earliest>
13-
<latest>now</latest>
21+
<earliest>$overviewTimeRange.earliest$</earliest>
22+
<latest>$overviewTimeRange.latest$</latest>
1423
<sampleRatio>1</sampleRatio>
15-
<refresh>30s</refresh>
16-
<refreshType>delay</refreshType>
1724
</search>
1825
<option name="colorBy">value</option>
1926
<option name="colorMode">none</option>
@@ -31,7 +38,6 @@
3138
<option name="trellis.size">medium</option>
3239
<option name="trendColorInterpretation">standard</option>
3340
<option name="trendDisplayMode">absolute</option>
34-
<option name="underLabel">reported in the past day</option>
3541
<option name="unit">hosts</option>
3642
<option name="unitPosition">after</option>
3743
<option name="useColors">0</option>
@@ -43,17 +49,14 @@
4349
<single>
4450
<search>
4551
<query>sourcetype="puppet:summary" | stats count</query>
46-
<earliest>-24h@h</earliest>
47-
<latest>now</latest>
48-
<refresh>30s</refresh>
49-
<refreshType>delay</refreshType>
52+
<earliest>$overviewTimeRange.earliest$</earliest>
53+
<latest>$overviewTimeRange.latest$</latest>
5054
</search>
5155
<option name="drilldown">all</option>
5256
<option name="field">count</option>
5357
<option name="height">70</option>
5458
<option name="rangeColors">["0x53a051","0x0877a6","0xf8be34","0xf1813f","0xdc4e41"]</option>
5559
<option name="refresh.display">preview</option>
56-
<option name="underLabel">collected in the past day</option>
5760
<option name="unit">reports</option>
5861
<option name="unitPosition">after</option>
5962
<drilldown>
@@ -62,19 +65,19 @@
6265
</single>
6366
</panel>
6467
<panel>
65-
<title>Hosts with corrective changes (last 24h)</title>
68+
<title>Hosts with corrective changes</title>
6669
<single>
6770
<search>
6871
<query>sourcetype="puppet:summary"
6972
| search corrective_change=true
7073
| dedup certname
7174
| stats count</query>
72-
<earliest>-24h@h</earliest>
73-
<latest>now</latest>
75+
<earliest>$overviewTimeRange.earliest$</earliest>
76+
<latest>$overviewTimeRange.latest$</latest>
7477
</search>
7578
<option name="drilldown">all</option>
7679
<option name="rangeColors">["0x53a051","0x0877a6","0xf8be34","0xf1813f","0xdc4e41"]</option>
77-
<option name="refresh.display">progressbar</option>
80+
<option name="refresh.display">preview</option>
7881
<option name="trellis.enabled">0</option>
7982
<option name="trellis.size">large</option>
8083
<option name="trellis.splitBy">_aggregation</option>
@@ -85,19 +88,19 @@
8588
</single>
8689
</panel>
8790
<panel>
88-
<title>Hosts with failures (last 24h)</title>
91+
<title>Hosts with failures</title>
8992
<single>
9093
<search>
9194
<query>sourcetype="puppet:summary"
9295
| search status=failed
9396
| dedup certname
9497
| stats count</query>
95-
<earliest>-24h@h</earliest>
96-
<latest>now</latest>
98+
<earliest>$overviewTimeRange.earliest$</earliest>
99+
<latest>$overviewTimeRange.latest$</latest>
97100
</search>
98101
<option name="drilldown">all</option>
99102
<option name="rangeColors">["0x53a051","0x0877a6","0xf8be34","0xf1813f","0xdc4e41"]</option>
100-
<option name="refresh.display">progressbar</option>
103+
<option name="refresh.display">preview</option>
101104
<option name="underLabel">hosts with failures</option>
102105
<drilldown>
103106
<link target="_blank">/app/TA-puppet-report-viewer/hosts_with_failures</link>
@@ -114,18 +117,17 @@
114117
| spath "metrics.changes"
115118
| search "metrics.changes"&gt;0
116119
| timechart count(metrics.changes)</query>
117-
<earliest>0</earliest>
118-
<latest></latest>
120+
<earliest>$overviewTimeRange.earliest$</earliest>
121+
<latest>$overviewTimeRange.latest$</latest>
119122
</search>
120123
<option name="charting.axisTitleX.text">Time</option>
121124
<option name="charting.axisTitleY.text">Changes</option>
122125
<option name="charting.axisY.abbreviation">none</option>
123126
<option name="charting.chart">line</option>
124127
<option name="charting.drilldown">all</option>
125128
<option name="charting.legend.placement">none</option>
126-
<option name="refresh.display">progressbar</option>
129+
<option name="refresh.display">preview</option>
127130
</chart>
128131
</panel>
129-
130132
</row>
131-
</dashboard>
133+
</form>

0 commit comments

Comments
 (0)