Merge pull request #1528 from grafana/feat/alert-rule-keep-last

feat: add KeepLast as valid value for no data & exec err state
grafana · May 13, 2024 · fa89d70 · fa89d70
2 parents 645664d + 89c743a
commit fa89d70
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/api/v1beta1/grafanaalertrulegroup_types.go b/api/v1beta1/grafanaalertrulegroup_types.go
@@ -64,7 +64,7 @@ type AlertRule struct {
 	// +kubebuilder:validation:Required
 	Data []*AlertQuery `json:"data"`
 
-	// +kubebuilder:validation:Enum=OK;Alerting;Error
+	// +kubebuilder:validation:Enum=OK;Alerting;Error;KeepLast
 	ExecErrState string `json:"execErrState"`
 
 	// +kubebuilder:validation:Type=string
@@ -77,7 +77,7 @@ type AlertRule struct {
 
 	Labels map[string]string `json:"labels,omitempty"`
 
-	// +kubebuilder:validation:Enum=Alerting;NoData;OK
+	// +kubebuilder:validation:Enum=Alerting;NoData;OK;KeepLast
 	NoDataState *string `json:"noDataState"`
 
 	// +kubebuilder:validation:MinLength=1

diff --git a/config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml b/config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -106,6 +106,7 @@ spec:
                       - OK
                       - Alerting
                       - Error
+                      - KeepLast
                       type: string
                     for:
                       format: duration
@@ -122,6 +123,7 @@ spec:
                       - Alerting
                       - NoData
                       - OK
+                      - KeepLast
                       type: string
                     title:
                       example: Always firing

diff --git a/config/grafana.integreatly.org_grafanaalertrulegroups.yaml b/config/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -159,6 +159,7 @@ spec:
                       - OK
                       - Alerting
                       - Error
+                      - KeepLast
                       type: string
                     for:
                       format: duration
@@ -175,6 +176,7 @@ spec:
                       - Alerting
                       - NoData
                       - OK
+                      - KeepLast
                       type: string
                     title:
                       example: Always firing

diff --git a/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml b/deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml
@@ -106,6 +106,7 @@ spec:
                       - OK
                       - Alerting
                       - Error
+                      - KeepLast
                       type: string
                     for:
                       format: duration
@@ -122,6 +123,7 @@ spec:
                       - Alerting
                       - NoData
                       - OK
+                      - KeepLast
                       type: string
                     title:
                       example: Always firing

diff --git a/deploy/kustomize/base/crds.yaml b/deploy/kustomize/base/crds.yaml
@@ -105,6 +105,7 @@ spec:
                       - OK
                       - Alerting
                       - Error
+                      - KeepLast
                       type: string
                     for:
                       format: duration
@@ -121,6 +122,7 @@ spec:
                       - Alerting
                       - NoData
                       - OK
+                      - KeepLast
                       type: string
                     title:
                       example: Always firing

diff --git a/docs/docs/api.md b/docs/docs/api.md
@@ -277,7 +277,7 @@ AlertRule defines a specific rule to be evaluated. It is based on the upstream m
         <td>
           <br/>
           <br/>
-            <i>Enum</i>: OK, Alerting, Error<br/>
+            <i>Enum</i>: OK, Alerting, Error, KeepLast<br/>
         </td>
         <td>true</td>
       </tr><tr>
@@ -295,7 +295,7 @@ AlertRule defines a specific rule to be evaluated. It is based on the upstream m
         <td>
           <br/>
           <br/>
-            <i>Enum</i>: Alerting, NoData, OK<br/>
+            <i>Enum</i>: Alerting, NoData, OK, KeepLast<br/>
         </td>
         <td>true</td>
       </tr><tr>