Collect config when feedback or transcripts are enabled

Author: onmete

api/v1alpha1/olsconfig_types.go

@@ -388,8 +388,10 @@ type ProviderSpec struct {
 // UserDataCollectionSpec defines how we collect user data.
 type UserDataCollectionSpec struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect User Feedback"
+	// When enabled, user feedback will be collected. When either feedback or transcripts are enabled, config collection is also automatically enabled.
 	FeedbackDisabled bool `json:"feedbackDisabled,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect Transcripts"
+	// When enabled, conversation transcripts will be collected. When either feedback or transcripts are enabled, config collection is also automatically enabled.
 	TranscriptsDisabled bool `json:"transcriptsDisabled,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect Config Data"
 	ConfigDisabled bool `json:"configDisabled,omitempty"`

config/crd/bases/ols.openshift.io_olsconfigs.yaml

@@ -1272,8 +1272,14 @@ spec:
                       configDisabled:
                         type: boolean
                       feedbackDisabled:
+                        description: When enabled, user feedback will be collected.
+                          When either feedback or transcripts are enabled, config
+                          collection is also automatically enabled.
                         type: boolean
                       transcriptsDisabled:
+                        description: When enabled, conversation transcripts will be
+                          collected. When either feedback or transcripts are enabled,
+                          config collection is also automatically enabled.
                         type: boolean
                     type: object
                 required:

internal/controller/ols_app_server_assets.go

@@ -279,7 +279,7 @@ func (r *OLSConfigReconciler) generateOLSConfigMap(ctx context.Context, cr *olsv
 			FeedbackStorage:     "/app-root/ols-user-data/feedback",
 			TranscriptsDisabled: cr.Spec.OLSConfig.UserDataCollection.TranscriptsDisabled || !dataCollectorEnabled,
 			TranscriptsStorage:  "/app-root/ols-user-data/transcripts",
-			ConfigDisabled:      cr.Spec.OLSConfig.UserDataCollection.ConfigDisabled || !dataCollectorEnabled,
+			ConfigDisabled:      !dataCollectorEnabled,
 			ConfigStorage:       "/app-root/ols-user-data/config",
 		},
 		ProxyConfig: proxyConfig,

internal/controller/ols_app_server_deployment.go

@@ -529,7 +529,7 @@ func (r *OLSConfigReconciler) telemetryEnabled() (bool, error) {
 
 func (r *OLSConfigReconciler) dataCollectorEnabled(cr *olsv1alpha1.OLSConfig) (bool, error) {
 	// data collector is enabled in OLS configuration
-	configEnabled := !(cr.Spec.OLSConfig.UserDataCollection.FeedbackDisabled && cr.Spec.OLSConfig.UserDataCollection.TranscriptsDisabled && cr.Spec.OLSConfig.UserDataCollection.ConfigDisabled)
+	configEnabled := !cr.Spec.OLSConfig.UserDataCollection.FeedbackDisabled || !cr.Spec.OLSConfig.UserDataCollection.TranscriptsDisabled
 	telemetryEnabled, err := r.telemetryEnabled()
 	if err != nil {
 		return false, err