fix: Grafana dashboard 'no data' — datasource + Flux queries

- Fix datasource: bucket=smartcity, token=my-super-token, org=digitribe
- Fix dashboard queries: filter by topic tag instead of _measurement
  (all data in measurement 'mqtt_consumer', type in tag 'topic')
- Fix field names: temperature_c→temperature_celsius, luminosity→brightness_lux
- Update dashboard to v3 with 15 panels (airquality, traffic, parking, weather, noise, light)
- Update TODO.md and session_resume

Tested: PM2.5 ✅, Temperature ✅, Vehicle Count ✅ via Grafana API

grafana/provisioning/dashboards/smart-city-dashboards.json

@@ -3,14 +3,170 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": null,
   "links": [],
-  "panels": [],
+  "panels": [
+    {
+      "title": "Air Quality — PM2.5 (µg/m³)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/airquality/)\n  |> filter(fn: (r) => r[\"_field\"] == \"pm25_ugm3\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 0}
+    },
+    {
+      "title": "Air Quality — NO2 (µg/m³)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/airquality/)\n  |> filter(fn: (r) => r[\"_field\"] == \"no2_ugm3\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 0}
+    },
+    {
+      "title": "Temperature (°C)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"temperature_celsius\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 8}
+    },
+    {
+      "title": "Humidity (%)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"humidity_percent\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 8}
+    },
+    {
+      "title": "Wind Speed (km/h)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"wind_speed_kmh\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 16}
+    },
+    {
+      "title": "Rain (mm)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"rain_mm\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 16}
+    },
+    {
+      "title": "Traffic — Vehicle Count",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/traffic/)\n  |> filter(fn: (r) => r[\"_field\"] == \"vehicle_count\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 24}
+    },
+    {
+      "title": "Traffic — Avg Speed (km/h)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/traffic/)\n  |> filter(fn: (r) => r[\"_field\"] == \"average_speed_kmh\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 24}
+    },
+    {
+      "title": "Parking — Available Spots",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/parking/)\n  |> filter(fn: (r) => r[\"_field\"] == \"available_spots\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 32}
+    },
+    {
+      "title": "Parking — Occupancy (%)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/parking/)\n  |> filter(fn: (r) => r[\"_field\"] == \"occupancy_percent\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 32}
+    },
+    {
+      "title": "Noise Level (dB)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/noise/)\n  |> filter(fn: (r) => r[\"_field\"] == \"noise_level_db\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 40}
+    },
+    {
+      "title": "Light — Brightness (lux)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/light/)\n  |> filter(fn: (r) => r[\"_field\"] == \"brightness_lux\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 40}
+    },
+    {
+      "title": "UV Index",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"uv_index\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 48}
+    },
+    {
+      "title": "Pressure (hPa)",
+      "type": "timeseries",
+      "datasource": {"type": "influxdb", "name": "Influxdb-v2"},
+      "targets": [
+        {
+          "query": "from(bucket:\"smartcity\")\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"topic\"] =~ /smartcity\\/weather/)\n  |> filter(fn: (r) => r[\"_field\"] == \"pressure_hpa\")\n  |> aggregateWindow(every: v.windowPeriod, fn: mean, createEmpty: false)\n          |> yield(name: \"mean\")"
+        }
+      ],
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 48}
+    }
+  ],
   "schemaVersion": 36,
   "style": "dark",
-  "tags": ["smart-city"],
+  "tags": ["smartcity", "martinique", "iot"],
   "templating": {"list": []},
-  "time": {"from": "now-24h", "to": "now"},
-  "title": "Smart City Dashboards",
-  "timezone": "Americas/Martinique",
-  "uid": "smart-city-dashboards"
+  "time": {"from": "now-1h", "to": "now"},
+  "title": "Smart City Digital Twin — Martinique",
+  "uid": "smartcity-martinique-v2",
+  "version": 2
 }

grafana/provisioning/datasources/datasources.yml

@@ -1,9 +1,8 @@
 # Grafana datasources - Smart City Digital Twin Martinique
-# Each datasource is editable and uses the container DNS name in smartcity-shared network
 apiVersion: 1
 
 datasources:
-  # ── InfluxDB v2 (time-series IoT data) ──────────────────────────────────────
+  # InfluxDB v2 (time-series IoT data)
   - name: InfluxDB-v2
     type: influxdb
     access: proxy
@@ -13,12 +12,12 @@ datasources:
     jsonData:
       version: Flux
       organization: digitribe
-      defaultBucket: iot_data
+      defaultBucket: smartcity
+      tlsSkipVerify: true
     secureJsonData:
-      token: my-super-secret-admin-token
+      token: my-super-token
 
-  # ── FIWARE Orion-LD (NGSI-LD context broker) ────────────────────────────────
-  # Requires grafana-simple-json-datasource plugin
+  # FIWARE Orion-LD
   - name: FIWARE Orion
     type: grafana-simple-json-datasource
     access: proxy
@@ -28,8 +27,7 @@ datasources:
       queryURLTemplate: "/ngsi-ld/v1/entities?type={{type}}"
       method: GET
 
-  # ── GeoServer WMS (spatial data) ────────────────────────────────────────────
-  # GeoServer is an external service reachable via its container name
+  # GeoServer WMS
   - name: GeoServer WMS
     type: grafana-simple-json-datasource
     access: proxy
@@ -39,8 +37,7 @@ datasources:
       queryURLTemplate: "/geoserver/wfs?service=WFS&version=2.0&request=GetFeature&typeName={{type}}"
       method: GET
 
-  # ── FROST-Server (SensorThings API) ──────────────────────────────────────────
-  # Requires grafana-simple-json-datasource plugin
+  # FROST-Server
   - name: FROST-Server
     type: grafana-simple-json-datasource
     access: proxy