Refactor/filters

.gitignore

@@ -88,3 +88,6 @@ ENGINEERING_GUIDELINES.md
 scripts/check-loc.js
 /.github/prompts
 /.github/prompts/db-refactor/logs
+
+# Redesign working notes (Phase 50+ /charging redesign)
+REDESIGN-NOTES.md

cmd/notification-worker/main.go

@@ -12,6 +12,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	"github.com/ev-dev-labs/teslasync/internal/alertmsg"
 	"github.com/ev-dev-labs/teslasync/internal/apilog"
 	"github.com/ev-dev-labs/teslasync/internal/config"
 	"github.com/ev-dev-labs/teslasync/internal/database"
@@ -345,7 +346,21 @@ continue
 if !result.Triggered {
 continue
 }
-dispatchComputedMetricNotification(rule, vid, result, channels, mqttClient)
+// Resolve a friendly vehicle name for the message template,
+// falling back silently when the vehicle is missing — the
+// renderer is tolerant of an empty VehicleName.
+vehicleName := ""
+for _, v := range allVehicles {
+if v != nil && v.ID == vid {
+if v.DisplayName != "" {
+vehicleName = v.DisplayName
+} else {
+vehicleName = v.VIN
+}
+break
+}
+}
+dispatchComputedMetricNotification(rule, vid, vehicleName, result, channels, mqttClient)
 }
 }
 }
@@ -376,22 +391,43 @@ func vehiclesForRule(rule *models.AlertRule, all []*models.Vehicle) []int64 {
 func dispatchComputedMetricNotification(
 rule *models.AlertRule,
 vehicleID int64,
+vehicleName string,
 result computed.Result,
 channels []*models.NotificationChannel,
 mqttClient pahomqtt.Client,
 ) {
+// Phase-50 / ADR-005: route computed-metric dispatch through the
+// shared alertmsg package so the message is rendered identically to
+// the telemetry path. Without this, a custom msg_template on a
+// computed-metric rule would be ignored and the IncludeTitle toggle
+// would never reach the transports.
+msgCtx := alertmsg.BuildContext(rule, vehicleName, nil, map[string]any{
+"Severity":        rule.Severity,
+"MetricValue":     result.Value,
+"MetricPrevValue": result.PreviousValue,
+"MetricChangePct": result.PercentChange,
+})
+title := alertmsg.RenderTitle(rule, msgCtx)
+body := alertmsg.RenderBody(rule, msgCtx)
+if !rule.IncludeTitle && body == "" {
+body = rule.Name
+}
+suppressTransportTitle := !rule.IncludeTitle
+
 dispatched := 0
 for _, ch := range channels {
 if ch == nil || !ch.Enabled {
 continue
 }
 req := &notification.Request{
-ChannelType: ch.Type,
-Config:      ch.Config,
-Title:       rule.Name,
-Message:     result.Message,
-ChannelID:   ch.ID,
-AlertID:     rule.ID,
+ChannelType:            ch.Type,
+Config:                 ch.Config,
+Title:                  title,
+Message:                body,
+ChannelID:              ch.ID,
+AlertID:                rule.ID,
+Severity:               rule.Severity,
+SuppressTransportTitle: suppressTransportTitle,
 }
 if pubErr := notification.Publish(mqttClient, req); pubErr != nil {
 log.Error().

docs/public/openapi.yaml

@@ -4260,7 +4260,7 @@ paths:
     post:
       operationId: submitExportJob
       summary: Submit async export job
-      description: Submits an asynchronous export job for large datasets. CSV exports are v2-only and use SI canonical filenames and columns: teslasync-drives-v2.csv, teslasync-charging-v2.csv, teslasync-trips-v2.csv. Drive headers include distance_m, duration_s, max_speed_mps; trip headers include total_distance_m, total_energy_wh, total_duration_s.
+      description: "Submits an asynchronous export job for large datasets. CSV exports are v2-only and use SI canonical filenames and columns: teslasync-drives-v2.csv, teslasync-charging-v2.csv, teslasync-trips-v2.csv. Drive headers include distance_m, duration_s, max_speed_mps; trip headers include total_distance_m, total_energy_wh, total_duration_s."
       tags: [Export]
       requestBody:
         required: true

grafana/dashboards/infra/api-performance.json

@@ -835,9 +835,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "◀ Prev",
-      "tooltip": "TeslaSync - Telemetry Pipeline",
+      "tooltip": "TeslaSync - Trace Explorer (Tempo TraceQL)",
       "type": "link",
-      "url": "/d/teslasync-infra-telemetry"
+      "url": "/d/teslasync-infra-trace-explorer"
     },
     {
       "asDropdown": true,
@@ -859,9 +859,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "Next ▶",
-      "tooltip": "TeslaSync - Rules Engine",
+      "tooltip": "TeslaSync - Auth Login Deep-Dive (always-sampled)",
       "type": "link",
-      "url": "/d/teslasync-infra-cep"
+      "url": "/d/teslasync-infra-auth-deep-dive"
     }
   ]
 }

grafana/dashboards/infra/auth-deep-dive.json

@@ -166,5 +166,43 @@
       "targets": [{ "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }, "queryType": "traceql", "query": "{ span.http.route = \"/api/v1/auth/login\" && duration > 1s }", "limit": 30, "refId": "A" }],
       "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }
     }
+  ],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "◀ Prev",
+      "tooltip": "TeslaSync - API Performance",
+      "type": "link",
+      "url": "/d/teslasync-infra-api-perf"
+    },
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [
+        "teslasync"
+      ],
+      "targetBlank": false,
+      "title": "⚡ TeslaSync",
+      "type": "dashboards"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Next ▶",
+      "tooltip": "TeslaSync - Rules Engine",
+      "type": "link",
+      "url": "/d/teslasync-infra-cep"
+    }
   ]
 }

grafana/dashboards/infra/cep-rule-engine.json

@@ -464,9 +464,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "◀ Prev",
-      "tooltip": "TeslaSync - API Performance",
+      "tooltip": "TeslaSync - Auth Login Deep-Dive (always-sampled)",
       "type": "link",
-      "url": "/d/teslasync-infra-api-perf"
+      "url": "/d/teslasync-infra-auth-deep-dive"
     },
     {
       "asDropdown": true,
@@ -488,9 +488,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "Next ▶",
-      "tooltip": "TeslaSync - Infrastructure Health",
+      "tooltip": "TeslaSync - Critical Flow Latency (Phase-44 instrumented)",
       "type": "link",
-      "url": "/d/teslasync-infra-health"
+      "url": "/d/teslasync-infra-critical-flows"
     }
   ]
 }

grafana/dashboards/infra/critical-flows.json

@@ -184,5 +184,43 @@
       "targets": [{ "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }, "queryType": "traceql", "query": "{ name =~ \"mqtt.*|normalize.*\" && duration > 500ms }", "limit": 30, "refId": "A" }],
       "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }
     }
+  ],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "◀ Prev",
+      "tooltip": "TeslaSync - Rules Engine",
+      "type": "link",
+      "url": "/d/teslasync-infra-cep"
+    },
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [
+        "teslasync"
+      ],
+      "targetBlank": false,
+      "title": "⚡ TeslaSync",
+      "type": "dashboards"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Next ▶",
+      "tooltip": "TeslaSync - DB & Tesla API Span Breakdown (Tempo)",
+      "type": "link",
+      "url": "/d/teslasync-infra-db-tesla-breakdown"
+    }
   ]
 }

grafana/dashboards/infra/db-tesla-breakdown.json

@@ -182,5 +182,43 @@
       "targets": [{ "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }, "queryType": "traceql", "query": "{ span.kind = \"client\" && span.http.url =~ \".*tesla.*\" && span.duration > 2s }", "limit": 30, "refId": "A" }],
       "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }
     }
+  ],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "◀ Prev",
+      "tooltip": "TeslaSync - Critical Flow Latency (Phase-44 instrumented)",
+      "type": "link",
+      "url": "/d/teslasync-infra-critical-flows"
+    },
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [
+        "teslasync"
+      ],
+      "targetBlank": false,
+      "title": "⚡ TeslaSync",
+      "type": "dashboards"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Next ▶",
+      "tooltip": "TeslaSync - Fleet Telemetry Server",
+      "type": "link",
+      "url": "/d/teslasync-infra-fleet-telemetry"
+    }
   ]
 }

grafana/dashboards/infra/fleet-telemetry.json

@@ -572,5 +572,43 @@
         "current": { "text": "Prometheus", "value": "prometheus" }
       }
     ]
-  }
+  },
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "◀ Prev",
+      "tooltip": "TeslaSync - DB & Tesla API Span Breakdown (Tempo)",
+      "type": "link",
+      "url": "/d/teslasync-infra-db-tesla-breakdown"
+    },
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [
+        "teslasync"
+      ],
+      "targetBlank": false,
+      "title": "⚡ TeslaSync",
+      "type": "dashboards"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Next ▶",
+      "tooltip": "TeslaSync - Infrastructure Health",
+      "type": "link",
+      "url": "/d/teslasync-infra-health"
+    }
+  ]
 }

grafana/dashboards/infra/infrastructure.json

@@ -1461,9 +1461,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "◀ Prev",
-      "tooltip": "TeslaSync - Rules Engine",
+      "tooltip": "TeslaSync - Fleet Telemetry Server",
       "type": "link",
-      "url": "/d/teslasync-infra-cep"
+      "url": "/d/teslasync-infra-fleet-telemetry"
     },
     {
       "asDropdown": true,
@@ -1485,9 +1485,9 @@
       "tags": [],
       "targetBlank": false,
       "title": "Next ▶",
-      "tooltip": "TeslaSync - Sessions & Business Metrics",
+      "tooltip": "TeslaSync - MQTT Pipeline Trace View (Tempo)",
       "type": "link",
-      "url": "/d/teslasync-infra-sessions"
+      "url": "/d/teslasync-infra-mqtt-pipeline-traces"
     }
   ]
 }

grafana/dashboards/infra/mqtt-pipeline-traces.json

@@ -144,5 +144,43 @@
       "targets": [{ "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }, "queryType": "traceql", "query": "{ span.messaging.system = \"mqtt\" && status = error }", "limit": 30, "refId": "A" }],
       "datasource": { "type": "tempo", "uid": "DS_TESLASYNC_TEMPO" }
     }
+  ],
+  "links": [
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "◀ Prev",
+      "tooltip": "TeslaSync - Infrastructure Health",
+      "type": "link",
+      "url": "/d/teslasync-infra-health"
+    },
+    {
+      "asDropdown": true,
+      "icon": "external link",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [
+        "teslasync"
+      ],
+      "targetBlank": false,
+      "title": "⚡ TeslaSync",
+      "type": "dashboards"
+    },
+    {
+      "asDropdown": false,
+      "icon": "bolt",
+      "includeVars": true,
+      "keepTime": true,
+      "tags": [],
+      "targetBlank": false,
+      "title": "Next ▶",
+      "tooltip": "TeslaSync - Observability Self-Health (OTel Collector + Tempo)",
+      "type": "link",
+      "url": "/d/teslasync-infra-otel-self-health"
+    }
   ]
 }