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
#
+ "name": "DS_INFLUXDB_(INFLUXQL)",
#
+ "label": "InfluxDB (InfluxQL)",
#
+ "type": "datasource",
#
+ "pluginId": "influxdb",
#
+ "pluginName": "InfluxDB"
#
+ "type": "datasource",
#
+ "name": "Time series",
#
+ "uid": "-- Grafana --"
#
+ "iconColor": "rgba(0, 211, 255, 1)",
#
+ "name": "Annotations & Alerts",
#
+ "fiscalYearStartMonth": 0,
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "unit": "currencyGBP"
#
+ "colorMode": "value",
#
+ "justifyMode": "auto",
#
+ "orientation": "auto",
#
+ "pluginVersion": "9.5.1",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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)",
#
+ "resultFormat": "time_series"
#
+ "title": "Mean Import Cost per kWh",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "unit": "currencyGBP"
#
+ "colorMode": "value",
#
+ "justifyMode": "auto",
#
+ "orientation": "auto",
#
+ "pluginVersion": "9.5.1",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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)",
#
+ "resultFormat": "time_series"
#
+ "title": "Mean Export Cost per kWh",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "colorMode": "value",
#
+ "justifyMode": "auto",
#
+ "orientation": "auto",
#
+ "pluginVersion": "9.5.1",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND \"is_export\" !='True' GROUP BY time(30m) FILL(null)",
#
+ "resultFormat": "time_series"
#
+ "title": "Total Import",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "colorMode": "value",
#
+ "justifyMode": "auto",
#
+ "orientation": "auto",
#
+ "pluginVersion": "9.5.1",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND \"is_export\" ='True' GROUP BY time(30m) FILL(null)",
#
+ "resultFormat": "time_series"
#
+ "title": "Total Import",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "unit": "currencyGBP"
#
+ "__systemRef": "hideSeriesFrom",
#
+ "octopus_pricing.mean_cost_inc_vat {tariff_code: E-1R-AGILE-FLEX-22-11-25-A}"
#
+ "prefix": "All except:",
#
+ "id": "custom.hideFrom",
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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)",
#
+ "resultFormat": "time_series"
#
+ "title": "Cost per kWh",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND \"is_export\" !='True' GROUP BY time(30m) FILL(null)",
#
+ "resultFormat": "time_series"
#
+ "title": "Consumption",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "unit": "currencyGBP"
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND \"is_export\" !='True' GROUP BY time(30m) ",
#
+ "resultFormat": "time_series"
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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) ",
#
+ "resultFormat": "time_series"
#
+ "title": "Consumption Cost",
#
+ "id": "calculateField",
#
+ "alias": "consumption_cost",
#
+ "left": "octopus_consumption.mean_consumption",
#
+ "right": "octopus_pricing.mean_cost_inc_vat"
#
+ "replaceFields": true
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "unit": "currencyGBP"
#
+ "__systemRef": "hideSeriesFrom",
#
+ "octopus_pricing.mean_cost_inc_vat {tariff_code: E-1R-AGILE-FLEX-22-11-25-A}"
#
+ "prefix": "All except:",
#
+ "id": "custom.hideFrom",
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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)",
#
+ "resultFormat": "time_series"
#
+ "title": "Export Price per kWh",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND is_export=\"True\" GROUP BY time(30m) FILL(null)",
#
+ "resultFormat": "time_series"
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "mode": "palette-classic"
#
+ "axisCenteredZero": false,
#
+ "axisColorMode": "text",
#
+ "axisPlacement": "auto",
#
+ "gradientMode": "none",
#
+ "lineInterpolation": "linear",
#
+ "scaleDistribution": {
#
+ "showPoints": "auto",
#
+ "unit": "currencyGBP"
#
+ "__systemRef": "hideSeriesFrom",
#
+ "prefix": "All except:",
#
+ "id": "custom.hideFrom",
#
+ "displayMode": "list",
#
+ "placement": "bottom",
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "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)",
#
+ "resultFormat": "time_series"
#
+ "uid": "${DS_INFLUXDB_(INFLUXQL)}"
#
+ "query": "SELECT mean(\"consumption\") AS \"mean_consumption\" FROM \"Systemstats\".\"autogen\".\"octopus_consumption\" WHERE $timeFilter AND is_export =\"True\" GROUP BY time(30m) ",
#
+ "resultFormat": "time_series"
#
+ "title": "Export Price per kWh",
#
+ "id": "calculateField",
#
+ "alias": "export_value",
#
+ "left": "octopus_pricing.mean_cost_inc_vat",
#
+ "right": "octopus_consumption.mean_consumption"
#
+ "replaceFields": true
#
+ "title": "Octopus Pricing",
#
+ "uid": "ffb833f8-fae9-4b8c-9b14-99a2c2d9e8f2",
#
\ No newline at end of file