From 2aade2a4586aa56b2958827bbbd59d30e6072248 Mon Sep 17 00:00:00 2001 From: Guillaume Thouvenin Date: Thu, 17 Sep 2015 13:35:16 +0200 Subject: [PATCH] Fix error in query using derivative(value) Derivatives with a GROUP BY time clause require an aggregate function to be in the call to derivative. This patch adds first() function into each derivative call. Change-Id: Ie52cf13bf82c33197987408dbf946be2faf8b614 Closes-Bug: #1496752 --- .../grafana_dashboards/Ceph_OSD.json | 44 +++++++++---------- .../templates/grafana_dashboards/LMA.json | 8 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json index a883c12b..4ebeac0d 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json @@ -154,14 +154,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "series": "/$osd.osd.op$/", "tags": [ @@ -242,7 +242,7 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value,1s)" } ], "fill": "0", @@ -251,7 +251,7 @@ "hide": false, "interval": "", "measurement": "ceph_perf_osd_op_in_bytes", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "series": "/$osd.osd.op_in_bytes/", "tags": [ @@ -272,7 +272,7 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", @@ -280,7 +280,7 @@ "groupByTags": [], "interval": "", "measurement": "ceph_perf_osd_op_out_bytes", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "rawQuery": false, "series": "/$osd.osd.op_out_bytes/", "tags": [ @@ -461,7 +461,7 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", @@ -469,7 +469,7 @@ "groupByTags": [], "interval": "", "measurement": "ceph_perf_osd_op_r_out_bytes", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_r_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r_out_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_r_out_bytes$/", "tags": [ { @@ -489,7 +489,7 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", @@ -497,7 +497,7 @@ "groupByTags": [], "interval": "", "measurement": "ceph_perf_osd_op_r", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_r\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_r\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_r$/", "tags": [ { @@ -694,14 +694,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value,1s)" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_w_in_bytes", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_w_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_w_in_bytes$/", "tags": [ { @@ -721,14 +721,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_w", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_w\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_w_in_bytes$/", "tags": [ { @@ -748,14 +748,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_w_rlat", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_w_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_w_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_w_in_bytes$/", "tags": [ { @@ -962,14 +962,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_rw_in_bytes", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_rw_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_in_bytes\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_rw_in_bytes$/", "tags": [ { @@ -989,14 +989,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_rw", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_rw\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_rw$/", "tags": [ { @@ -1016,14 +1016,14 @@ "fields": [ { "func": "derivative", - "name": "value,1s" + "name": "first(value),1s" } ], "fill": "0", "function": "derivative", "groupByTags": [], "measurement": "ceph_perf_osd_op_rw_rlat", - "query": "SELECT derivative(value,1s) FROM \"ceph_perf_osd_op_rw_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"ceph_perf_osd_op_rw_rlat\" WHERE \"cluster\" =~ /$cluster/ AND \"osd\" =~ /$osd/ AND $timeFilter GROUP BY time($interval) fill(0)", "series": "/$osd.osd.op_rw_rlat$/", "tags": [ { diff --git a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json index 311ca42a..7a0bdc02 100644 --- a/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json +++ b/deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json @@ -57,14 +57,14 @@ "column": "value", "fields": [ { - "name": "value,1s", + "name": "first(value),1s", "func": "derivative" } ], "alias": "$tag_name", "series": "/$node.*decoder.*count/", "measurement": "hekad_msg_count", - "query": "SELECT derivative(value,1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'decoder' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", "fill": "0" } ], @@ -235,14 +235,14 @@ "column": "value", "fields": [ { - "name": "value,1s", + "name": "first(value),1s", "func": "derivative" } ], "alias": "$tag_name", "series": "/$node.*filter.*count/", "measurement": "hekad_msg_count", - "query": "SELECT derivative(value,1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", + "query": "SELECT derivative(first(value),1s) FROM \"hekad_msg_count\" WHERE \"hostname\" = '$node' AND \"type\" = 'filter' AND $timeFilter GROUP BY time($interval), \"name\" fill(0)", "fill": "0" } ],