patch - remove group-by from promql alert spec (#55)

* patch - remove group-by from promql spec
coralogix · Aug 22, 2023 · 9ad7c19 · 9ad7c19
1 parent d77a8e1
commit 9ad7c19
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 39 deletions.
diff --git a/apis/coralogix/v1alpha1/alert_types.go b/apis/coralogix/v1alpha1/alert_types.go
@@ -2408,9 +2408,6 @@ type PromqlConditions struct {
 
  TimeWindow MetricTimeWindow `json:"timeWindow"`
 
- // +optional
- GroupBy []string `json:"groupBy,omitempty"`
-
  // +optional
  ReplaceMissingValueWithZero bool `json:"replaceMissingValueWithZero,omitempty"`
 
@@ -2431,14 +2428,6 @@ func (in *PromqlConditions) DeepEqual(actualCondition PromqlConditions) (bool, u
  }
  }
 
- if !utils.SlicesWithUniqueValuesEqual(in.GroupBy, actualCondition.GroupBy) {
- return false, utils.Diff{
- Name: "GroupBy",
- Desired: in.GroupBy,
- Actual: actualCondition.GroupBy,
- }
- }
-
  if in.TimeWindow != actualCondition.TimeWindow {
  return false, utils.Diff{
  Name: "TimeWindow",

diff --git a/apis/coralogix/v1alpha1/zz_generated.deepcopy.go b/apis/coralogix/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/coralogix.com_alerts.yaml b/config/crd/bases/coralogix.com_alerts.yaml
@@ -194,10 +194,6 @@ spec:
  - More
  - Less
  type: string
- groupBy:
- items:
- type: string
- type: array
  manageUndetectedValues:
  properties:
  autoRetireRatio:
@@ -1091,10 +1087,6 @@ spec:
  - More
  - Less
  type: string
- groupBy:
- items:
- type: string
- type: array
  manageUndetectedValues:
  properties:
  autoRetireRatio:

diff --git a/controllers/alphacontrollers/alert_controller.go b/controllers/alphacontrollers/alert_controller.go
@@ -622,7 +622,6 @@ func flattenPromqlAlert(conditionParams *alerts.ConditionParameters, promqlParam
  Threshold: utils.FloatToQuantity(conditionParams.GetThreshold().GetValue()),
  SampleThresholdPercentage: int(promqlParams.GetSampleThresholdPercentage().GetValue()),
  TimeWindow: coralogixv1alpha1.MetricTimeWindow(alertProtoTimeWindowToSchemaTimeWindow[conditionParams.GetTimeframe()]),
- GroupBy: utils.WrappedStringSliceToStringSlice(conditionParams.GetGroupBy()),
  ReplaceMissingValueWithZero: promqlParams.GetSwapNullValues().GetValue(),
  }
 

diff --git a/docs/api.md b/docs/api.md
@@ -749,13 +749,6 @@ AlertSpec defines the desired state of Alert
   <i>Enum</i>: Minute, FiveMinutes, TenMinutes, FifteenMinutes, TwentyMinutes, ThirtyMinutes, Hour, TwoHours, FourHours, SixHours, TwelveHours, TwentyFourHours<br/>
   </td>
   <td>true</td>
-  </tr><tr>
-  <td><b>groupBy</b></td>
-  <td>[]string</td>
-  <td>
-  <br/>
-  </td>
-  <td>false</td>
   </tr><tr>
   <td><b><a href="#alertspecalerttypemetricpromqlconditionsmanageundetectedvalues">manageUndetectedValues</a></b></td>
   <td>object</td>
@@ -3015,13 +3008,6 @@ AlertStatus defines the observed state of Alert
   <i>Enum</i>: Minute, FiveMinutes, TenMinutes, FifteenMinutes, TwentyMinutes, ThirtyMinutes, Hour, TwoHours, FourHours, SixHours, TwelveHours, TwentyFourHours<br/>
   </td>
   <td>true</td>
-  </tr><tr>
-  <td><b>groupBy</b></td>
-  <td>[]string</td>
-  <td>
-  <br/>
-  </td>
-  <td>false</td>
   </tr><tr>
   <td><b><a href="#alertstatusalerttypemetricpromqlconditionsmanageundetectedvalues">manageUndetectedValues</a></b></td>
   <td>object</td>