Fix rebasing boolGauge

Author: metalmatze

kubernetes/api/v1alpha1/servicelevelobjective_types.go

@@ -96,6 +96,11 @@ type ServiceLevelIndicator struct {
 	// LatencyNative is the indicator that measures a certain percentage to be faster than the expected latency.
 	// This uses the new native histograms in Prometheus.
 	LatencyNative *NativeLatencyIndicator `json:"latencyNative,omitempty"`
+
+	// +optional
+	// BoolGauge is the indicator that measures wheter a boolean gauge is
+	// successul.
+	BoolGauge *BoolGaugeIndicator `json:"bool_gauge,omitempty"`
 }
 
 type Alerting struct {
@@ -140,6 +145,12 @@ type NativeLatencyIndicator struct {
 	Grouping []string `json:"grouping"`
 }
 
+type BoolGaugeIndicator struct {
+	Query `json:",inline"`
+	// Total is the metric that returns how many requests there are in total.
+	Grouping []string `json:"grouping"`
+}
+
 // Query contains a PromQL metric.
 type Query struct {
 	Metric string `json:"metric"`
@@ -293,6 +304,33 @@ func (in ServiceLevelObjective) Internal() (slo.Objective, error) {
 		}
 	}
 
+	var boolGauge *slo.BoolGaugeIndicator
+	if in.Spec.ServiceLevelIndicator.BoolGauge != nil {
+		expr, err := parser.ParseExpr(in.Spec.ServiceLevelIndicator.BoolGauge.Metric)
+		if err != nil {
+			return slo.Objective{}, err
+		}
+
+		vec, ok := expr.(*parser.VectorSelector)
+		if !ok {
+			return slo.Objective{}, fmt.Errorf("bool gauge metric is not a VectorSelector")
+		}
+
+		// Copy the matchers to get rid of the re field for unit testing...
+		matchers := make([]*labels.Matcher, len(vec.LabelMatchers))
+		for i, matcher := range vec.LabelMatchers {
+			matchers[i] = &labels.Matcher{Type: matcher.Type, Name: matcher.Name, Value: matcher.Value}
+		}
+
+		boolGauge = &slo.BoolGaugeIndicator{
+			Metric: slo.Metric{
+				Name:          vec.Name,
+				LabelMatchers: matchers,
+			},
+			Grouping: in.Spec.ServiceLevelIndicator.BoolGauge.Grouping,
+		}
+	}
+
 	inCopy := in.DeepCopy()
 	inCopy.ManagedFields = nil
 	delete(inCopy.Annotations, "kubectl.kubernetes.io/last-applied-configuration")
@@ -328,6 +366,7 @@ func (in ServiceLevelObjective) Internal() (slo.Objective, error) {
 			Ratio:         ratio,
 			Latency:       latency,
 			LatencyNative: latencyNative,
+			BoolGauge:     boolGauge,
 		},
 	}, nil
 }

proto/objectives/v1alpha1/objectives.pb.go

@@ -45,8 +45,8 @@ message Indicator {
   oneof options {
     Ratio ratio = 1;
     Latency latency = 2;
-    LatencyNative latency_native = 3;
-    BoolGauge boolGauge = 4;
+    BoolGauge boolGauge = 3;
+    LatencyNative latency_native = 4;
   }
 }
 

proto/objectives/v1alpha1/objectives.proto

@@ -134,16 +134,16 @@ export declare class Indicator extends Message<Indicator> {
     case: "latency";
   } | {
     /**
-     * @generated from field: objectives.v1alpha1.LatencyNative latency_native = 3;
+     * @generated from field: objectives.v1alpha1.BoolGauge boolGauge = 3;
      */
-    value: LatencyNative;
-    case: "latencyNative";
+    value: BoolGauge;
+    case: "boolGauge";
   } | {
     /**
-     * @generated from field: objectives.v1alpha1.BoolGauge boolGauge = 4;
+     * @generated from field: objectives.v1alpha1.LatencyNative latency_native = 4;
      */
-    value: BoolGauge;
-    case: "boolGauge";
+    value: LatencyNative;
+    case: "latencyNative";
   } | { case: undefined; value?: undefined };
 
   constructor(data?: PartialMessage<Indicator>);

ui/src/proto/objectives/v1alpha1/objectives_pb.d.ts

@@ -50,8 +50,8 @@ export const Indicator = proto3.makeMessageType(
   () => [
     { no: 1, name: "ratio", kind: "message", T: Ratio, oneof: "options" },
     { no: 2, name: "latency", kind: "message", T: Latency, oneof: "options" },
-    { no: 3, name: "latency_native", kind: "message", T: LatencyNative, oneof: "options" },
-    { no: 4, name: "boolGauge", kind: "message", T: BoolGauge, oneof: "options" },
+    { no: 3, name: "boolGauge", kind: "message", T: BoolGauge, oneof: "options" },
+    { no: 4, name: "latency_native", kind: "message", T: LatencyNative, oneof: "options" },
   ],
 );