diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-08-31 11:09:35 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-12-17 13:03:38 +0000 |
| commit | 3d043b231d91aa27449635a25d2f416b3ab38a2f (patch) | |
| tree | bc45944942aa9f070f7d0e00ec36212f571e4f8f /docker | |
| parent | e21e1e13a29189b024801cb344093688f772890a (diff) | |
[grafana] Update Dashboard for CPU Usage
After the introduction of the collectd_config roles, for generating
configs, some of the configs changed, as they were no longer relying on
collectd's defaults.
One of these was the cpu plugin, which configured ``ReportPercentage True``
by the config role. The effected the grafana dashboards, because the CPU
usage dashboard explicitly selected ``type=cpu``. With the values being
reported as percentage, collectd sets the ``type=percent`` for the metrics
stored in influx (which grafana retrieves), so the dashboards dodn't
have any data to display. By removing the ``type=cpu`` filter, the CPU
metrics are once again showing in grafana, and will be shown whether the
CPU usage is reported in percentage or the default jiffies.
Signed-off-by: "Emma Foley <efoley@redhat.com>"
Change-Id: I03a6f01677514d888e7805358855947791ab173c
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ansible/roles/config_files/vars/main.yml | 3 | ||||
| -rw-r--r-- | docker/barometer-grafana/dashboards/cpu_usage_dashboard.json | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docker/ansible/roles/config_files/vars/main.yml b/docker/ansible/roles/config_files/vars/main.yml index 410e24ed..02fd7fb9 100644 --- a/docker/ansible/roles/config_files/vars/main.yml +++ b/docker/ansible/roles/config_files/vars/main.yml @@ -18,6 +18,9 @@ collectd_hostname: "{{ inventory_hostname }}" collectd_plugin_capabilities_port: "9564" +collectd_plugin_cpu_valuespercentage: False +collectd_plugin_cpu_reportbystate: True + collectd_plugin_csv_datadir: "{{ csv_log_dir }}" collectd_plugin_csv_storerates: False diff --git a/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json index 0b8ab73e..bab2742d 100644 --- a/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json +++ b/docker/barometer-grafana/dashboards/cpu_usage_dashboard.json @@ -582,7 +582,7 @@ "measurement": "cpu_value", "orderByTime": "ASC", "policy": "default", - "query": "select derivative(mean(value),1s) AS idle from \"cpu_value\" WHERE \"type\" = 'cpu' AND \"host\" =~ /^$host$/ AND $timeFilter GROUP BY time($interval), instance, type_instance fill(null)", + "query": "select derivative(mean(value),1s) AS idle from \"cpu_value\" WHERE \"host\" =~ /^$host$/ AND $timeFilter GROUP BY time($interval), instance, type_instance fill(null)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -710,7 +710,7 @@ "measurement": "cpu_value", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"value\") FROM \"cpu_value\" WHERE (\"host\" =~ /^$host$/ AND \"type\" = 'cpu' AND \"type_instance\" != 'idle') AND $timeFilter GROUP BY time($__interval), \"instance\", \"type_instance\" fill(none)", + "query": "SELECT mean(\"value\") FROM \"cpu_value\" WHERE (\"host\" =~ /^$host$/ AND \"type_instance\" != 'idle') AND $timeFilter GROUP BY time($__interval), \"instance\", \"type_instance\" fill(none)", "rawQuery": true, "refId": "A", "resultFormat": "time_series", |