diff --git a/octopus-energy/grafana_dashboard.json b/octopus-energy/grafana_dashboard.json
--- a/octopus-energy/grafana_dashboard.json
+++ b/octopus-energy/grafana_dashboard.json
#
"pluginId": "influxdb",
#
"pluginName": "InfluxDB"
#
+ "name": "DS_INFLUXDB",
#
+ "type": "datasource",
#
+ "pluginId": "influxdb",
#
+ "pluginName": "InfluxDB"
#
- "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "uid": "${DS_INFLUXDB}"
#
- "__systemRef": "hideSeriesFrom",
#
- "octopus_pricing.mean_cost_inc_vat {tariff_code: E-1R-AGILE-FLEX-22-11-25-A}"
#
- "prefix": "All except:",
#
- "id": "custom.hideFrom",
#
- "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "uid": "${DS_INFLUXDB}"
#
- "query": "SELECT mean(\"cost_inc_vat\")/100 AS \"mean_cost_inc_vat\" FROM \"Systemstats\".\"autogen\".\"octopus_pricing\" WHERE $timeFilter AND \"charge_type\"='usage-charge' and tariff_direction != 'EXPORT' GROUP BY time(30m), \"tariff_code\" FILL(null)",
#
+ "query": "from(bucket: \"Systemstats\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn: (r) => r._measurement == \"octopus_pricing\")\n |> filter(fn: (r) => r._field == \"cost_inc_vat\")\n |> filter(fn: (r) => r.tariff_direction != \"EXPORT\")\n |> aggregateWindow(every: 30m, fn: mean)",
#
"resultFormat": "time_series"
#
- "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "uid": "${DS_INFLUXDB}"
#
- "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "uid": "${DS_INFLUXDB}"
#
- "query": "SELECT mean(\"cost_inc_vat\")/100 AS \"mean_cost_inc_vat\" FROM \"Systemstats\".\"autogen\".\"octopus_pricing\" WHERE $timeFilter AND \"charge_type\"='usage-charge' and tariff_direction = 'EXPORT' GROUP BY time(30m), \"tariff_code\" FILL(null)",
#
+ "query": "from(bucket: \"Systemstats\")\n |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n |> filter(fn: (r) => r._measurement == \"octopus_pricing\")\n |> filter(fn: (r) => r._field == \"cost_inc_vat\")\n |> filter(fn: (r) => r.tariff_direction == \"EXPORT\")\n |> aggregateWindow(every: 30m, fn: mean)",
#
"resultFormat": "time_series"
#
"title": "Octopus Pricing",
#
"uid": "ffb833f8-fae9-4b8c-9b14-99a2c2d9e8f2",
#
\ No newline at end of file