x/fuel-plugin-influxdb-grafana
Code Issues Proposed changes

Fix error in query using derivative(value)

Browse Source 
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
This commit is contained in:
Guillaume Thouvenin
2015-09-17 13:35:16 +02:00
parent 7d850acdd8
commit 2aade2a458
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/Ceph_OSD.json
View File

@@ -154,14 +154,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op", "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, "rawQuery": false,
"series": "/$osd.osd.op$/", "series": "/$osd.osd.op$/",
"tags": [ "tags": [
@@ -242,7 +242,7 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value,1s)"
} }
], ],
"fill": "0", "fill": "0",
@@ -251,7 +251,7 @@
"hide": false, "hide": false,
"interval": "", "interval": "",
"measurement": "ceph_perf_osd_op_in_bytes", "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, "rawQuery": false,
"series": "/$osd.osd.op_in_bytes/", "series": "/$osd.osd.op_in_bytes/",
"tags": [ "tags": [
@@ -272,7 +272,7 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
@@ -280,7 +280,7 @@
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"measurement": "ceph_perf_osd_op_out_bytes", "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, "rawQuery": false,
"series": "/$osd.osd.op_out_bytes/", "series": "/$osd.osd.op_out_bytes/",
"tags": [ "tags": [
@@ -461,7 +461,7 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
@@ -469,7 +469,7 @@
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"measurement": "ceph_perf_osd_op_r_out_bytes", "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$/", "series": "/$osd.osd.op_r_out_bytes$/",
"tags": [ "tags": [
{ {
@@ -489,7 +489,7 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
@@ -497,7 +497,7 @@
"groupByTags": [], "groupByTags": [],
"interval": "", "interval": "",
"measurement": "ceph_perf_osd_op_r", "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$/", "series": "/$osd.osd.op_r$/",
"tags": [ "tags": [
{ {
@@ -694,14 +694,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value,1s)"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_w_in_bytes", "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$/", "series": "/$osd.osd.op_w_in_bytes$/",
"tags": [ "tags": [
{ {
@@ -721,14 +721,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_w", "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$/", "series": "/$osd.osd.op_w_in_bytes$/",
"tags": [ "tags": [
{ {
@@ -748,14 +748,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_w_rlat", "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$/", "series": "/$osd.osd.op_w_in_bytes$/",
"tags": [ "tags": [
{ {
@@ -962,14 +962,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_rw_in_bytes", "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$/", "series": "/$osd.osd.op_rw_in_bytes$/",
"tags": [ "tags": [
{ {
@@ -989,14 +989,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_rw", "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$/", "series": "/$osd.osd.op_rw$/",
"tags": [ "tags": [
{ {
@@ -1016,14 +1016,14 @@
"fields": [ "fields": [
{ {
"func": "derivative", "func": "derivative",
"name": "value,1s" "name": "first(value),1s"
} }
], ],
"fill": "0", "fill": "0",
"function": "derivative", "function": "derivative",
"groupByTags": [], "groupByTags": [],
"measurement": "ceph_perf_osd_op_rw_rlat", "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$/", "series": "/$osd.osd.op_rw_rlat$/",
"tags": [ "tags": [
{ {

8
deployment_scripts/puppet/modules/lma_monitoring_analytics/templates/grafana_dashboards/LMA.json
View File

@@ -57,14 +57,14 @@
"column": "value", "column": "value",
"fields": [ "fields": [
{ {
"name": "value,1s", "name": "first(value),1s",
"func": "derivative" "func": "derivative"
} }
], ],
"alias": "$tag_name", "alias": "$tag_name",
"series": "/$node.*decoder.*count/", "series": "/$node.*decoder.*count/",
"measurement": "hekad_msg_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" "fill": "0"
} }
], ],
@@ -235,14 +235,14 @@
"column": "value", "column": "value",
"fields": [ "fields": [
{ {
"name": "value,1s", "name": "first(value),1s",
"func": "derivative" "func": "derivative"
} }
], ],
"alias": "$tag_name", "alias": "$tag_name",
"series": "/$node.*filter.*count/", "series": "/$node.*filter.*count/",
"measurement": "hekad_msg_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" "fill": "0"
} }
], ],