Skip to content

Commit 765fef3

Browse files
onmeteonmete
committed
Collect config when feedback or transcripts are enabled
1 parent 1742207 commit 765fef3

File tree

10 files changed

+10
-16
lines changed

10 files changed

+10
-16
lines changed

‎api/v1alpha1/olsconfig_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,10 @@ type ProviderSpec struct {
388388
// UserDataCollectionSpec defines how we collect user data.
389389
type UserDataCollectionSpec struct {
390390
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect User Feedback"
391+
// When enabled, user feedback will be collected. When either feedback or transcripts are enabled, config collection is also automatically enabled.
391392
FeedbackDisabled bool `json:"feedbackDisabled,omitempty"`
392393
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect Transcripts"
394+
// When enabled, conversation transcripts will be collected. When either feedback or transcripts are enabled, config collection is also automatically enabled.
393395
TranscriptsDisabled bool `json:"transcriptsDisabled,omitempty"`
394396
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Do Not Collect Config Data"
395397
ConfigDisabled bool `json:"configDisabled,omitempty"`

‎bundle/manifests/lightspeed-operator.clusterserviceversion.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,6 @@ spec:
360360
path: ols.userDataCollection.feedbackDisabled
361361
- displayName: Do Not Collect Transcripts
362362
path: ols.userDataCollection.transcriptsDisabled
363-
- displayName: Do Not Collect Config Data
364-
path: ols.userDataCollection.configDisabled
365363
- displayName: OLS Data Collector Settings
366364
path: olsDataCollector
367365
- description: 'Log level. Valid options are DEBUG, INFO, WARNING, ERROR and CRITICAL. Default: "INFO".'

‎bundle/manifests/ols.openshift.io_olsconfigs.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,8 +1269,6 @@ spec:
12691269
userDataCollection:
12701270
description: User data collection switches
12711271
properties:
1272-
configDisabled:
1273-
type: boolean
12741272
feedbackDisabled:
12751273
type: boolean
12761274
transcriptsDisabled:

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,11 +1269,15 @@ spec:
12691269
userDataCollection:
12701270
description: User data collection switches
12711271
properties:
1272-
configDisabled:
1273-
type: boolean
12741272
feedbackDisabled:
1273+
description: When enabled, user feedback will be collected.
1274+
When either feedback or transcripts are enabled, config
1275+
collection is also automatically enabled.
12751276
type: boolean
12761277
transcriptsDisabled:
1278+
description: When enabled, conversation transcripts will be
1279+
collected. When either feedback or transcripts are enabled,
1280+
config collection is also automatically enabled.
12771281
type: boolean
12781282
type: object
12791283
required:

‎config/manifests/bases/lightspeed-operator.clusterserviceversion.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ spec:
333333
path: ols.userDataCollection.feedbackDisabled
334334
- displayName: Do Not Collect Transcripts
335335
path: ols.userDataCollection.transcriptsDisabled
336-
- displayName: Do Not Collect Config Data
337-
path: ols.userDataCollection.configDisabled
338336
- displayName: OLS Data Collector Settings
339337
path: olsDataCollector
340338
- description: 'Log level. Valid options are DEBUG, INFO, WARNING, ERROR and

‎internal/controller/ols_app_server_assets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func (r *OLSConfigReconciler) generateOLSConfigMap(ctx context.Context, cr *olsv
279279
FeedbackStorage: "/app-root/ols-user-data/feedback",
280280
TranscriptsDisabled: cr.Spec.OLSConfig.UserDataCollection.TranscriptsDisabled || !dataCollectorEnabled,
281281
TranscriptsStorage: "/app-root/ols-user-data/transcripts",
282-
ConfigDisabled: cr.Spec.OLSConfig.UserDataCollection.ConfigDisabled || !dataCollectorEnabled,
282+
ConfigDisabled: !dataCollectorEnabled,
283283
ConfigStorage: "/app-root/ols-user-data/config",
284284
},
285285
ProxyConfig: proxyConfig,

‎internal/controller/ols_app_server_deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ func (r *OLSConfigReconciler) telemetryEnabled() (bool, error) {
529529

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

‎lightspeed-catalog-4.17/index.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ properties:
343343
path: ols.userDataCollection.feedbackDisabled
344344
- displayName: Do Not Collect Transcripts
345345
path: ols.userDataCollection.transcriptsDisabled
346-
- displayName: Do Not Collect Config Data
347-
path: ols.userDataCollection.configDisabled
348346
- displayName: OLS Data Collector Settings
349347
path: olsDataCollector
350348
- description: 'Log level. Valid options are DEBUG, INFO, WARNING, ERROR and CRITICAL. Default: "INFO".'

‎lightspeed-catalog-4.18/index.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ properties:
343343
path: ols.userDataCollection.feedbackDisabled
344344
- displayName: Do Not Collect Transcripts
345345
path: ols.userDataCollection.transcriptsDisabled
346-
- displayName: Do Not Collect Config Data
347-
path: ols.userDataCollection.configDisabled
348346
- displayName: OLS Data Collector Settings
349347
path: olsDataCollector
350348
- description: 'Log level. Valid options are DEBUG, INFO, WARNING, ERROR and CRITICAL. Default: "INFO".'

‎lightspeed-catalog-4.19/index.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ properties:
343343
path: ols.userDataCollection.feedbackDisabled
344344
- displayName: Do Not Collect Transcripts
345345
path: ols.userDataCollection.transcriptsDisabled
346-
- displayName: Do Not Collect Config Data
347-
path: ols.userDataCollection.configDisabled
348346
- displayName: OLS Data Collector Settings
349347
path: olsDataCollector
350348
- description: 'Log level. Valid options are DEBUG, INFO, WARNING, ERROR and CRITICAL. Default: "INFO".'

0 commit comments

Comments
 (0)