Skip to content

Commit 6c1d819

Browse files
coreymbecoreymbe
authored
Merge pull request #49 from coreymbe/PIE-1118-refactor_metrics
PIE-1118 Refactor metrics for comparison view
2 parents 591a660 + 2aeb5f5 commit 6c1d819

File tree

1 file changed

+55
-55
lines changed
  • TA-puppet-report-viewer/default/data/ui/views

1 file changed

+55
-55
lines changed

‎TA-puppet-report-viewer/default/data/ui/views/metrics.xml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,11 @@
1212
<query>`puppet_metrics_index` sourcetype="puppet:metrics"
1313
| dedup pe_console
1414
| table pe_console</query>
15-
<earliest>$field2.earliest$</earliest>
16-
<latest>$field2.latest$</latest>
17-
</search>
18-
</input>
19-
<input type="dropdown" token="host" searchWhenChanged="true">
20-
<label>Infrastructure Host</label>
21-
<prefix>host="</prefix>
22-
<suffix>"</suffix>
23-
<fieldForLabel>host</fieldForLabel>
24-
<fieldForValue>host</fieldForValue>
25-
<search>
26-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" $pe_console$
27-
| dedup host
28-
| table host</query>
29-
<earliest>$field2.earliest$</earliest>
30-
<latest>$field2.latest$</latest>
15+
<earliest>-24h@h</earliest>
16+
<latest>now</latest>
3117
</search>
3218
</input>
33-
<input type="dropdown" token="field1">
19+
<input type="dropdown" token="metric" searchWhenChanged="true">
3420
<label>Metrics</label>
3521
<choice value="puppetserver">Puppet Server</choice>
3622
<choice value="puppetdb">PuppetDB</choice>
@@ -64,6 +50,20 @@
6450
</condition>
6551
</change>
6652
</input>
53+
<input type="dropdown" token="host" searchWhenChanged="true">
54+
<label>Infrastructure Host</label>
55+
<prefix>host="</prefix>
56+
<suffix>"</suffix>
57+
<fieldForLabel>host</fieldForLabel>
58+
<fieldForValue>host</fieldForValue>
59+
<search>
60+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" $pe_console$ pe_service=$metric$
61+
| dedup host
62+
| table host</query>
63+
<earliest>$field2.earliest$</earliest>
64+
<latest>$field2.latest$</latest>
65+
</search>
66+
</input>
6767
<input type="time" token="field2" searchWhenChanged="true">
6868
<label>Time Range</label>
6969
<default>
@@ -239,9 +239,9 @@
239239
<chart>
240240
<title>Average Requested JRubies</title>
241241
<search>
242-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver $host$
242+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver
243243
| rename jruby-metrics.status.experimental.metrics.average-requested-jrubies as Requested_JRubies
244-
| timechart span=300s values(Requested_JRubies) as "Requested JRubies"</query>
244+
| timechart span=300s values(Requested_JRubies) as "Requested JRubies" by host</query>
245245
<earliest>$field2.earliest$</earliest>
246246
<latest>$field2.latest$</latest>
247247
<sampleRatio>1</sampleRatio>
@@ -292,11 +292,11 @@
292292
<chart>
293293
<title>Average Borrow / Compile Time</title>
294294
<search>
295-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver $host$
295+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver
296296
| rename jruby-metrics.status.experimental.metrics.average-borrow-time as Borrow_Time, jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-catalog.mean as Compile_Time
297297
| eval Borrow_Time=Borrow_Time/1000
298298
| eval Compile_Time=Compile_Time/1000
299-
| timechart span=300s avg(Borrow_Time) as "Borrow Time" values(Compile_Time) as "Compile Time"</query>
299+
| timechart span=300s avg(Borrow_Time) as "Borrow Time" values(Compile_Time) as "Compile Time" by host</query>
300300
<earliest>$field2.earliest$</earliest>
301301
<latest>$field2.latest$</latest>
302302
<sampleRatio>1</sampleRatio>
@@ -347,9 +347,9 @@
347347
<chart>
348348
<title>Average Free JRubies</title>
349349
<search>
350-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver $host$
350+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver
351351
| rename jruby-metrics.status.experimental.metrics.num-free-jrubies as Free_JRubies
352-
| timechart span=300s avg(Free_JRubies) as "Free JRubies"</query>
352+
| timechart span=300s avg(Free_JRubies) as "Free JRubies" by host</query>
353353
<earliest>$field2.earliest$</earliest>
354354
<latest>$field2.latest$</latest>
355355
<sampleRatio>1</sampleRatio>
@@ -398,10 +398,10 @@
398398
<chart>
399399
<title>Average Wait Time</title>
400400
<search>
401-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver $host$
401+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetserver
402402
| rename jruby-metrics.status.experimental.metrics.average-wait-time as Wait_Time
403403
| eval Wait_Time=Wait_Time/1000
404-
| timechart span=300s values(Wait_Time) as "Wait Time"</query>
404+
| timechart span=300s values(Wait_Time) as "Wait Time" by host</query>
405405
<earliest>$field2.earliest$</earliest>
406406
<latest>$field2.latest$</latest>
407407
<sampleRatio>1</sampleRatio>
@@ -1000,10 +1000,10 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
10001000
<chart>
10011001
<title>Commands Per Second</title>
10021002
<search>
1003-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1003+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
10041004
| rename global_processed.FiveMinuteRate as "Commands per Second"
10051005
| eval 'Commands per Second'='Commands per Second'/300
1006-
| timechart span=300s list('Commands per Second') as "Commands per Second"</query>
1006+
| timechart span=300s list('Commands per Second') as "Commands per Second" by host</query>
10071007
<earliest>$field2.earliest$</earliest>
10081008
<latest>$field2.latest$</latest>
10091009
<sampleRatio>1</sampleRatio>
@@ -1051,9 +1051,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
10511051
<chart>
10521052
<title>Command Processing Time</title>
10531053
<search>
1054-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1054+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
10551055
| rename global_processing-time.95thPercentile as "Command Processing Time"
1056-
| timechart span=300s list("Command Processing Time") as "Command Processing Time"</query>
1056+
| timechart span=300s list("Command Processing Time") as "Command Processing Time" by host</query>
10571057
<earliest>$field2.earliest$</earliest>
10581058
<latest>$field2.latest$</latest>
10591059
<sampleRatio>1</sampleRatio>
@@ -1103,9 +1103,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
11031103
<chart>
11041104
<title>Queue Depth</title>
11051105
<search>
1106-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1106+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
11071107
| rename puppetdb-status.status.queue_depth as "Queue Depth"
1108-
| timechart span=300s list("Queue Depth") as "Queue Depth"</query>
1108+
| timechart span=300s list("Queue Depth") as "Queue Depth" by host</query>
11091109
<earliest>$field2.earliest$</earliest>
11101110
<latest>$field2.latest$</latest>
11111111
<sampleRatio>1</sampleRatio>
@@ -1155,9 +1155,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
11551155
<chart>
11561156
<title>Replace Catalog Time</title>
11571157
<search>
1158-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1158+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
11591159
| rename storage_replace-catalog-time.95thPercentile as "Replace Catalog Time"
1160-
| timechart span=300s list("Replace Catalog Time") as "Replace Catalog Time"</query>
1160+
| timechart span=300s list("Replace Catalog Time") as "Replace Catalog Time" by host</query>
11611161
<earliest>$field2.earliest$</earliest>
11621162
<latest>$field2.latest$</latest>
11631163
<sampleRatio>1</sampleRatio>
@@ -1205,9 +1205,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
12051205
<chart>
12061206
<title>Replace Facts Time</title>
12071207
<search>
1208-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1208+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
12091209
| rename storage_replace-facts-time.95thPercentile as "Replace Facts Time"
1210-
| timechart span=300s list("Replace Facts Time") as "Replace Facts Time"</query>
1210+
| timechart span=300s list("Replace Facts Time") as "Replace Facts Time" by host</query>
12111211
<earliest>$field2.earliest$</earliest>
12121212
<latest>$field2.latest$</latest>
12131213
<sampleRatio>1</sampleRatio>
@@ -1255,9 +1255,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
12551255
<chart>
12561256
<title>Store Report Time</title>
12571257
<search>
1258-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1258+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
12591259
| rename storage_store-report-time.95thPercentile as "Store Report Time"
1260-
| timechart span=300s list("Store Report Time") as "Store Report Time"</query>
1260+
| timechart span=300s list("Store Report Time") as "Store Report Time" by host</query>
12611261
<earliest>$field2.earliest$</earliest>
12621262
<latest>$field2.latest$</latest>
12631263
<sampleRatio>1</sampleRatio>
@@ -1411,9 +1411,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
14111411
<chart>
14121412
<title>Average Command Persistence Time</title>
14131413
<search>
1414-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1414+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
14151415
| rename global_message-persistence-time.95thPercentile as "Command Persistence Time"
1416-
| timechart span=300s avg("Command Persistence Time") as "Average Command Persistence Time"</query>
1416+
| timechart span=300s avg("Command Persistence Time") as "Average Command Persistence Time" by host</query>
14171417
<earliest>$field2.earliest$</earliest>
14181418
<latest>$field2.latest$</latest>
14191419
<sampleRatio>1</sampleRatio>
@@ -1463,9 +1463,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
14631463
<chart>
14641464
<title>Average Read Duration</title>
14651465
<search>
1466-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1466+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
14671467
| rename PDBReadPool_pool_Usage.95thPercentile as "Read Duration"
1468-
| timechart span=300s avg("Read Duration") as "Average Read Duration"</query>
1468+
| timechart span=300s avg("Read Duration") as "Average Read Duration" by host</query>
14691469
<earliest>$field2.earliest$</earliest>
14701470
<latest>$field2.latest$</latest>
14711471
<sampleRatio>1</sampleRatio>
@@ -1513,9 +1513,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
15131513
<chart>
15141514
<title>Peak Read Pool Wait</title>
15151515
<search>
1516-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1516+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
15171517
| rename PDBReadPool_pool_Wait.999thPercentile as "Read Pool Wait"
1518-
| timechart span=300s values("Read Pool Wait") as "Peak Read Pool Wait"</query>
1518+
| timechart span=300s values("Read Pool Wait") as "Peak Read Pool Wait" by host</query>
15191519
<earliest>$field2.earliest$</earliest>
15201520
<latest>$field2.latest$</latest>
15211521
<sampleRatio>1</sampleRatio>
@@ -1563,9 +1563,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
15631563
<chart>
15641564
<title>Read Pool Pending Connections</title>
15651565
<search>
1566-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1566+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
15671567
| rename PDBReadPool_pool_PendingConnections.Value as "Read Pool Pending"
1568-
| timechart span=300s values("Read Pool Pending") as "Read Pool Pending Connections"</query>
1568+
| timechart span=300s values("Read Pool Pending") as "Read Pool Pending Connections" by host</query>
15691569
<earliest>$field2.earliest$</earliest>
15701570
<latest>$field2.latest$</latest>
15711571
<sampleRatio>1</sampleRatio>
@@ -1615,9 +1615,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
16151615
<chart>
16161616
<title>Average Write Duration</title>
16171617
<search>
1618-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1618+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
16191619
| rename PDBWritePool_pool_Usage.95thPercentile as "Write Duration"
1620-
| timechart span=300s avg("Write Duration") as "Average Write Duration"</query>
1620+
| timechart span=300s avg("Write Duration") as "Average Write Duration" by host</query>
16211621
<earliest>$field2.earliest$</earliest>
16221622
<latest>$field2.latest$</latest>
16231623
<sampleRatio>1</sampleRatio>
@@ -1665,9 +1665,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
16651665
<chart>
16661666
<title>Peak Write Pool Wait</title>
16671667
<search>
1668-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1668+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
16691669
| rename PDBWritePool_pool_Wait.999thPercentile as "Write Pool Wait"
1670-
| timechart span=300s values("Write Pool Wait") as "Peak Write Pool Wait"</query>
1670+
| timechart span=300s values("Write Pool Wait") as "Peak Write Pool Wait" by host</query>
16711671
<earliest>$field2.earliest$</earliest>
16721672
<latest>$field2.latest$</latest>
16731673
<sampleRatio>1</sampleRatio>
@@ -1715,9 +1715,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
17151715
<chart>
17161716
<title>Write Pool Pending Connections</title>
17171717
<search>
1718-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1718+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
17191719
| rename PDBWritePool_pool_PendingConnections.Value as "Write Pool Pending"
1720-
| timechart span=300s values("Write Pool Pending") as "Write Pool Pending Connections"</query>
1720+
| timechart span=300s values("Write Pool Pending") as "Write Pool Pending Connections" by host</query>
17211721
<earliest>$field2.earliest$</earliest>
17221722
<latest>$field2.latest$</latest>
17231723
<sampleRatio>1</sampleRatio>
@@ -1767,9 +1767,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
17671767
<chart>
17681768
<title>Global Discards</title>
17691769
<search>
1770-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1770+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
17711771
| rename global_discarded.OneMinuteRate as "Global Discards"
1772-
| timechart span=300s values("Global Discards") as "Global Discards"</query>
1772+
| timechart span=300s values("Global Discards") as "Global Discards" by host</query>
17731773
<earliest>$field2.earliest$</earliest>
17741774
<latest>$field2.latest$</latest>
17751775
<sampleRatio>1</sampleRatio>
@@ -1817,9 +1817,9 @@ jruby-metrics.status.experimental.metrics.borrow-timers.puppet-v3-node.rate as N
18171817
<chart>
18181818
<title>Global Fatals</title>
18191819
<search>
1820-
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb $host$
1820+
<query>`puppet_metrics_index` sourcetype="puppet:metrics" pe_service=puppetdb
18211821
| rename global_fatal.OneMinuteRate as "Global Fatals"
1822-
| timechart span=300s values("Global Fatals") as "Global Fatals"</query>
1822+
| timechart span=300s values("Global Fatals") as "Global Fatals" by host</query>
18231823
<earliest>$field2.earliest$</earliest>
18241824
<latest>$field2.latest$</latest>
18251825
<sampleRatio>1</sampleRatio>

0 commit comments

Comments
 (0)