fix legend add timeseries

moira-alert · May 26, 2018 · f2b513e · f2b513e
1 parent b348bc5
commit f2b513e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/api/handler/trigger_render.go b/api/handler/trigger_render.go
@@ -55,11 +55,14 @@ func renderTrigger(writer http.ResponseWriter, request *http.Request) {
 
 	var metricsData = make([]*types.MetricData, 0, len(tts.Main)+len(tts.Additional))
 	for _, ts := range tts.Main {
-		if len(ts.MetricData.Values) > 0 {
-			metricsData = append(metricsData, &ts.MetricData)
-			carbonapiRaw += fmt.Sprintf("IsAbsent: %+v\n", len(ts.IsAbsent))
-			carbonapiRaw += fmt.Sprintf("Values: %+v\n", len(ts.Values))
-		}
+		metricsData = append(metricsData, &ts.MetricData)
+		carbonapiRaw += fmt.Sprintf("IsAbsent: %+v\n", len(ts.IsAbsent))
+		carbonapiRaw += fmt.Sprintf("Values: %+v\n", len(ts.Values))
+	}
+	for _, ts := range tts.Additional {
+		metricsData = append(metricsData, &ts.MetricData)
+		carbonapiRaw += fmt.Sprintf("IsAbsent: %+v\n", len(ts.IsAbsent))
+		carbonapiRaw += fmt.Sprintf("Values: %+v\n", len(ts.Values))
 	}
 
 	switch format {

diff --git a/plotting/legend.go b/plotting/legend.go
@@ -41,7 +41,7 @@ func GetPlotLegend(c *chart.Chart) chart.Renderable {
 						legendLabel := SanitizeLabelName(legendLabel, maxLabelLength)
 						labels = append(labels, legendLabel)
 						lines = append(lines, s.GetStyle())
-						if labelsCount == maxLabelsCount {
+						if labelsCount == maxLabelsCount - 1 {
 							break
 						}
 						labelsCount++