Commit 22d5c0c1 authored by Clever Crib's avatar Clever Crib

Changed queries for "past 7d" graphs for increased accuracy

parent dc277900
......@@ -2,7 +2,7 @@
"__inputs": [
{
"name": "DS_HASS",
"label": "HomeAssistant",
"label": "HASS",
"description": "",
"type": "datasource",
"pluginId": "influxdb",
......@@ -14,7 +14,7 @@
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "5.4.2"
"version": "5.4.3"
},
{
"type": "panel",
......@@ -685,8 +685,8 @@
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
"total": true,
"values": true
},
"lines": false,
"linewidth": 1,
......@@ -721,6 +721,8 @@
"measurement": "kWh",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"value\") - first(\"value\") FROM \"kWh\" WHERE (\"entity_id\" = 'power_consumption_low') AND $timeFilter GROUP BY time(1d)\n",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
......@@ -769,6 +771,8 @@
"measurement": "kWh",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"value\") - first(\"value\") FROM \"kWh\" WHERE (\"entity_id\" = 'power_consumption_normal') AND $timeFilter GROUP BY time(1d)\n",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
......@@ -801,7 +805,7 @@
"thresholds": [],
"timeFrom": "7d",
"timeRegions": [],
"timeShift": null,
"timeShift": "1h",
"title": "Electricity past 7 days",
"tooltip": {
"shared": true,
......@@ -900,6 +904,8 @@
"measurement": "m3",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT last(\"value\") - first(\"value\") FROM \"m3\" WHERE (\"entity_id\" = 'gas_consumption') AND $timeFilter GROUP BY time(1d)\n",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
......@@ -984,6 +990,7 @@
},
"timepicker": {
"hidden": true,
"nowDelay": "",
"refresh_intervals": [
"5s",
"10s",
......@@ -1011,5 +1018,5 @@
"timezone": "browser",
"title": "Energy usage",
"uid": "Wz8Wde8mz",
"version": 15
"version": 2
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment