summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Smith <aasmith@redhat.com>2018-09-04 00:02:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-04 00:02:46 +0000
commit73abc060f31a6bf866fa1dad0a1a6efdfd94d775 (patch)
tree34850ad1184efff6a8946f5adc643fce98c1e736
parentfe89db62df67452730f3793538efcc7fd5c4b488 (diff)
parent74c2af668ecfaa71b15c3f73b9d037b7117c9e86 (diff)
Merge "Fix for Grafana does not plot the RDT plugin data correctly."
-rw-r--r--docker/ansible/roles/config_files/templates/rdt.conf.j22
-rw-r--r--docker/barometer-grafana/dashboards/intel_rdt_dashboard.json6
2 files changed, 6 insertions, 2 deletions
diff --git a/docker/ansible/roles/config_files/templates/rdt.conf.j2 b/docker/ansible/roles/config_files/templates/rdt.conf.j2
index 814c23ca..0e1afcfc 100644
--- a/docker/ansible/roles/config_files/templates/rdt.conf.j2
+++ b/docker/ansible/roles/config_files/templates/rdt.conf.j2
@@ -13,7 +13,7 @@
# limitations under the License.
<LoadPlugin intel_rdt>
- Interval "{{ rdt_interval }}"
+ Interval {{ rdt_interval }}
</LoadPlugin>
<Plugin intel_rdt>
diff --git a/docker/barometer-grafana/dashboards/intel_rdt_dashboard.json b/docker/barometer-grafana/dashboards/intel_rdt_dashboard.json
index 49efec7a..38baa2f7 100644
--- a/docker/barometer-grafana/dashboards/intel_rdt_dashboard.json
+++ b/docker/barometer-grafana/dashboards/intel_rdt_dashboard.json
@@ -33,6 +33,7 @@
"datasource": "collectd",
"fill": 1,
"id": 1,
+ "interval": "1s",
"legend": {
"alignAsTable": true,
"avg": true,
@@ -171,6 +172,7 @@
"datasource": "collectd",
"fill": 1,
"id": 2,
+ "interval": "1s",
"legend": {
"alignAsTable": true,
"avg": true,
@@ -309,6 +311,7 @@
"datasource": "collectd",
"fill": 1,
"id": 3,
+ "interval": "1s",
"legend": {
"alignAsTable": true,
"avg": true,
@@ -441,6 +444,7 @@
"datasource": "collectd",
"fill": 1,
"id": 4,
+ "interval": "1s",
"legend": {
"alignAsTable": true,
"avg": true,
@@ -484,7 +488,7 @@
},
{
"params": [
- "none"
+ "null"
],
"type": "fill"
}