referit changes

pkg/datasource/problems_alerting.go

@@ -11,13 +11,20 @@ import (
 )
 
 func (ds *ZabbixDatasourceInstance) queryProblemsAlerting(ctx context.Context, query *QueryModel) ([]*data.Frame, error) {
+	ds.logger.Info("queryProblemsAlerting called", "groupFilter", query.Group.Filter, "hostFilter", query.Host.Filter)
+
 	triggers, err := ds.zabbix.GetTriggers(ctx, query.Group.Filter, query.Host.Filter)
 	if err != nil {
+		ds.logger.Error("GetTriggers failed", "error", err)
 		return nil, err
 	}
 
+	ds.logger.Info("GetTriggers returned", "count", len(triggers))
+
 	if len(triggers) == 0 {
-		return []*data.Frame{}, nil
+		frame := data.NewFrame("No triggers found")
+		frame.RefID = query.RefID
+		return []*data.Frame{frame}, nil
 	}
 
 	triggerIDs := make([]string, len(triggers))
@@ -30,6 +37,7 @@ func (ds *ZabbixDatasourceInstance) queryProblemsAlerting(ctx context.Context, q
 		return nil, err
 	}
 
+	// Map trigger ID to problem (includes opdata captured at problem creation)
 	problemMap := buildProblemMap(problems)
 	currentTime := time.Now()
 
@@ -37,10 +45,14 @@ func (ds *ZabbixDatasourceInstance) queryProblemsAlerting(ctx context.Context, q
 	for _, trigger := range triggers {
 		for _, host := range trigger.Hosts {
 			value := 0.0
-			if problemMap[trigger.ID] {
+			problemName := ""
+			opdata := ""
+			if problem, hasProblem := problemMap[trigger.ID]; hasProblem {
 				value = 1.0
+				problemName = problem.Name   // Expanded trigger description at problem creation
+				opdata = problem.Opdata      // Operational data if configured
 			}
-			frame := createAlertingFrame(trigger, host, value, currentTime, query.RefID)
+			frame := createAlertingFrame(trigger, host, value, problemName, opdata, currentTime, query.RefID)
 			frames = append(frames, frame)
 		}
 	}
@@ -48,21 +60,24 @@ func (ds *ZabbixDatasourceInstance) queryProblemsAlerting(ctx context.Context, q
 	return frames, nil
 }
 
-func buildProblemMap(problems []zabbix.Problem) map[string]bool {
-	problemMap := make(map[string]bool)
+// buildProblemMap returns a map of trigger ID to Problem object
+func buildProblemMap(problems []zabbix.Problem) map[string]zabbix.Problem {
+	problemMap := make(map[string]zabbix.Problem)
 	for _, p := range problems {
-		problemMap[p.ObjectID] = true
+		problemMap[p.ObjectID] = p
 	}
 	return problemMap
 }
 
-func createAlertingFrame(trigger zabbix.Trigger, host zabbix.ItemHost, value float64, ts time.Time, refID string) *data.Frame {
+func createAlertingFrame(trigger zabbix.Trigger, host zabbix.ItemHost, value float64, problemName string, opdata string, ts time.Time, refID string) *data.Frame {
 	labels := data.Labels{
-		"host":       host.Name,
-		"trigger":    trigger.Description,
-		"trigger_id": trigger.ID,
-		"severity":   trigger.Priority,
-		"tags":       formatTags(trigger.Tags),
+		"host":         host.Name,
+		"trigger":      trigger.Description,
+		"trigger_id":   trigger.ID,
+		"severity":     mapSeverity(trigger.Priority),
+		"tags":         formatTags(trigger.Tags),
+		"problem_name": problemName, // Expanded trigger description at problem creation
+		"opdata":       opdata,      // Operational data if configured on trigger
 	}
 
 	timeField := data.NewField("time", nil, []time.Time{ts})
@@ -75,6 +90,25 @@ func createAlertingFrame(trigger zabbix.Trigger, host zabbix.ItemHost, value flo
 	return frame
 }
 
+func mapSeverity(priority string) string {
+	switch priority {
+	case "0":
+		return "Not classified"
+	case "1":
+		return "Information"
+	case "2":
+		return "Warning"
+	case "3":
+		return "Average"
+	case "4":
+		return "High"
+	case "5":
+		return "Disaster"
+	default:
+		return priority
+	}
+}
+
 func formatTags(tags []zabbix.Tag) string {
 	if len(tags) == 0 {
 		return ""