Allow openshift metric collection frequency to be configurable

PiperOrigin-RevId: 856428017

Author: Google Cloud Agent for Compute Workloads Dev

build/openshift-docker-entrypoint.sh

@@ -29,7 +29,7 @@ OCP_PASSWORD=$(cat /etc/secrets/ocp-password)
 
 # Non sensitive variables with reasonable defaults
 LOG_LEVEL="${LOG_LEVEL:-INFO}"
-COLLECTION_FREQUENCY="${COLLECTION_FREQUENCY:-60s}"
+COLLECTION_FREQUENCY="${COLLECTION_FREQUENCY:-1800s}"
 DATA_WAREHOUSE_ENDPOINT="${DATA_WAREHOUSE_ENDPOINT:-https://workloadmanager-datawarehouse.googleapis.com/}"
 
 
@@ -74,11 +74,11 @@ jq -nc \
         username: $ocp_username,
         password: $ocp_password,
         host: $ocp_host,
-      }
+      },
+      collection_frequency: $collection_frequency
     },
     common_discovery: {
-      enabled: false,
-      collection_frequency: $collection_frequency
+      enabled: false
     },
     sqlserver_configuration: {
       enabled: false

internal/daemon/openshift/openshift.go

@@ -33,8 +33,8 @@ import (
 )
 
 const (
-	wlmCollectionFrequency = 30 * time.Minute
-	payloadVersion         = "v0.0.1-pre"
+	defaultCollectionFrequency = 30 * time.Minute
+	payloadVersion             = "v0.0.1-pre"
 )
 
 // Service implements the interfaces for OpenShift workload agent service.
@@ -65,7 +65,7 @@ func (s *Service) Start(ctx context.Context, a any) {
 		RoutineArg:          runMetricCollectionArgs{s},
 		ErrorCode:           usagemetrics.OpenShiftMetricCollectionFailure,
 		UsageLogger:         *usagemetrics.UsageLogger,
-		ExpectedMinDuration: wlmCollectionFrequency,
+		ExpectedMinDuration: s.Config.GetOpenshiftConfiguration().GetCollectionFrequency().AsDuration(),
 	}
 	metricCollectionRoutine.StartRoutine(mcCtx)
 	select {
@@ -83,7 +83,14 @@ func runMetricCollection(ctx context.Context, a any) {
 		log.CtxLogger(ctx).Errorf("failed to parse metric collection args", "args", a)
 		return
 	}
-	ticker := time.NewTicker(wlmCollectionFrequency)
+	duration := args.s.Config.GetOpenshiftConfiguration().GetCollectionFrequency().AsDuration()
+	if duration.Seconds() == 0 {
+		log.CtxLogger(ctx).Debug("Using default collection frequency")
+		duration = defaultCollectionFrequency
+		return
+	}
+	log.CtxLogger(ctx).Debugw("Using collection frequency", "seconds", duration.Seconds())
+	ticker := time.NewTicker(duration)
 	defer ticker.Stop()
 
 	for {

protos/configuration/configuration.proto

@@ -98,6 +98,7 @@ message MySQLConfiguration {
 message OpenShiftConfiguration {
   optional bool enabled = 1;
   ConnectionParameters connection_parameters = 2;
+  google.protobuf.Duration collection_frequency = 3;
 }
 
 message CommonDiscovery {