From 3827c0a69c23f892ac5491022b5e840263b275ff Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 6 Feb 2017 14:59:29 +0100 Subject: [PATCH] tech(alerting): adds tags to alerting data model --- pkg/services/alerting/conditions/query.go | 1 + pkg/tsdb/models.go | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go index 32bcf6a5cb5..e0a6035355d 100644 --- a/pkg/services/alerting/conditions/query.go +++ b/pkg/services/alerting/conditions/query.go @@ -67,6 +67,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio matches = append(matches, &alerting.EvalMatch{ Metric: series.Name, Value: reducedValue, + Tags: series.Tags, }) } } diff --git a/pkg/tsdb/models.go b/pkg/tsdb/models.go index 68f26a68d50..ade9b1c75f2 100644 --- a/pkg/tsdb/models.go +++ b/pkg/tsdb/models.go @@ -51,8 +51,9 @@ type QueryResult struct { } type TimeSeries struct { - Name string `json:"name"` - Points TimeSeriesPoints `json:"points"` + Name string `json:"name"` + Points TimeSeriesPoints `json:"points"` + Tags map[string]string `json:"tags"` } type TimePoint [2]null.Float