diff --git a/model/config.go b/model/config.go index 4f6f37ef46..14bc9ce34b 100644 --- a/model/config.go +++ b/model/config.go @@ -2703,9 +2703,9 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) { s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics} } - if s.PluginStates["com.mattermost.plugin-incident-management"] == nil && BuildEnterpriseReady == "true" { - // Enable the incident management plugin by default - s.PluginStates["com.mattermost.plugin-incident-management"] = &PluginState{Enable: true} + if s.PluginStates["playbooks"] == nil && BuildEnterpriseReady == "true" { + // Enable the playbooks plugin by default + s.PluginStates["playbooks"] = &PluginState{Enable: true} } if s.PluginStates["com.mattermost.plugin-channel-export"] == nil && BuildEnterpriseReady == "true" { diff --git a/model/config_test.go b/model/config_test.go index aff185b5c8..c85d296601 100644 --- a/model/config_test.go +++ b/model/config_test.go @@ -309,20 +309,20 @@ func TestConfigDefaultNPSPluginState(t *testing.T) { } func TestConfigDefaultIncidentManagementPluginState(t *testing.T) { - t.Run("should enable IncidentManagement plugin by default on enterprise-ready builds", func(t *testing.T) { + t.Run("should enable Playbooks plugin by default on enterprise-ready builds", func(t *testing.T) { BuildEnterpriseReady = "true" c1 := Config{} c1.SetDefaults() - assert.True(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-management"].Enable) + assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable) }) - t.Run("should not enable IncidentManagement plugin by default on non-enterprise-ready builds", func(t *testing.T) { + t.Run("should not enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) { BuildEnterpriseReady = "" c1 := Config{} c1.SetDefaults() - assert.Nil(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-management"]) + assert.Nil(t, c1.PluginSettings.PluginStates["playbooks"]) }) t.Run("should not re-enable IncidentManagement plugin after it has been disabled", func(t *testing.T) { @@ -330,7 +330,7 @@ func TestConfigDefaultIncidentManagementPluginState(t *testing.T) { c1 := Config{ PluginSettings: PluginSettings{ PluginStates: map[string]*PluginState{ - "com.mattermost.plugin-incident-management": { + "playbooks": { Enable: false, }, }, @@ -339,7 +339,7 @@ func TestConfigDefaultIncidentManagementPluginState(t *testing.T) { c1.SetDefaults() - assert.False(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-management"].Enable) + assert.False(t, c1.PluginSettings.PluginStates["playbooks"].Enable) }) } diff --git a/model/feature_flags.go b/model/feature_flags.go index b4afe5c8c1..f2b238309b 100644 --- a/model/feature_flags.go +++ b/model/feature_flags.go @@ -30,6 +30,7 @@ type FeatureFlags struct { // Feature flags to control plugin versions PluginIncidentManagement string `plugin_id:"com.mattermost.plugin-incident-management"` + PluginPlaybooks string `plugin_id:"playbooks"` PluginApps string `plugin_id:"com.mattermost.apps"` PluginFocalboard string `plugin_id:"focalboard"` diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index cdfdfff3c6..a8c38b38a4 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -1311,6 +1311,7 @@ func (ts *TelemetryService) trackPluginConfig(cfg *model.Config, marketplaceURL "com.mattermost.nps", "com.mattermost.plugin-channel-export", "com.mattermost.plugin-incident-management", + "playbooks", "com.mattermost.plugin-todo", "com.mattermost.webex", "com.mattermost.welcomebot",