From 74c2af668ecfaa71b15c3f73b9d037b7117c9e86 Mon Sep 17 00:00:00 2001
From: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Date: Tue, 7 Aug 2018 16:14:59 +0200
Subject: Fix for Grafana does not plot the RDT plugin data correctly.

Fixed the interval of intel_rdt plugin and Grafana dashboard settings
to follow the correct interval.

Change-Id: Ia792c6b6308526d82f153275d5d5393b0aea312d
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
---
 docker/ansible/roles/config_files/templates/rdt.conf.j2      | 2 +-
 docker/barometer-grafana/dashboards/intel_rdt_dashboard.json | 6 +++++-
 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"
                   }
-- 
cgit 1.2.3-korg