Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DatadogMonitor] Do not log error if DD_MONITOR_FORCE_SYNC_PERIOD is not set #1466

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[DatadogMonitor] Do not log error if DD_MONITOR_FORCE_SYNC_PERIOD is not set #1466

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions internal/controller/datadogmonitor/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,20 @@ func (r *Reconciler) internalReconcile(ctx context.Context, req reconcile.Reques
now := metav1.NewTime(time.Now())
forceSyncPeriod := defaultForceSyncPeriod

forceSyncPeriodInt, err := strconv.Atoi(os.Getenv(DDMonitorForceSyncPeriodEnvVar))
if err != nil {
logger.Error(err, "Invalid value for monitor force sync period. Defaulting to 60 minutes.")
} else {
logger.V(1).Info("Setting monitor force sync period", "minutes", forceSyncPeriodInt)
forceSyncPeriod = time.Duration(forceSyncPeriodInt) * time.Minute
if userForceSyncPeriod, ok := os.LookupEnv(DDMonitorForceSyncPeriodEnvVar); ok {
forceSyncPeriodInt, err := strconv.Atoi(userForceSyncPeriod)
if err != nil {
logger.Error(err, "Invalid value for monitor force sync period. Defaulting to 60 minutes.")
} else {
logger.V(1).Info("Setting monitor force sync period", "minutes", forceSyncPeriodInt)
forceSyncPeriod = time.Duration(forceSyncPeriodInt) * time.Minute
}
}

// Get instance
instance := &datadoghqv1alpha1.DatadogMonitor{}
var result ctrl.Result
err = r.client.Get(ctx, req.NamespacedName, instance)
err := r.client.Get(ctx, req.NamespacedName, instance)
if err != nil {
if apierrors.IsNotFound(err) {
// Request object not found, could have been deleted after reconcile request.
Expand Down
Loading