Refactor logic in PrometheusK8s() to decide if remote-write needs to …

…be configured or not for telemetry
openshift · Sep 21, 2022 · c6d21a3 · c6d21a3
1 parent 6d9b79e
commit c6d21a3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkg/manifests/manifests.go b/pkg/manifests/manifests.go
@@ -1637,7 +1637,7 @@ func (f *Factory) PrometheusK8s(grpcTLS *v1.Secret, trustedCABundleCM *v1.Config
 	}
 
 	clusterID := f.config.ClusterMonitoringConfiguration.TelemeterClientConfig.ClusterID
-	if telemetrySecret != nil {
+	if f.config.ClusterMonitoringConfiguration.TelemeterClientConfig.IsEnabled() && f.config.RemoteWrite {
 		selectorRelabelConfig, err := promqlgen.LabelSelectorsToRelabelConfig(f.config.ClusterMonitoringConfiguration.PrometheusK8sConfig.TelemetryMatches)
 		if err != nil {
 			return nil, errors.Wrap(err, "generate label selector relabel config")

diff --git a/pkg/tasks/prometheus.go b/pkg/tasks/prometheus.go
@@ -323,9 +323,6 @@ func (t *PrometheusTask) Run(ctx context.Context) error {
 		if err = t.client.DeleteSecret(ctx, telemetrySecret); err != nil {
 			return errors.Wrap(err, "deleting Prometheus telemetry secret failed")
 		}
-
-		// Reset variable to not send telemetry via remote-write.
-		telemetrySecret = nil
 	}
 
 	{