pkg/rules/rulespb.AlertState: marshal JSON as lowercase (thanos-io#2834)

Currently, alert state is rendered as upper case. In Prometheus it is lower case. This fixes it. Signed-off-by: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
paulfantom · Jul 8, 2020 · ff1efd7 · ff1efd7
1 parent 3ec7d1c
commit ff1efd7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 
 ## Unreleased
 
+- [#2834](https://github.com/thanos-io/thanos/pull/2834) Query: Fix rendered JSON state value for rules and alerts should be in lowercase
+
 ## [v0.13.0](https://github.com/thanos-io/thanos/releases/tag/v0.13.0) - 2020.06.22
 
 ### Fixed
@@ -807,4 +809,4 @@ Initial version to have a stable reference before [gossip protocol removal](/doc
 - Compact / Downsample offline commands.
 - Bucket commands.
 - Downsampling support for UI.
-- Grafana dashboards for Thanos components.
+- Grafana dashboards for Thanos components.
diff --git a/pkg/query/api/v1_test.go b/pkg/query/api/v1_test.go
@@ -1317,7 +1317,7 @@ func TestRulesHandler(t *testing.T) {
 			Type:           "recording",
 		},
 		testpromcompatibility.AlertingRule{
-			State:          all[2].GetAlert().State.String(),
+			State:          strings.ToLower(all[2].GetAlert().State.String()),
 			Name:           all[2].GetAlert().Name,
 			Query:          all[2].GetAlert().Query,
 			Labels:         storepb.LabelsToPromLabels(all[2].GetAlert().Labels.Labels),
@@ -1331,15 +1331,15 @@ func TestRulesHandler(t *testing.T) {
 				{
 					Labels:                  storepb.LabelsToPromLabels(all[2].GetAlert().Alerts[0].Labels.Labels),
 					Annotations:             storepb.LabelsToPromLabels(all[2].GetAlert().Alerts[0].Annotations.Labels),
-					State:                   all[2].GetAlert().Alerts[0].State.String(),
+					State:                   strings.ToLower(all[2].GetAlert().Alerts[0].State.String()),
 					ActiveAt:                all[2].GetAlert().Alerts[0].ActiveAt,
 					Value:                   all[2].GetAlert().Alerts[0].Value,
 					PartialResponseStrategy: all[2].GetAlert().Alerts[0].PartialResponseStrategy.String(),
 				},
 				{
 					Labels:                  storepb.LabelsToPromLabels(all[2].GetAlert().Alerts[1].Labels.Labels),
 					Annotations:             storepb.LabelsToPromLabels(all[2].GetAlert().Alerts[1].Annotations.Labels),
-					State:                   all[2].GetAlert().Alerts[1].State.String(),
+					State:                   strings.ToLower(all[2].GetAlert().Alerts[1].State.String()),
 					ActiveAt:                all[2].GetAlert().Alerts[1].ActiveAt,
 					Value:                   all[2].GetAlert().Alerts[1].Value,
 					PartialResponseStrategy: all[2].GetAlert().Alerts[1].PartialResponseStrategy.String(),
@@ -1348,7 +1348,7 @@ func TestRulesHandler(t *testing.T) {
 			Type: "alerting",
 		},
 		testpromcompatibility.AlertingRule{
-			State:          all[3].GetAlert().State.String(),
+			State:          strings.ToLower(all[3].GetAlert().State.String()),
 			Name:           all[3].GetAlert().Name,
 			Query:          all[3].GetAlert().Query,
 			Labels:         storepb.LabelsToPromLabels(all[3].GetAlert().Labels.Labels),

diff --git a/pkg/rules/rulespb/custom.go b/pkg/rules/rulespb/custom.go
@@ -247,7 +247,7 @@ func (x *AlertState) UnmarshalJSON(entry []byte) error {
 }
 
 func (x *AlertState) MarshalJSON() ([]byte, error) {
-	return []byte(strconv.Quote(x.String())), nil
+	return []byte(strconv.Quote(strings.ToLower(x.String()))), nil
 }
 
 // Compare compares alert state x and y and returns:

diff --git a/pkg/rules/rulespb/custom_test.go b/pkg/rules/rulespb/custom_test.go
@@ -207,23 +207,23 @@ func TestJSONUnmarshalMarshal(t *testing.T) {
 										Annotations: labels.Labels{
 											{Name: "annotation1", Value: "2"},
 										},
-										State:                   "INACTIVE",
+										State:                   "inactive",
 										ActiveAt:                nil,
 										Value:                   "1",
 										PartialResponseStrategy: "WARN",
 									},
 									{
 										Labels:                  nil,
 										Annotations:             nil,
-										State:                   "FIRING",
+										State:                   "firing",
 										ActiveAt:                &twoHoursAgo,
 										Value:                   "2143",
 										PartialResponseStrategy: "ABORT",
 									},
 								},
 								LastError:      "1",
 								Duration:       60,
-								State:          "PENDING",
+								State:          "pending",
 								LastEvaluation: now.Add(-1 * time.Minute),
 								EvaluationTime: 1.1,
 							},