diff --git a/config/client.go b/config/client.go index 00041076d1..e672d7fca0 100644 --- a/config/client.go +++ b/config/client.go @@ -55,7 +55,6 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li // This setting is only temporary, so keep using the old setting name for the mobile and web apps props["ExperimentalEnablePostMetadata"] = "true" - props["ExperimentalCloudBilling"] = strconv.FormatBool(*c.ExperimentalSettings.CloudBilling) props["EnableAppBar"] = strconv.FormatBool(*c.ExperimentalSettings.EnableAppBar) props["ExperimentalEnableAutomaticReplies"] = strconv.FormatBool(*c.TeamSettings.ExperimentalEnableAutomaticReplies) diff --git a/model/config.go b/model/config.go index 2c0f0ca1e7..886b7e5820 100644 --- a/model/config.go +++ b/model/config.go @@ -955,7 +955,6 @@ type ExperimentalSettings struct { LinkMetadataTimeoutMilliseconds *int64 `access:"experimental_features,write_restrictable,cloud_restrictable"` RestrictSystemAdmin *bool `access:"experimental_features,write_restrictable"` UseNewSAMLLibrary *bool `access:"experimental_features,cloud_restrictable"` - CloudBilling *bool `access:"experimental_features,write_restrictable"` EnableSharedChannels *bool `access:"experimental_features"` EnableRemoteClusterService *bool `access:"experimental_features"` EnableAppBar *bool `access:"experimental_features"` @@ -978,10 +977,6 @@ func (s *ExperimentalSettings) SetDefaults() { s.RestrictSystemAdmin = NewBool(false) } - if s.CloudBilling == nil { - s.CloudBilling = NewBool(false) - } - if s.UseNewSAMLLibrary == nil { s.UseNewSAMLLibrary = NewBool(false) } diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 2334c1c9fb..f19e5a4188 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -728,7 +728,6 @@ func (ts *TelemetryService) trackConfig() { "link_metadata_timeout_milliseconds": *cfg.ExperimentalSettings.LinkMetadataTimeoutMilliseconds, "restrict_system_admin": *cfg.ExperimentalSettings.RestrictSystemAdmin, "use_new_saml_library": *cfg.ExperimentalSettings.UseNewSAMLLibrary, - "cloud_billing": *cfg.ExperimentalSettings.CloudBilling, "enable_shared_channels": *cfg.ExperimentalSettings.EnableSharedChannels, "enable_remote_cluster_service": *cfg.ExperimentalSettings.EnableRemoteClusterService && cfg.FeatureFlags.EnableRemoteClusterService, "enable_app_bar": *cfg.ExperimentalSettings.EnableAppBar,