move metrics forwarder conditions and incorporate error type (#1557)

DataDog · Dec 11, 2024 · 5d3e3d1 · 5d3e3d1
1 parent 1c820e9
commit 5d3e3d1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/api/datadoghq/v1alpha1/datadogagent_types.go b/api/datadoghq/v1alpha1/datadogagent_types.go
diff --git a/api/datadoghq/v2alpha1/condition.go b/api/datadoghq/v2alpha1/condition.go
@@ -325,3 +325,13 @@ func assignNumeralState(state string) int {
 		return 0
 	}
 }
+
+// DatadogForwarderConditionType type use to represent a Datadog Metrics Forwarder condition.
+type DatadogForwarderConditionType string
+
+const (
+	// DatadogMetricsActive forwarding metrics and events to Datadog is active.
+	DatadogMetricsActive DatadogForwarderConditionType = "ActiveDatadogMetrics"
+	// DatadogMetricsError cannot forward deployment metrics and events to Datadog.
+	DatadogMetricsError DatadogForwarderConditionType = "DatadogMetricsError"
+)
diff --git a/pkg/controller/utils/datadog/metrics_forwarder.go b/pkg/controller/utils/datadog/metrics_forwarder.go
@@ -14,7 +14,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1"
 	"github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1"
 	"github.com/DataDog/datadog-operator/pkg/config"
 	"github.com/DataDog/datadog-operator/pkg/kubernetes"
@@ -669,14 +668,17 @@ func (mf *metricsForwarder) updateStatusIfNeeded(err error) {
 	conditionStatus := true
 	message := "Datadog metrics forwarding ok"
 	reason := "MetricsForwardingSucceeded"
+	conditionType := string(v2alpha1.DatadogMetricsActive)
+
 	if err != nil {
 		conditionStatus = false
 		message = "Datadog metrics forwarding error"
 		reason = "MetricsForwardingError"
+		conditionType = string(v2alpha1.DatadogMetricsError)
 	}
 
 	newConditionStatus := &ConditionCommon{
-		ConditionType:  string(v1alpha1.DatadogMetricsActive),
+		ConditionType:  conditionType,
 		Status:         conditionStatus,
 		LastUpdateTime: now,
 		Message:        message,