[datadogmonitor] Adding renotifyStatuses and indicating Locked is deprecated

apis/datadoghq/v1alpha1/datadogmonitor_types.go

@@ -6,6 +6,7 @@
 package v1alpha1
 
 import (
+	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -93,7 +94,8 @@ type DatadogMonitorOptions struct {
 	IncludeTags *bool `json:"includeTags,omitempty"`
 	// A Boolean indicating whether the log alert monitor triggers a single alert or multiple alerts when any group breaches a threshold.
 	GroupbySimpleMonitor *bool `json:"groupbySimpleMonitor,omitempty"`
-	// Whether or not the monitor is locked (only editable by creator and admins).
+	// DEPRECATED: Whether or not the monitor is locked (only editable by creator and admins). Use `restricted_roles` instead.
+	// +deprecated
 	Locked *bool `json:"locked,omitempty"`
 	// Time (in seconds) to allow a host to boot and applications to fully start before starting the evaluation of
 	// monitor results. Should be a non negative integer.
@@ -125,6 +127,8 @@ type DatadogMonitorOptions struct {
 	RenotifyInterval *int64 `json:"renotifyInterval,omitempty"`
 	// The number of times re-notification messages should be sent on the current status at the provided re-notification interval.
 	RenotifyOccurrences *int64 `json:"renotifyOccurrences,omitempty"`
+	// The types of statuses for which re-notification messages should be sent. Valid values are alert, warn, no data.
+	RenotifyStatuses []datadogV1.MonitorRenotifyStatusType `json:"renotifyStatuses,omitempty"`
 	// A Boolean indicating whether this monitor needs a full window of data before it’s evaluated. We highly
 	// recommend you set this to false for sparse metrics, otherwise some evaluations are skipped. Default is false.
 	RequireFullWindow *bool `json:"requireFullWindow,omitempty"`

config/crd/bases/v1/datadoghq.com_datadogmonitors.yaml

@@ -95,7 +95,7 @@ spec:
                       description: A Boolean indicating whether notifications from this monitor automatically inserts its triggering tags into the title.
                       type: boolean
                     locked:
-                      description: Whether or not the monitor is locked (only editable by creator and admins).
+                      description: 'DEPRECATED: Whether or not the monitor is locked (only editable by creator and admins). Use `restricted_roles` instead.'
                       type: boolean
                     newGroupDelay:
                       description: |-
@@ -147,6 +147,12 @@ spec:
                       description: The number of times re-notification messages should be sent on the current status at the provided re-notification interval.
                       format: int64
                       type: integer
+                    renotifyStatuses:
+                      description: The types of statuses for which re-notification messages should be sent. Valid values are alert, warn, no data.
+                      items:
+                        description: MonitorRenotifyStatusType The different statuses for which renotification is supported.
+                        type: string
+                      type: array
                     requireFullWindow:
                       description: |-
                         A Boolean indicating whether this monitor needs a full window of data before it’s evaluated. We highly

controllers/datadogmonitor/monitor.go

@@ -153,6 +153,10 @@ func buildMonitor(logger logr.Logger, dm *datadoghqv1alpha1.DatadogMonitor) (*da
 		o.SetRenotifyOccurrences(*options.RenotifyOccurrences)
 	}
 
+	if options.RenotifyStatuses != nil {
+		o.SetRenotifyStatuses(options.RenotifyStatuses)
+	}
+
 	if options.TimeoutH != nil {
 		o.SetTimeoutH(*options.TimeoutH)
 	}

controllers/datadogmonitor/monitor_test.go

@@ -34,6 +34,11 @@ func Test_buildMonitor(t *testing.T) {
 	noDataTimeframe := int64(15)
 	renotifyInterval := int64(1440)
 	renotifyOccurrences := int64(1)
+	renotifyStatuses := []datadogV1.MonitorRenotifyStatusType{
+		datadogV1.MONITORRENOTIFYSTATUSTYPE_ALERT,
+		datadogV1.MONITORRENOTIFYSTATUSTYPE_WARN,
+	}
+
 	timeoutH := int64(2)
 	critThreshold := "0.05"
 	warnThreshold := "0.02"
@@ -71,6 +76,7 @@ func Test_buildMonitor(t *testing.T) {
 				OnMissingData:       "default",
 				RenotifyOccurrences: &renotifyOccurrences,
 				RenotifyInterval:    &renotifyInterval,
+				RenotifyStatuses:    renotifyStatuses,
 				TimeoutH:            &timeoutH,
 				Thresholds: &datadoghqv1alpha1.DatadogMonitorOptionsThresholds{
 					Critical: &critThreshold,
@@ -142,6 +148,9 @@ func Test_buildMonitor(t *testing.T) {
 	assert.Equal(t, *dm.Spec.Options.RenotifyOccurrences, monitor.Options.GetRenotifyOccurrences(), "discrepancy found in parameter: RenotifyOccurrences")
 	assert.Equal(t, *dm.Spec.Options.RenotifyOccurrences, monitorUR.Options.GetRenotifyOccurrences(), "discrepancy found in parameter: RenotifyOccurrences")
 
+	assert.Equal(t, dm.Spec.Options.RenotifyStatuses, monitor.Options.GetRenotifyStatuses(), "discrepancy found in parameter: RenotifyStatuses")
+	assert.Equal(t, dm.Spec.Options.RenotifyStatuses, monitorUR.Options.GetRenotifyStatuses(), "discrepancy found in parameter: RenotifyStatuses")
+
 	assert.Equal(t, *dm.Spec.Options.TimeoutH, monitor.Options.GetTimeoutH(), "discrepancy found in parameter: TimeoutH")
 	assert.Equal(t, *dm.Spec.Options.TimeoutH, monitorUR.Options.GetTimeoutH(), "discrepancy found in parameter: TimeoutH")