PMM-8877: turn ON IA by default, remove ability to disable it

api-tests/management/ia/channels_test.go

@@ -29,9 +29,6 @@ import (
 	pmmapitests "github.com/percona/pmm-managed/api-tests"
 )
 
-// Note: Even though the IA services check for alerting enabled or disabled before returning results
-// we don't enable or disable IA explicit in our tests since it is enabled by default through
-// ENABLE_ALERTING env var.
 func TestAddChannel(t *testing.T) {
 	client := channelsClient.Default.Channels
 

api-tests/management/ia/rules_test.go

@@ -34,9 +34,6 @@ import (
 	pmmapitests "github.com/percona/pmm-managed/api-tests"
 )
 
-// Note: Even though the IA services check for alerting enabled or disabled before returning results
-// we don't enable or disable IA explicit in our tests since it is enabled by default through
-// ENABLE_ALERTING env var.
 func TestRulesAPI(t *testing.T) {
 	rulesClient := client.Default.Rules
 	channelsClient := client.Default.Channels

api-tests/management/ia/templates_test.go

@@ -38,9 +38,6 @@ import (
 	pmmapitests "github.com/percona/pmm-managed/api-tests"
 )
 
-// Note: Even though the IA services check for alerting enabled or disabled before returning results
-// we don't enable or disable IA explicit in our tests since it is enabled by default through
-// ENABLE_ALERTING env var.
 func assertTemplate(t *testing.T, expectedTemplate alert.Template, listTemplates []*templates.TemplatesItems0) {
 	convertParamUnit := func(u string) alert.Unit {
 		switch u {

api-tests/server/settings_test.go

@@ -127,7 +127,6 @@ func TestSettings(t *testing.T) {
 				slackURL := gofakeit.URL()
 				res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{
 					Body: server.ChangeSettingsBody{
-						EnableAlerting: true,
 						EmailAlertingSettings: &server.ChangeSettingsParamsBodyEmailAlertingSettings{
 							From:      email,
 							Smarthost: smarthost,
@@ -154,22 +153,6 @@ func TestSettings(t *testing.T) {
 				assert.Equal(t, slackURL, res.Payload.Settings.SlackAlertingSettings.URL)
 			})
 
-			t.Run("InvalidBothEnableAndDisableAlerting", func(t *testing.T) {
-				defer restoreSettingsDefaults(t)
-
-				res, err := serverClient.Default.Server.ChangeSettings(&server.ChangeSettingsParams{
-					Body: server.ChangeSettingsBody{
-						// since alerting is already enabled on managed by default using
-						// ENABLE_ALERTING env var, just passing DisableAlerting param satisfies
-						// the condition of both enable and disable alerting being true
-						DisableAlerting: true,
-					},
-					Context: pmmapitests.Context,
-				})
-				pmmapitests.AssertAPIErrorf(t, err, 400, codes.FailedPrecondition, `Alerting is enabled via ENABLE_ALERTING environment variable.`)
-				assert.Empty(t, res)
-			})
-
 			t.Run("InvalidBothSlackAlertingSettingsAndRemoveSlackAlertingSettings", func(t *testing.T) {
 				defer restoreSettingsDefaults(t)
 

docker-compose.yml

@@ -17,7 +17,6 @@ services:
       - ENABLE_DBAAS=${ENABLE_DBAAS:-0}
       - AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
       - AWS_SECRET_KEY=${AWS_SECRET_KEY}
-      - ENABLE_ALERTING=1
       - ENABLE_BACKUP_MANAGEMENT=1
 
     # for delve

go.mod

@@ -37,7 +37,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.10
 	github.com/percona-platform/dbaas-api v0.0.0-20211006103141-a68316e565d2
 	github.com/percona-platform/saas v0.0.0-20210505183502-c18b6f47c932
-	github.com/percona/pmm v0.0.0-20211006103121-6dee93c2029b
+	github.com/percona/pmm v0.0.0-20211012222805-ca69392f29d6
 	github.com/percona/promconfig v0.2.1
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0

go.sum

@@ -442,8 +442,8 @@ github.com/percona-platform/dbaas-api v0.0.0-20211006103141-a68316e565d2 h1:TJX3
 github.com/percona-platform/dbaas-api v0.0.0-20211006103141-a68316e565d2/go.mod h1:zgb9gTJusc8Jv2zRNAlWV0/XQ8IK+hwHMc9lIqfK0tM=
 github.com/percona-platform/saas v0.0.0-20210505183502-c18b6f47c932 h1:EDe5KfOdEoEBKg33BsFsMrdazZu8vaRj4fTKdg4zjCc=
 github.com/percona-platform/saas v0.0.0-20210505183502-c18b6f47c932/go.mod h1:jJRyGMxxDJaSiU7AaHNS+8j1TFQQhX6lcYp8s0t8Knc=
-github.com/percona/pmm v0.0.0-20211006103121-6dee93c2029b h1:75eCD67rQr+JlyJAENQ68ZCUcQQXjBj/jRuaNizsrvg=
-github.com/percona/pmm v0.0.0-20211006103121-6dee93c2029b/go.mod h1:OmWayvQAavtvlzLkvpea5tAqaWGGNNyG+xj4MJUsNm4=
+github.com/percona/pmm v0.0.0-20211012222805-ca69392f29d6 h1:8UFKAU+qQwVaydV0g+j9yW62qjjxqb1D+Ml1Zb+3PgU=
+github.com/percona/pmm v0.0.0-20211012222805-ca69392f29d6/go.mod h1:OmWayvQAavtvlzLkvpea5tAqaWGGNNyG+xj4MJUsNm4=
 github.com/percona/promconfig v0.2.1 h1:LBbCDSQRfy0aTHFJMgrVQIE2WvmPkMTkIoznTfBAvj8=
 github.com/percona/promconfig v0.2.1/go.mod h1:Y2uXi5QNk71+ceJHuI9poank+0S1kjxd3K105fXKVkg=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=

models/settings.go

@@ -45,7 +45,6 @@ type SaaS struct {
 
 // IntegratedAlerting contains settings related to IntegratedAlerting.
 type IntegratedAlerting struct {
-	Enabled               bool                   `json:"enabled"`
 	EmailAlertingSettings *EmailAlertingSettings `json:"email_settings"`
 	SlackAlertingSettings *SlackAlertingSettings `json:"slack_settings"`
 }

models/settings_helpers.go

@@ -87,11 +87,6 @@ type ChangeSettingsParams struct {
 	// Disable Azure Discover features.
 	DisableAzurediscover bool
 
-	// Enable Integrated Alerting features.
-	EnableAlerting bool
-	// Disable Integrated Alerting features.
-	DisableAlerting bool
-
 	// Email config for Integrated Alerting.
 	EmailAlertingSettings *EmailAlertingSettings
 	// If true removes email alerting settings.
@@ -259,14 +254,6 @@ func UpdateSettings(q reform.DBTX, params *ChangeSettingsParams) (*Settings, err
 		settings.Azurediscover.Enabled = true
 	}
 
-	if params.DisableAlerting {
-		settings.IntegratedAlerting.Enabled = false
-	}
-
-	if params.EnableAlerting {
-		settings.IntegratedAlerting.Enabled = true
-	}
-
 	if params.RemoveEmailAlertingSettings {
 		settings.IntegratedAlerting.EmailAlertingSettings = nil
 	}
@@ -311,9 +298,6 @@ func ValidateSettings(params *ChangeSettingsParams) error {
 	if params.EnableVMCache && params.DisableVMCache {
 		return fmt.Errorf("Both enable_vm_cache and disable_vm_cache are present.") //nolint:golint,stylecheck
 	}
-	if params.EnableAlerting && params.DisableAlerting {
-		return fmt.Errorf("Both enable_alerting and disable_alerting are present.") //nolint:golint,stylecheck
-	}
 	if params.EnableBackupManagement && params.DisableBackupManagement {
 		return fmt.Errorf("Both enable_backup_management and disable_backup_management are present.") //nolint:golint,stylecheck
 	}

models/settings_helpers_test.go

@@ -98,14 +98,14 @@ func TestSettings(t *testing.T) {
 				AWSPartitions: []string{"aws", "aws-cn", "aws-cn"},
 			}
 			settings, err := models.UpdateSettings(sqlDB, s)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, []string{"aws", "aws-cn"}, settings.AWSPartitions)
 
 			s = &models.ChangeSettingsParams{
 				AWSPartitions: []string{},
 			}
 			settings, err = models.UpdateSettings(sqlDB, s)
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Equal(t, []string{"aws", "aws-cn"}, settings.AWSPartitions)
 
 			settings = &models.Settings{AWSPartitions: []string{}}
@@ -173,7 +173,7 @@ func TestSettings(t *testing.T) {
 			ns, err := models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
 				DisableUpdates: false,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.False(t, ns.Updates.Disabled)
 
 			_, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
@@ -185,7 +185,7 @@ func TestSettings(t *testing.T) {
 			ns, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
 				DisableUpdates: true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.True(t, ns.Updates.Disabled)
 		})
 
@@ -195,7 +195,7 @@ func TestSettings(t *testing.T) {
 				EnableTelemetry: true,
 				DisableSTT:      true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.False(t, ns.Telemetry.Disabled)
 			assert.False(t, ns.SaaS.STTEnabled)
 
@@ -222,7 +222,7 @@ func TestSettings(t *testing.T) {
 				EnableSTT:       true,
 				EnableTelemetry: true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.False(t, ns.Telemetry.Disabled)
 			assert.True(t, ns.SaaS.STTEnabled)
 
@@ -236,7 +236,7 @@ func TestSettings(t *testing.T) {
 				DisableSTT:       true,
 				DisableTelemetry: true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.True(t, ns.Telemetry.Disabled)
 			assert.False(t, ns.SaaS.STTEnabled)
 
@@ -250,7 +250,7 @@ func TestSettings(t *testing.T) {
 				EnableTelemetry: true,
 				DisableSTT:      true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.False(t, ns.Telemetry.Disabled)
 			assert.False(t, ns.SaaS.STTEnabled)
 		})
@@ -362,19 +362,16 @@ func TestSettings(t *testing.T) {
 			}
 			slackSettings := &models.SlackAlertingSettings{URL: gofakeit.URL()}
 			ns, err := models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
-				EnableAlerting:        true,
 				EmailAlertingSettings: emailSettings,
 				SlackAlertingSettings: slackSettings,
 			})
-			assert.NoError(t, err)
-			assert.True(t, ns.IntegratedAlerting.Enabled)
+			require.NoError(t, err)
 			assert.Equal(t, ns.IntegratedAlerting.EmailAlertingSettings, emailSettings)
 			assert.Equal(t, ns.IntegratedAlerting.SlackAlertingSettings, slackSettings)
 
 			// check that we don't lose settings on empty updates
 			ns, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{})
-			assert.NoError(t, err)
-			assert.True(t, ns.IntegratedAlerting.Enabled)
+			require.NoError(t, err)
 			assert.Equal(t, ns.IntegratedAlerting.EmailAlertingSettings, emailSettings)
 			assert.Equal(t, ns.IntegratedAlerting.SlackAlertingSettings, slackSettings)
 
@@ -391,19 +388,11 @@ func TestSettings(t *testing.T) {
 			assert.EqualError(t, err, "Both slack_alerting_settings and remove_slack_alerting_settings are present.")
 
 			ns, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
-				DisableAlerting:             true,
 				RemoveEmailAlertingSettings: true,
 				RemoveSlackAlertingSettings: true,
 			})
-			assert.NoError(t, err)
+			require.NoError(t, err)
 			assert.Empty(t, ns.IntegratedAlerting.EmailAlertingSettings)
-			assert.False(t, ns.IntegratedAlerting.Enabled)
-
-			_, err = models.UpdateSettings(sqlDB, &models.ChangeSettingsParams{
-				DisableAlerting: true,
-				EnableAlerting:  true,
-			})
-			assert.EqualError(t, err, "Both enable_alerting and disable_alerting are present.")
 		})
 	})
 }

services/errors.go

@@ -22,6 +22,3 @@ import (
 
 // ErrSTTDisabled means that STT checks are disabled and can't be executed.
 var ErrSTTDisabled = errors.New("STT is disabled")
-
-// ErrAlertingDisabled means Integrated Alerting is disabled and IA APIs can't be executed.
-var ErrAlertingDisabled = errors.New("Alerting is disabled")

services/management/ia/alerts_service.go

@@ -57,12 +57,7 @@ func NewAlertsService(db *reform.DB, alertManager alertManager, templatesService
 
 // Enabled returns if service is enabled and can be used.
 func (s *AlertsService) Enabled() bool {
-	settings, err := models.GetSettings(s.db)
-	if err != nil {
-		s.l.WithError(err).Error("can't get settings")
-		return false
-	}
-	return settings.IntegratedAlerting.Enabled
+	return true
 }
 
 // ListAlerts returns list of existing alerts.

services/management/ia/channels_service.go

@@ -45,12 +45,7 @@ func NewChannelsService(db *reform.DB, alertManager alertManager) *ChannelsServi
 
 // Enabled returns if service is enabled and can be used.
 func (s *ChannelsService) Enabled() bool {
-	settings, err := models.GetSettings(s.db)
-	if err != nil {
-		s.l.WithError(err).Error("can't get settings")
-		return false
-	}
-	return settings.IntegratedAlerting.Enabled
+	return true
 }
 
 // ListChannels returns list of available channels.

services/management/ia/rules_service.go

@@ -80,12 +80,7 @@ func NewRulesService(db *reform.DB, templates *TemplatesService, vmalert vmAlert
 
 // Enabled returns if service is enabled and can be used.
 func (s *RulesService) Enabled() bool {
-	settings, err := models.GetSettings(s.db)
-	if err != nil {
-		s.l.WithError(err).Error("can't get settings")
-		return false
-	}
-	return settings.IntegratedAlerting.Enabled
+	return true
 }
 
 // TODO Move this and related types to https://github.com/percona/promconfig

services/management/ia/rules_service_test.go

@@ -46,13 +46,6 @@ func TestCreateAlertRule(t *testing.T) {
 	sqlDB := testdb.Open(t, models.SkipFixtures, nil)
 	db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 
-	// Enable IA
-	settings, err := models.GetSettings(db)
-	require.NoError(t, err)
-	settings.IntegratedAlerting.Enabled = true
-	err = models.SaveSettings(db, settings)
-	require.NoError(t, err)
-
 	alertManager := new(mockAlertManager)
 	alertManager.On("RequestConfigurationUpdate").Return()
 	vmAlert := new(mockVmAlert)

services/management/ia/templates_service.go

@@ -106,12 +106,7 @@ func NewTemplatesService(db *reform.DB) (*TemplatesService, error) {
 
 // Enabled returns if service is enabled and can be used.
 func (s *TemplatesService) Enabled() bool {
-	settings, err := models.GetSettings(s.db)
-	if err != nil {
-		s.l.WithError(err).Error("can't get settings")
-		return false
-	}
-	return settings.IntegratedAlerting.Enabled
+	return true
 }
 
 func newParamTemplate() *template.Template {

services/management/ia/templates_service_test.go

@@ -92,13 +92,6 @@ func TestTemplateValidation(t *testing.T) {
 	sqlDB := testdb.Open(t, models.SkipFixtures, nil)
 	db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 
-	// Enable IA
-	settings, err := models.GetSettings(db)
-	require.NoError(t, err)
-	settings.IntegratedAlerting.Enabled = true
-	err = models.SaveSettings(db, settings)
-	require.NoError(t, err)
-
 	t.Run("create a template with missing param", func(t *testing.T) {
 		t.Parallel()
 

services/server/server.go

@@ -449,7 +449,7 @@ func (s *Server) convertSettings(settings *models.Settings) *serverpb.Settings {
 		AzurediscoverEnabled: settings.Azurediscover.Enabled,
 		PmmPublicAddress:     settings.PMMPublicAddress,
 
-		AlertingEnabled:         settings.IntegratedAlerting.Enabled,
+		AlertingEnabled:         true,
 		BackupManagementEnabled: settings.BackupManagement.Enabled,
 	}
 
@@ -532,11 +532,6 @@ func (s *Server) validateChangeSettingsRequest(ctx context.Context, req *serverp
 		return status.Error(codes.FailedPrecondition, "STT cannot be enabled because telemetry is disabled via DISABLE_TELEMETRY environment variable.")
 	}
 
-	// ignore req.EnableAlerting even if they are present since that will not change anything
-	if req.DisableAlerting && s.envSettings.EnableAlerting {
-		return status.Error(codes.FailedPrecondition, "Alerting is enabled via ENABLE_ALERTING environment variable.")
-	}
-
 	// ignore req.DisableAzurediscover even if they are present since that will not change anything
 	if req.DisableAzurediscover && s.envSettings.EnableAzurediscover {
 		return status.Error(codes.FailedPrecondition, "Azure Discover is enabled via ENABLE_AZUREDISCOVER environment variable.")
@@ -610,8 +605,6 @@ func (s *Server) ChangeSettings(ctx context.Context, req *serverpb.ChangeSetting
 			PMMPublicAddress:       req.PmmPublicAddress,
 			RemovePMMPublicAddress: req.RemovePmmPublicAddress,
 
-			EnableAlerting:              req.EnableAlerting,
-			DisableAlerting:             req.DisableAlerting,
 			RemoveEmailAlertingSettings: req.RemoveEmailAlertingSettings,
 			RemoveSlackAlertingSettings: req.RemoveSlackAlertingSettings,
 			EnableBackupManagement:      req.EnableBackupManagement,
@@ -673,18 +666,6 @@ func (s *Server) ChangeSettings(ctx context.Context, req *serverpb.ChangeSetting
 		return nil, err
 	}
 
-	// When IA moved from disabled state to enabled create rules files.
-	if !oldSettings.IntegratedAlerting.Enabled && req.EnableAlerting {
-		s.rulesService.WriteVMAlertRulesFiles()
-	}
-
-	// When IA moved from enabled state to disables cleanup rules files.
-	if oldSettings.IntegratedAlerting.Enabled && req.DisableAlerting {
-		if err := s.rulesService.RemoveVMAlertRulesFiles(); err != nil {
-			s.l.Errorf("Failed to clean old alert rule files: %+v", err)
-		}
-	}
-
 	// If STT intervals are changed reset timers.
 	if oldSettings.SaaS.STTCheckIntervals != newSettings.SaaS.STTCheckIntervals {
 		s.checksService.UpdateIntervals(