ui: add thresholds to summary export

grafana · Nov 11, 2019 · 5d558ee · mstoykov · Nov 11, 2019 · cuonglm
1 parent f6290b7
commit 5d558ee
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/ui/summary.go b/ui/summary.go
@@ -416,6 +416,20 @@ func (s *Summary) SummarizeMetricsJSON(w io.Writer, data SummaryData) error {
 
 		sinkData := m.Sink.Format(data.Time)
 		metricsData[name] = sinkData
+
+		if len(m.Thresholds.Thresholds) > 0 {
+			sinkDataWithThreshold := make(map[string]interface{})
+			for k, v := range sinkData {
+				sinkDataWithThreshold[k] = v
+			}
+			thresholds := make(map[string]interface{})
+			for _, threshold := range m.Thresholds.Thresholds {
+				thresholds[threshold.Source] = threshold.LastFailed
+			}
+			sinkDataWithThreshold["thresholds"] = thresholds
+			metricsData[name] = sinkDataWithThreshold
+		}
+
 		if _, ok := m.Sink.(*stats.TrendSink); ok {
 			continue
 		}

diff --git a/ui/summary_test.go b/ui/summary_test.go
@@ -162,7 +162,20 @@ func createTestMetrics() map[string]*stats.Metric {
 	metrics["vus"] = gaugeMetric
 	metrics["http_reqs"] = countMetric
 	metrics["checks"] = checksMetric
-	metrics["my_trend"] = &stats.Metric{Name: "my_trend", Type: stats.Trend, Contains: stats.Time, Sink: sink}
+	metrics["my_trend"] = &stats.Metric{
+		Name:     "my_trend",
+		Type:     stats.Trend,
+		Contains: stats.Time,
+		Sink:     sink,
+		Thresholds: stats.Thresholds{
+			Thresholds: []*stats.Threshold{
+				&stats.Threshold{
+					Source:     "my_trend<1000",
+					LastFailed: true,
+				},
+			},
+		},
+	}
 
 	return metrics
 }
@@ -209,7 +222,10 @@ func TestSummarizeMetricsJSON(t *testing.T) {
             "med": 15,
             "min": 10,
             "p(90)": 19,
-            "p(95)": 19.5
+            "p(95)": 19.5,
+            "thresholds": {
+                "my_trend<1000": true
+            }
         },
         "vus": {
             "value": 1,