feat(mimir): add MimirRule type

- some other changes in rule creation flow
- fix missing tags in osko_slo_target record rule
- other changes and fixes (hard to track the mess)

Signed-off-by: Hy3n4 <hy3nk4@gmail.com>

api/openslo/v1/slo_types.go

@@ -77,7 +77,7 @@ type SLOStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:printcolumn:name="Status",type=string,JSONPath=.status.ready,description="The reason for the current status of the SLO resource"
+//+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=.status.ready,description="The reason for the current status of the SLO resource"
 //+kubebuilder:printcolumn:name="Window",type=string,JSONPath=.spec.timeWindow[0].duration,description="The time window for the SLO resource"
 //+kubebuilder:printcolumn:name="Age",type=date,JSONPath=.metadata.creationTimestamp,description="The time when the SLO resource was created"
 

api/osko/v1alpha1/mimirrule_types.go

@@ -1,6 +1,7 @@
 package v1alpha1
 
 import (
+	"github.com/prometheus/common/model"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -15,28 +16,34 @@ type MimirRuleSpec struct {
 
 // MimirRuleStatus defines the observed state of MimirRule
 type MimirRuleStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
+	Conditions         []metav1.Condition `json:"conditions,omitempty"`
+	LastEvaluationTime metav1.Time        `json:"lastEvaluationTime,omitempty"`
+	Ready              string             `json:"ready,omitempty"`
 }
 
 type RuleGroup struct {
-	Name          string   `json:"name"`
-	SourceTenants []string `json:"source_tenants,omitempty"`
-	Rules         []Rule   `json:"rules"`
+	Name                          string          `json:"name"`
+	SourceTenants                 []string        `json:"source_tenants,omitempty"`
+	Rules                         []Rule          `json:"rules"`
+	Interval                      model.Duration  `json:"interval,omitempty"`
+	EvaluationDelay               *model.Duration `json:"evaluation_delay,omitempty"`
+	Limit                         int             `json:"limit,omitempty"`
+	AlignEvaluationTimeOnInterval bool            `json:"align_evaluation_time_on_interval,omitempty"`
 }
 
 type Rule struct {
-	Record      string            `json:"record,omitempty"`
-	Alert       string            `json:"alert,omitempty"`
-	Expr        string            `json:"expr"`
-	For         string            `json:"for,omitempty"`
-	Labels      map[string]string `json:"labels,omitempty"`
-	Annotations map[string]string `json:"annotations,omitempty"`
+	Record        string            `json:"record,omitempty"`
+	Alert         string            `json:"alert,omitempty"`
+	Expr          string            `json:"expr"`
+	For           model.Duration    `json:"for,omitempty"`
+	KeepFiringFor model.Duration    `json:"keep_firing_for,omitempty"`
+	Labels        map[string]string `json:"labels,omitempty"`
+	Annotations   map[string]string `json:"annotations,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Ready",type=string,JSONPath=.status.ready,description="The reason for the current status of the MimirRule resource"
 
 // MimirRule is the Schema for the mimirrules API
 type MimirRule struct {

config/crd/bases/openslo.com_slos.yaml

@@ -17,7 +17,7 @@ spec:
   - additionalPrinterColumns:
     - description: The reason for the current status of the SLO resource
       jsonPath: .status.ready
-      name: Status
+      name: Ready
       type: string
     - description: The time window for the SLO resource
       jsonPath: .spec.timeWindow[0].duration

config/crd/bases/osko.dev_mimirrules.yaml

@@ -14,7 +14,12 @@ spec:
     singular: mimirrule
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: The reason for the current status of the MimirRule resource
+      jsonPath: .status.ready
+      name: Ready
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: MimirRule is the Schema for the mimirrules API
@@ -39,6 +44,22 @@ spec:
                   to remove/update
                 items:
                   properties:
+                    align_evaluation_time_on_interval:
+                      type: boolean
+                    evaluation_delay:
+                      description: Duration wraps time.Duration. It is used to parse
+                        the custom duration format from YAML. This type should not
+                        propagate beyond the scope of input/output processing.
+                      format: int64
+                      type: integer
+                    interval:
+                      description: Duration wraps time.Duration. It is used to parse
+                        the custom duration format from YAML. This type should not
+                        propagate beyond the scope of input/output processing.
+                      format: int64
+                      type: integer
+                    limit:
+                      type: integer
                     name:
                       type: string
                     rules:
@@ -53,7 +74,19 @@ spec:
                           expr:
                             type: string
                           for:
-                            type: string
+                            description: Duration wraps time.Duration. It is used
+                              to parse the custom duration format from YAML. This
+                              type should not propagate beyond the scope of input/output
+                              processing.
+                            format: int64
+                            type: integer
+                          keep_firing_for:
+                            description: Duration wraps time.Duration. It is used
+                              to parse the custom duration format from YAML. This
+                              type should not propagate beyond the scope of input/output
+                              processing.
+                            format: int64
+                            type: integer
                           labels:
                             additionalProperties:
                               type: string
@@ -80,9 +113,6 @@ spec:
             description: MimirRuleStatus defines the observed state of MimirRule
             properties:
               conditions:
-                description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                  of cluster Important: Run "make" to regenerate code after modifying
-                  this file'
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
@@ -150,6 +180,11 @@ spec:
                   - type
                   type: object
                 type: array
+              lastEvaluationTime:
+                format: date-time
+                type: string
+              ready:
+                type: string
             type: object
         type: object
     served: true

config/samples/osko_v1alpha1_mimirrule.yaml

@@ -0,0 +1,12 @@
+apiVersion: osko.openslo/v1alpha1
+kind: MimirRule
+metadata:
+  labels:
+    app.kubernetes.io/name: mimirrule
+    app.kubernetes.io/instance: mimirrule-sample
+    app.kubernetes.io/part-of: osko
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: osko
+  name: mimirrule-sample
+spec:
+  # TODO(user): Add fields here