From 24248dc764def2936737996f1c879a66cb57e871 Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 8 Nov 2021 11:45:59 +0530 Subject: [PATCH] Add JobSettings.CleanupJobsThresholdDays to telemetry (#18936) * Add JobSettings.CleanupJobsThresholdDays to telemetry ```release-note NONE ``` * Moved telemetry to more specific fields ```release-note NONE ``` * Add missing space ```release-note NONE ``` --- model/config.go | 6 +++--- services/telemetry/telemetry.go | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/model/config.go b/model/config.go index a2eda9ff30..6056c69fca 100644 --- a/model/config.go +++ b/model/config.go @@ -2615,8 +2615,8 @@ func (s *DataRetentionSettings) SetDefaults() { } type JobSettings struct { - RunJobs *bool `access:"write_restrictable,cloud_restrictable"` - RunScheduler *bool `access:"write_restrictable,cloud_restrictable"` + RunJobs *bool `access:"write_restrictable,cloud_restrictable"` // telemetry: none + RunScheduler *bool `access:"write_restrictable,cloud_restrictable"` // telemetry: none CleanupJobsThresholdDays *int `access:"write_restrictable,cloud_restrictable"` } @@ -3025,7 +3025,7 @@ type Config struct { BleveSettings BleveSettings DataRetentionSettings DataRetentionSettings MessageExportSettings MessageExportSettings - JobSettings JobSettings // telemetry: none + JobSettings JobSettings PluginSettings PluginSettings DisplaySettings DisplaySettings GuestAccountsSettings GuestAccountsSettings diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 2c2828f5f1..969524d719 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -756,12 +756,13 @@ func (ts *TelemetryService) trackConfig() { ts.trackPluginConfig(cfg, model.PluginSettingsDefaultMarketplaceURL) ts.sendTelemetry(TrackConfigDataRetention, map[string]interface{}{ - "enable_message_deletion": *cfg.DataRetentionSettings.EnableMessageDeletion, - "enable_file_deletion": *cfg.DataRetentionSettings.EnableFileDeletion, - "message_retention_days": *cfg.DataRetentionSettings.MessageRetentionDays, - "file_retention_days": *cfg.DataRetentionSettings.FileRetentionDays, - "deletion_job_start_time": *cfg.DataRetentionSettings.DeletionJobStartTime, - "batch_size": *cfg.DataRetentionSettings.BatchSize, + "enable_message_deletion": *cfg.DataRetentionSettings.EnableMessageDeletion, + "enable_file_deletion": *cfg.DataRetentionSettings.EnableFileDeletion, + "message_retention_days": *cfg.DataRetentionSettings.MessageRetentionDays, + "file_retention_days": *cfg.DataRetentionSettings.FileRetentionDays, + "deletion_job_start_time": *cfg.DataRetentionSettings.DeletionJobStartTime, + "batch_size": *cfg.DataRetentionSettings.BatchSize, + "cleanup_jobs_threshold_days": *cfg.JobSettings.CleanupJobsThresholdDays, }) ts.sendTelemetry(TrackConfigMessageExport, map[string]interface{}{