Merge charm-telegraf:cpu_usage_steal_dashboard into charm-telegraf:master

[Adam Dyess]

Add new metrics to the CPU dashboard presented by grafana on relation add to telegraf

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:b0d8ae568e7595a0bc70b7ac2371460ca73e57dc
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/40/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/124/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/340/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/40//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:46fdb0a6916977f32f1c9bfa610f8cb0e7657aca
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/41/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit-withcompiler/125/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/341/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-telegraf-ci/41//rebuild

review: Approve (continuous-integration)

[Paul Goins (vultaire)]

LGTM

review: Approve

[Xav Paice (xavpaice)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 252b8c92847e42adafc8ead8ccade5c8eab0189c

diff --git a/src/templates/dashboards/grafana/Telegraf.json.j2 b/src/templates/dashboards/grafana/Telegraf.json.j2
index 9e8bc5e..7a9c9b8 100644
--- a/src/templates/dashboards/grafana/Telegraf.json.j2
+++ b/src/templates/dashboards/grafana/Telegraf.json.j2
@@ -503,6 +503,27 @@
               "legendFormat": "idle - {{ host }}",
               "refId": "B",
               "step": 2
+            },
+            {
+              "expr": "cpu_usage_steal{cpu=\"cpu-total\", host=~\"$host\"}",
+              "interval": "",
+              "intervalFactor": 2,
+              "legendFormat": "steal {{host}}",
+              "refId": "H"
+            },
+            {
+              "expr": "cpu_usage_guest{cpu=\"cpu-total\", host=~\"$host\"}",
+              "interval": "",
+              "intervalFactor": 2,
+              "legendFormat": "guest {{host}}",
+              "refId": "I"
+            },
+            {
+              "expr": "cpu_usage_guest_nice{cpu=\"cpu-total\", host=~\"$host\"}",
+              "interval": "",
+              "intervalFactor": 2,
+              "legendFormat": "guest-nice {{host}}",
+              "refId": "J"
             }
           ],
           "thresholds": [],