MM-36779 - Add ChimeraOAuthProxyURL config option (#17888)

model/config.go

@@ -2778,6 +2778,7 @@ type PluginSettings struct {
 	RequirePluginSignature      *bool                             `access:"plugins,write_restrictable,cloud_restrictable"`
 	MarketplaceUrl              *string                           `access:"plugins,write_restrictable,cloud_restrictable"`
 	SignaturePublicKeyFiles     []string                          `access:"plugins,write_restrictable,cloud_restrictable"`
+	ChimeraOAuthProxyUrl        *string                           `access:"plugins,write_restrictable,cloud_restrictable"`
 }
 
 func (s *PluginSettings) SetDefaults(ls LogSettings) {
@@ -2851,6 +2852,10 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
 	if s.SignaturePublicKeyFiles == nil {
 		s.SignaturePublicKeyFiles = []string{}
 	}
+
+	if s.ChimeraOAuthProxyUrl == nil {
+		s.ChimeraOAuthProxyUrl = NewString("")
+	}
 }
 
 type GlobalRelayMessageExportSettings struct {

services/telemetry/telemetry.go

@@ -1311,6 +1311,7 @@ func (ts *TelemetryService) trackPluginConfig(cfg *model.Config, marketplaceURL
 		"automatic_prepackaged_plugins": *cfg.PluginSettings.AutomaticPrepackagedPlugins,
 		"is_default_marketplace_url":    isDefault(*cfg.PluginSettings.MarketplaceUrl, model.PLUGIN_SETTINGS_DEFAULT_MARKETPLACE_URL),
 		"signature_public_key_files":    len(cfg.PluginSettings.SignaturePublicKeyFiles),
+		"chimera_oauth_proxy_url":       *cfg.PluginSettings.ChimeraOAuthProxyUrl,
 	}
 
 	// knownPluginIDs lists all known plugin IDs in the Marketplace