diff --git a/data/bindata.go b/data/bindata.go index 0a86963035..356031650e 100644 --- a/data/bindata.go +++ b/data/bindata.go @@ -471,17 +471,17 @@ type bintree struct { var _bintree = &bintree{nil, map[string]*bintree{ "iatemplates": {nil, map[string]*bintree{ "mongodb_connections_memory_usage.yml": {iatemplatesMongodb_connections_memory_usageYml, map[string]*bintree{}}, - "mongodb_high_memory_usage.yml": {iatemplatesMongodb_high_memory_usageYml, map[string]*bintree{}}, - "mongodb_restarted.yml": {iatemplatesMongodb_restartedYml, map[string]*bintree{}}, - "mysql_down.yml": {iatemplatesMysql_downYml, map[string]*bintree{}}, - "mysql_restarted.yml": {iatemplatesMysql_restartedYml, map[string]*bintree{}}, - "mysql_too_many_connections.yml": {iatemplatesMysql_too_many_connectionsYml, map[string]*bintree{}}, - "node_high_cpu_load.yml": {iatemplatesNode_high_cpu_loadYml, map[string]*bintree{}}, - "node_low_free_memory.yml": {iatemplatesNode_low_free_memoryYml, map[string]*bintree{}}, - "node_swap_filled_up.yml": {iatemplatesNode_swap_filled_upYml, map[string]*bintree{}}, - "postgresql_down.yml": {iatemplatesPostgresql_downYml, map[string]*bintree{}}, - "postgresql_restarted.yml": {iatemplatesPostgresql_restartedYml, map[string]*bintree{}}, - "postgresql_too_many_connections.yml": {iatemplatesPostgresql_too_many_connectionsYml, map[string]*bintree{}}, + "mongodb_high_memory_usage.yml": {iatemplatesMongodb_high_memory_usageYml, map[string]*bintree{}}, + "mongodb_restarted.yml": {iatemplatesMongodb_restartedYml, map[string]*bintree{}}, + "mysql_down.yml": {iatemplatesMysql_downYml, map[string]*bintree{}}, + "mysql_restarted.yml": {iatemplatesMysql_restartedYml, map[string]*bintree{}}, + "mysql_too_many_connections.yml": {iatemplatesMysql_too_many_connectionsYml, map[string]*bintree{}}, + "node_high_cpu_load.yml": {iatemplatesNode_high_cpu_loadYml, map[string]*bintree{}}, + "node_low_free_memory.yml": {iatemplatesNode_low_free_memoryYml, map[string]*bintree{}}, + "node_swap_filled_up.yml": {iatemplatesNode_swap_filled_upYml, map[string]*bintree{}}, + "postgresql_down.yml": {iatemplatesPostgresql_downYml, map[string]*bintree{}}, + "postgresql_restarted.yml": {iatemplatesPostgresql_restartedYml, map[string]*bintree{}}, + "postgresql_too_many_connections.yml": {iatemplatesPostgresql_too_many_connectionsYml, map[string]*bintree{}}, }}, }} diff --git a/models/agent_helpers.go b/models/agent_helpers.go index 5a1b10f776..6f2a7ccb87 100644 --- a/models/agent_helpers.go +++ b/models/agent_helpers.go @@ -540,14 +540,10 @@ type CreateAgentParams struct { CustomLabels map[string]string TLS bool TLSSkipVerify bool - MongoDBOptions *MongoDBOptions TableCountTablestatsGroupLimit int32 - QueryExamplesDisabled bool - MaxQueryLogSize int64 - AWSAccessKey string - AWSSecretKey string - RDSBasicMetricsDisabled bool - RDSEnhancedMetricsDisabled bool + MongoDBOptions *MongoDBOptions + QANOptions *QANOptions + AWSOptions *AWSOptions AzureOptions *AzureOptions PushMetrics bool DisableCollectors []string @@ -596,12 +592,8 @@ func CreateAgent(q *reform.Querier, agentType AgentType, params *CreateAgentPara TLSSkipVerify: params.TLSSkipVerify, MongoDBOptions: params.MongoDBOptions, TableCountTablestatsGroupLimit: params.TableCountTablestatsGroupLimit, - QueryExamplesDisabled: params.QueryExamplesDisabled, - MaxQueryLogSize: params.MaxQueryLogSize, - AWSAccessKey: pointer.ToStringOrNil(params.AWSAccessKey), - AWSSecretKey: pointer.ToStringOrNil(params.AWSSecretKey), - RDSBasicMetricsDisabled: params.RDSBasicMetricsDisabled, - RDSEnhancedMetricsDisabled: params.RDSEnhancedMetricsDisabled, + QANOptions: params.QANOptions, + AWSOptions: params.AWSOptions, AzureOptions: params.AzureOptions, PushMetrics: params.PushMetrics, DisabledCollectors: params.DisableCollectors, diff --git a/models/agent_model.go b/models/agent_model.go index 3890254129..49c388ef4e 100644 --- a/models/agent_model.go +++ b/models/agent_model.go @@ -93,6 +93,32 @@ func (c AzureOptions) Value() (driver.Value, error) { return jsonValue(c) } // Scan implements database/sql.Scanner interface. Should be defined on the pointer. func (c *AzureOptions) Scan(src interface{}) error { return jsonScan(c, src) } +// AWSOptions represents structure for special AWS options. +type AWSOptions struct { + RDSBasicMetricsDisabled bool `reform:"rds_basic_metrics_disabled"` + RDSEnhancedMetricsDisabled bool `reform:"rds_enhanced_metrics_disabled"` + AWSAccessKey *string `reform:"aws_access_key"` + AWSSecretKey *string `reform:"aws_secret_key"` +} + +// Value implements database/sql/driver.Valuer interface. Should be defined on the value. +func (c AWSOptions) Value() (driver.Value, error) { return jsonValue(c) } + +// Scan implements database/sql.Scanner interface. Should be defined on the pointer. +func (c *AWSOptions) Scan(src interface{}) error { return jsonScan(c, src) } + +// QANOptions represents structure for special Query Analytics options. +type QANOptions struct { + QueryExamplesDisabled bool `reform:"query_examples_disabled"` + MaxQueryLogSize int64 `reform:"max_query_log_size"` +} + +// Value implements database/sql/driver.Valuer interface. Should be defined on the value. +func (c QANOptions) Value() (driver.Value, error) { return jsonValue(c) } + +// Scan implements database/sql.Scanner interface. Should be defined on the pointer. +func (c *QANOptions) Scan(src interface{}) error { return jsonScan(c, src) } + // PMMAgentWithPushMetricsSupport - version of pmmAgent, // that support vmagent and push metrics mode // will be released with PMM Agent v2.12. @@ -121,11 +147,6 @@ type Agent struct { TLS bool `reform:"tls"` TLSSkipVerify bool `reform:"tls_skip_verify"` - AWSAccessKey *string `reform:"aws_access_key"` - AWSSecretKey *string `reform:"aws_secret_key"` - - AzureOptions *AzureOptions `reform:"azure_options"` - // TableCount stores last known table count. NULL if unknown. TableCount *int32 `reform:"table_count"` @@ -135,17 +156,16 @@ type Agent struct { // See IsMySQLTablestatsGroupEnabled method. TableCountTablestatsGroupLimit int32 `reform:"table_count_tablestats_group_limit"` - QueryExamplesDisabled bool `reform:"query_examples_disabled"` - MaxQueryLogSize int64 `reform:"max_query_log_size"` - MetricsPath *string `reform:"metrics_path"` - MetricsScheme *string `reform:"metrics_scheme"` + MetricsPath *string `reform:"metrics_path"` + MetricsScheme *string `reform:"metrics_scheme"` - RDSBasicMetricsDisabled bool `reform:"rds_basic_metrics_disabled"` - RDSEnhancedMetricsDisabled bool `reform:"rds_enhanced_metrics_disabled"` - PushMetrics bool `reform:"push_metrics"` - DisabledCollectors pq.StringArray `reform:"disabled_collectors"` + PushMetrics bool `reform:"push_metrics"` + DisabledCollectors pq.StringArray `reform:"disabled_collectors"` + QANOptions *QANOptions `reform:"qan_options"` MongoDBOptions *MongoDBOptions `reform:"mongo_db_tls_options"` + AzureOptions *AzureOptions `reform:"azure_options"` + AWSOptions *AWSOptions `reform:"aws_options"` } // BeforeInsert implements reform.BeforeInserter interface. diff --git a/models/agent_model_reform.go b/models/agent_model_reform.go index b7ca8abda5..db93808c4f 100644 --- a/models/agent_model_reform.go +++ b/models/agent_model_reform.go @@ -45,20 +45,16 @@ func (v *agentTableType) Columns() []string { "password", "tls", "tls_skip_verify", - "aws_access_key", - "aws_secret_key", - "azure_options", "table_count", "table_count_tablestats_group_limit", - "query_examples_disabled", - "max_query_log_size", "metrics_path", "metrics_scheme", - "rds_basic_metrics_disabled", - "rds_enhanced_metrics_disabled", "push_metrics", "disabled_collectors", + "qan_options", "mongo_db_tls_options", + "azure_options", + "aws_options", } } @@ -100,20 +96,16 @@ var AgentTable = &agentTableType{ {Name: "Password", Type: "*string", Column: "password"}, {Name: "TLS", Type: "bool", Column: "tls"}, {Name: "TLSSkipVerify", Type: "bool", Column: "tls_skip_verify"}, - {Name: "AWSAccessKey", Type: "*string", Column: "aws_access_key"}, - {Name: "AWSSecretKey", Type: "*string", Column: "aws_secret_key"}, - {Name: "AzureOptions", Type: "*AzureOptions", Column: "azure_options"}, {Name: "TableCount", Type: "*int32", Column: "table_count"}, {Name: "TableCountTablestatsGroupLimit", Type: "int32", Column: "table_count_tablestats_group_limit"}, - {Name: "QueryExamplesDisabled", Type: "bool", Column: "query_examples_disabled"}, - {Name: "MaxQueryLogSize", Type: "int64", Column: "max_query_log_size"}, {Name: "MetricsPath", Type: "*string", Column: "metrics_path"}, {Name: "MetricsScheme", Type: "*string", Column: "metrics_scheme"}, - {Name: "RDSBasicMetricsDisabled", Type: "bool", Column: "rds_basic_metrics_disabled"}, - {Name: "RDSEnhancedMetricsDisabled", Type: "bool", Column: "rds_enhanced_metrics_disabled"}, {Name: "PushMetrics", Type: "bool", Column: "push_metrics"}, {Name: "DisabledCollectors", Type: "pq.StringArray", Column: "disabled_collectors"}, + {Name: "QANOptions", Type: "*QANOptions", Column: "qan_options"}, {Name: "MongoDBOptions", Type: "*MongoDBOptions", Column: "mongo_db_tls_options"}, + {Name: "AzureOptions", Type: "*AzureOptions", Column: "azure_options"}, + {Name: "AWSOptions", Type: "*AWSOptions", Column: "aws_options"}, }, PKFieldIndex: 0, }, @@ -122,7 +114,7 @@ var AgentTable = &agentTableType{ // String returns a string representation of this struct or record. func (s Agent) String() string { - res := make([]string, 31) + res := make([]string, 27) res[0] = "AgentID: " + reform.Inspect(s.AgentID, true) res[1] = "AgentType: " + reform.Inspect(s.AgentType, true) res[2] = "RunsOnNodeID: " + reform.Inspect(s.RunsOnNodeID, true) @@ -140,20 +132,16 @@ func (s Agent) String() string { res[14] = "Password: " + reform.Inspect(s.Password, true) res[15] = "TLS: " + reform.Inspect(s.TLS, true) res[16] = "TLSSkipVerify: " + reform.Inspect(s.TLSSkipVerify, true) - res[17] = "AWSAccessKey: " + reform.Inspect(s.AWSAccessKey, true) - res[18] = "AWSSecretKey: " + reform.Inspect(s.AWSSecretKey, true) - res[19] = "AzureOptions: " + reform.Inspect(s.AzureOptions, true) - res[20] = "TableCount: " + reform.Inspect(s.TableCount, true) - res[21] = "TableCountTablestatsGroupLimit: " + reform.Inspect(s.TableCountTablestatsGroupLimit, true) - res[22] = "QueryExamplesDisabled: " + reform.Inspect(s.QueryExamplesDisabled, true) - res[23] = "MaxQueryLogSize: " + reform.Inspect(s.MaxQueryLogSize, true) - res[24] = "MetricsPath: " + reform.Inspect(s.MetricsPath, true) - res[25] = "MetricsScheme: " + reform.Inspect(s.MetricsScheme, true) - res[26] = "RDSBasicMetricsDisabled: " + reform.Inspect(s.RDSBasicMetricsDisabled, true) - res[27] = "RDSEnhancedMetricsDisabled: " + reform.Inspect(s.RDSEnhancedMetricsDisabled, true) - res[28] = "PushMetrics: " + reform.Inspect(s.PushMetrics, true) - res[29] = "DisabledCollectors: " + reform.Inspect(s.DisabledCollectors, true) - res[30] = "MongoDBOptions: " + reform.Inspect(s.MongoDBOptions, true) + res[17] = "TableCount: " + reform.Inspect(s.TableCount, true) + res[18] = "TableCountTablestatsGroupLimit: " + reform.Inspect(s.TableCountTablestatsGroupLimit, true) + res[19] = "MetricsPath: " + reform.Inspect(s.MetricsPath, true) + res[20] = "MetricsScheme: " + reform.Inspect(s.MetricsScheme, true) + res[21] = "PushMetrics: " + reform.Inspect(s.PushMetrics, true) + res[22] = "DisabledCollectors: " + reform.Inspect(s.DisabledCollectors, true) + res[23] = "QANOptions: " + reform.Inspect(s.QANOptions, true) + res[24] = "MongoDBOptions: " + reform.Inspect(s.MongoDBOptions, true) + res[25] = "AzureOptions: " + reform.Inspect(s.AzureOptions, true) + res[26] = "AWSOptions: " + reform.Inspect(s.AWSOptions, true) return strings.Join(res, ", ") } @@ -178,20 +166,16 @@ func (s *Agent) Values() []interface{} { s.Password, s.TLS, s.TLSSkipVerify, - s.AWSAccessKey, - s.AWSSecretKey, - s.AzureOptions, s.TableCount, s.TableCountTablestatsGroupLimit, - s.QueryExamplesDisabled, - s.MaxQueryLogSize, s.MetricsPath, s.MetricsScheme, - s.RDSBasicMetricsDisabled, - s.RDSEnhancedMetricsDisabled, s.PushMetrics, s.DisabledCollectors, + s.QANOptions, s.MongoDBOptions, + s.AzureOptions, + s.AWSOptions, } } @@ -216,20 +200,16 @@ func (s *Agent) Pointers() []interface{} { &s.Password, &s.TLS, &s.TLSSkipVerify, - &s.AWSAccessKey, - &s.AWSSecretKey, - &s.AzureOptions, &s.TableCount, &s.TableCountTablestatsGroupLimit, - &s.QueryExamplesDisabled, - &s.MaxQueryLogSize, &s.MetricsPath, &s.MetricsScheme, - &s.RDSBasicMetricsDisabled, - &s.RDSEnhancedMetricsDisabled, &s.PushMetrics, &s.DisabledCollectors, + &s.QANOptions, &s.MongoDBOptions, + &s.AzureOptions, + &s.AWSOptions, } } diff --git a/models/database.go b/models/database.go index 6619168fbe..6ce8143c87 100644 --- a/models/database.go +++ b/models/database.go @@ -487,6 +487,31 @@ var databaseSchema = [][]string{ 34: { `ALTER TABLE kubernetes_clusters ADD COLUMN haproxy JSONB`, }, + 35: { + `ALTER TABLE agents ALTER COLUMN azure_options TYPE JSONB USING azure_options::jsonb`, + `ALTER TABLE agents ADD COLUMN aws_options JSONB`, + `ALTER TABLE agents ADD COLUMN qan_options JSONB`, + + `UPDATE agents SET aws_options=jsonb_build_object( + 'aws_access_key', aws_access_key, + 'aws_secret_key', aws_secret_key, + 'rds_basic_metrics_disabled', rds_basic_metrics_disabled, + 'rds_enhanced_metrics_disabled', rds_enhanced_metrics_disabled + ) + WHERE aws_access_key != NULL OR aws_secret_key != NULL OR rds_basic_metrics_disabled OR rds_enhanced_metrics_disabled`, + + `UPDATE agents SET aws_options=jsonb_build_object( + 'query_examples_disabled', query_examples_disabled, + 'max_query_log_size', max_query_log_size + )`, + `ALTER TABLE agents + DROP COLUMN aws_access_key, + DROP COLUMN aws_secret_key, + DROP COLUMN rds_basic_metrics_disabled, + DROP COLUMN rds_enhanced_metrics_disabled, + DROP COLUMN query_examples_disabled, + DROP COLUMN max_query_log_size`, + }, } // ^^^ Avoid default values in schema definition. ^^^ diff --git a/services/checks/mock_agents_registry_test.go b/services/checks/mock_agents_registry_test.go index 77091097e4..489a096d10 100644 --- a/services/checks/mock_agents_registry_test.go +++ b/services/checks/mock_agents_registry_test.go @@ -5,9 +5,8 @@ package checks import ( context "context" - mock "github.com/stretchr/testify/mock" - models "github.com/percona/pmm-managed/models" + mock "github.com/stretchr/testify/mock" ) // mockAgentsRegistry is an autogenerated mock type for the agentsRegistry type diff --git a/services/inventory/mock_agents_registry_test.go b/services/inventory/mock_agents_registry_test.go deleted file mode 100644 index ad971cf598..0000000000 --- a/services/inventory/mock_agents_registry_test.go +++ /dev/null @@ -1,56 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package inventory - -import ( - context "context" - - mock "github.com/stretchr/testify/mock" - - models "github.com/percona/pmm-managed/models" - - reform "gopkg.in/reform.v1" -) - -// mockAgentsRegistry is an autogenerated mock type for the agentsRegistry type -type mockAgentsRegistry struct { - mock.Mock -} - -// CheckConnectionToService provides a mock function with given fields: ctx, q, service, agent -func (_m *mockAgentsRegistry) CheckConnectionToService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { - ret := _m.Called(ctx, q, service, agent) - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { - r0 = rf(ctx, q, service, agent) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// IsConnected provides a mock function with given fields: pmmAgentID -func (_m *mockAgentsRegistry) IsConnected(pmmAgentID string) bool { - ret := _m.Called(pmmAgentID) - - var r0 bool - if rf, ok := ret.Get(0).(func(string) bool); ok { - r0 = rf(pmmAgentID) - } else { - r0 = ret.Get(0).(bool) - } - - return r0 -} - -// Kick provides a mock function with given fields: ctx, pmmAgentID -func (_m *mockAgentsRegistry) Kick(ctx context.Context, pmmAgentID string) { - _m.Called(ctx, pmmAgentID) -} - -// RequestStateUpdate provides a mock function with given fields: ctx, pmmAgentID -func (_m *mockAgentsRegistry) RequestStateUpdate(ctx context.Context, pmmAgentID string) { - _m.Called(ctx, pmmAgentID) -} diff --git a/services/inventory/mock_prometheus_service_test.go b/services/inventory/mock_prometheus_service_test.go deleted file mode 100644 index 5e66ff6898..0000000000 --- a/services/inventory/mock_prometheus_service_test.go +++ /dev/null @@ -1,15 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package inventory - -import mock "github.com/stretchr/testify/mock" - -// mockPrometheusService is an autogenerated mock type for the prometheusService type -type mockPrometheusService struct { - mock.Mock -} - -// RequestConfigurationUpdate provides a mock function with given fields: -func (_m *mockPrometheusService) RequestConfigurationUpdate() { - _m.Called() -} diff --git a/services/management/mock_agents_registry_test.go b/services/management/mock_agents_registry_test.go deleted file mode 100644 index 91314c7a50..0000000000 --- a/services/management/mock_agents_registry_test.go +++ /dev/null @@ -1,56 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package management - -import ( - context "context" - - mock "github.com/stretchr/testify/mock" - - models "github.com/percona/pmm-managed/models" - - reform "gopkg.in/reform.v1" -) - -// mockAgentsRegistry is an autogenerated mock type for the agentsRegistry type -type mockAgentsRegistry struct { - mock.Mock -} - -// CheckConnectionToService provides a mock function with given fields: ctx, q, service, agent -func (_m *mockAgentsRegistry) CheckConnectionToService(ctx context.Context, q *reform.Querier, service *models.Service, agent *models.Agent) error { - ret := _m.Called(ctx, q, service, agent) - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *reform.Querier, *models.Service, *models.Agent) error); ok { - r0 = rf(ctx, q, service, agent) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// IsConnected provides a mock function with given fields: pmmAgentID -func (_m *mockAgentsRegistry) IsConnected(pmmAgentID string) bool { - ret := _m.Called(pmmAgentID) - - var r0 bool - if rf, ok := ret.Get(0).(func(string) bool); ok { - r0 = rf(pmmAgentID) - } else { - r0 = ret.Get(0).(bool) - } - - return r0 -} - -// Kick provides a mock function with given fields: ctx, pmmAgentID -func (_m *mockAgentsRegistry) Kick(ctx context.Context, pmmAgentID string) { - _m.Called(ctx, pmmAgentID) -} - -// RequestStateUpdate provides a mock function with given fields: ctx, pmmAgentID -func (_m *mockAgentsRegistry) RequestStateUpdate(ctx context.Context, pmmAgentID string) { - _m.Called(ctx, pmmAgentID) -} diff --git a/services/management/mock_checks_service_test.go b/services/management/mock_checks_service_test.go deleted file mode 100644 index 550623d491..0000000000 --- a/services/management/mock_checks_service_test.go +++ /dev/null @@ -1,134 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package management - -import ( - context "context" - - check "github.com/percona-platform/saas/pkg/check" - - mock "github.com/stretchr/testify/mock" -) - -// mockChecksService is an autogenerated mock type for the checksService type -type mockChecksService struct { - mock.Mock -} - -// ChangeInterval provides a mock function with given fields: params -func (_m *mockChecksService) ChangeInterval(params map[string]check.Interval) error { - ret := _m.Called(params) - - var r0 error - if rf, ok := ret.Get(0).(func(map[string]check.Interval) error); ok { - r0 = rf(params) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// DisableChecks provides a mock function with given fields: checkNames -func (_m *mockChecksService) DisableChecks(checkNames []string) error { - ret := _m.Called(checkNames) - - var r0 error - if rf, ok := ret.Get(0).(func([]string) error); ok { - r0 = rf(checkNames) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// EnableChecks provides a mock function with given fields: checkNames -func (_m *mockChecksService) EnableChecks(checkNames []string) error { - ret := _m.Called(checkNames) - - var r0 error - if rf, ok := ret.Get(0).(func([]string) error); ok { - r0 = rf(checkNames) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// GetAllChecks provides a mock function with given fields: -func (_m *mockChecksService) GetAllChecks() map[string]check.Check { - ret := _m.Called() - - var r0 map[string]check.Check - if rf, ok := ret.Get(0).(func() map[string]check.Check); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(map[string]check.Check) - } - } - - return r0 -} - -// GetDisabledChecks provides a mock function with given fields: -func (_m *mockChecksService) GetDisabledChecks() ([]string, error) { - ret := _m.Called() - - var r0 []string - if rf, ok := ret.Get(0).(func() []string); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]string) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// GetSecurityCheckResults provides a mock function with given fields: -func (_m *mockChecksService) GetSecurityCheckResults() ([]check.Result, error) { - ret := _m.Called() - - var r0 []check.Result - if rf, ok := ret.Get(0).(func() []check.Result); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([]check.Result) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// StartChecks provides a mock function with given fields: ctx, group, checkNames -func (_m *mockChecksService) StartChecks(ctx context.Context, group check.Interval, checkNames []string) error { - ret := _m.Called(ctx, group, checkNames) - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context, check.Interval, []string) error); ok { - r0 = rf(ctx, group, checkNames) - } else { - r0 = ret.Error(0) - } - - return r0 -} diff --git a/services/management/mock_grafana_client_test.go b/services/management/mock_grafana_client_test.go deleted file mode 100644 index af714e11b5..0000000000 --- a/services/management/mock_grafana_client_test.go +++ /dev/null @@ -1,36 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package management - -import ( - context "context" - time "time" - - mock "github.com/stretchr/testify/mock" -) - -// mockGrafanaClient is an autogenerated mock type for the grafanaClient type -type mockGrafanaClient struct { - mock.Mock -} - -// CreateAnnotation provides a mock function with given fields: _a0, _a1, _a2, _a3, _a4 -func (_m *mockGrafanaClient) CreateAnnotation(_a0 context.Context, _a1 []string, _a2 time.Time, _a3 string, _a4 string) (string, error) { - ret := _m.Called(_a0, _a1, _a2, _a3, _a4) - - var r0 string - if rf, ok := ret.Get(0).(func(context.Context, []string, time.Time, string, string) string); ok { - r0 = rf(_a0, _a1, _a2, _a3, _a4) - } else { - r0 = ret.Get(0).(string) - } - - var r1 error - if rf, ok := ret.Get(1).(func(context.Context, []string, time.Time, string, string) error); ok { - r1 = rf(_a0, _a1, _a2, _a3, _a4) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} diff --git a/services/management/mock_jobs_service_test.go b/services/management/mock_jobs_service_test.go deleted file mode 100644 index 682b0d3e13..0000000000 --- a/services/management/mock_jobs_service_test.go +++ /dev/null @@ -1,42 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package management - -import ( - time "time" - - mock "github.com/stretchr/testify/mock" -) - -// mockJobsService is an autogenerated mock type for the jobsService type -type mockJobsService struct { - mock.Mock -} - -// StartEchoJob provides a mock function with given fields: id, pmmAgentID, timeout, message, delay -func (_m *mockJobsService) StartEchoJob(id string, pmmAgentID string, timeout time.Duration, message string, delay time.Duration) error { - ret := _m.Called(id, pmmAgentID, timeout, message, delay) - - var r0 error - if rf, ok := ret.Get(0).(func(string, string, time.Duration, string, time.Duration) error); ok { - r0 = rf(id, pmmAgentID, timeout, message, delay) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// StopJob provides a mock function with given fields: jobID -func (_m *mockJobsService) StopJob(jobID string) error { - ret := _m.Called(jobID) - - var r0 error - if rf, ok := ret.Get(0).(func(string) error); ok { - r0 = rf(jobID) - } else { - r0 = ret.Error(0) - } - - return r0 -} diff --git a/services/management/mock_prometheus_service_test.go b/services/management/mock_prometheus_service_test.go deleted file mode 100644 index 6decf5f1b0..0000000000 --- a/services/management/mock_prometheus_service_test.go +++ /dev/null @@ -1,15 +0,0 @@ -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package management - -import mock "github.com/stretchr/testify/mock" - -// mockPrometheusService is an autogenerated mock type for the prometheusService type -type mockPrometheusService struct { - mock.Mock -} - -// RequestConfigurationUpdate provides a mock function with given fields: -func (_m *mockPrometheusService) RequestConfigurationUpdate() { - _m.Called() -} diff --git a/services/server/mock_supervisord_service_test.go b/services/server/mock_supervisord_service_test.go index 59e997cbd9..13bb1722fa 100644 --- a/services/server/mock_supervisord_service_test.go +++ b/services/server/mock_supervisord_service_test.go @@ -5,9 +5,8 @@ package server import ( context "context" - mock "github.com/stretchr/testify/mock" - models "github.com/percona/pmm-managed/models" + mock "github.com/stretchr/testify/mock" time "time"