From 2961917118136d7a128ce91c6b7af2ed59f67de9 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Fri, 19 Jan 2024 13:57:19 +0000 Subject: [PATCH] PMM-12811 simplify, remove redundant methods --- managed/services/inventory/agents.go | 214 +++++++++++----- managed/services/inventory/agents_test.go | 3 +- .../services/inventory/grpc/agents_server.go | 230 +----------------- 3 files changed, 163 insertions(+), 284 deletions(-) diff --git a/managed/services/inventory/agents.go b/managed/services/inventory/agents.go index faabea45dc..eaa899123c 100644 --- a/managed/services/inventory/agents.go +++ b/managed/services/inventory/agents.go @@ -225,14 +225,21 @@ func (as *AgentsService) AddNodeExporter(ctx context.Context, p *inventoryv1.Add } // ChangeNodeExporter updates node_exporter Agent with given parameters. -func (as *AgentsService) ChangeNodeExporter(ctx context.Context, req *inventoryv1.ChangeNodeExporterParams) (*inventoryv1.NodeExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeNodeExporter(ctx context.Context, p *inventoryv1.ChangeNodeExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.NodeExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.NodeExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_NodeExporter{ + NodeExporter: agent, + }, + } + return res, nil } @@ -293,14 +300,21 @@ func (as *AgentsService) AddMySQLdExporter(ctx context.Context, p *inventoryv1.A } // ChangeMySQLdExporter updates mysqld_exporter Agent with given parameters. -func (as *AgentsService) ChangeMySQLdExporter(ctx context.Context, req *inventoryv1.ChangeMySQLdExporterParams) (*inventoryv1.MySQLdExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeMySQLdExporter(ctx context.Context, p *inventoryv1.ChangeMySQLdExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.MySQLdExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.MySQLdExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_MysqldExporter{ + MysqldExporter: agent, + }, + } + return res, nil } @@ -358,14 +372,21 @@ func (as *AgentsService) AddMongoDBExporter(ctx context.Context, p *inventoryv1. } // ChangeMongoDBExporter updates mongo_exporter Agent with given parameters. -func (as *AgentsService) ChangeMongoDBExporter(ctx context.Context, req *inventoryv1.ChangeMongoDBExporterParams) (*inventoryv1.MongoDBExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeMongoDBExporter(ctx context.Context, p *inventoryv1.ChangeMongoDBExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.MongoDBExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.MongoDBExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_MongodbExporter{ + MongodbExporter: agent, + }, + } + return res, nil } @@ -420,14 +441,20 @@ func (as *AgentsService) AddQANMySQLPerfSchemaAgent(ctx context.Context, p *inve } // ChangeQANMySQLPerfSchemaAgent updates MySQL PerfSchema QAN Agent with given parameters. -func (as *AgentsService) ChangeQANMySQLPerfSchemaAgent(ctx context.Context, req *inventoryv1.ChangeQANMySQLPerfSchemaAgentParams) (*inventoryv1.QANMySQLPerfSchemaAgent, error) { //nolint:lll - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeQANMySQLPerfSchemaAgent(ctx context.Context, p *inventoryv1.ChangeQANMySQLPerfSchemaAgentParams) (*inventoryv1.ChangeAgentResponse, error) { //nolint:lll + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.QANMySQLPerfSchemaAgent) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.QANMySQLPerfSchemaAgent) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_QanMysqlPerfschemaAgent{ + QanMysqlPerfschemaAgent: agent, + }, + } return res, nil } @@ -487,14 +514,20 @@ func (as *AgentsService) AddQANMySQLSlowlogAgent(ctx context.Context, p *invento } // ChangeQANMySQLSlowlogAgent updates MySQL Slowlog QAN Agent with given parameters. -func (as *AgentsService) ChangeQANMySQLSlowlogAgent(ctx context.Context, req *inventoryv1.ChangeQANMySQLSlowlogAgentParams) (*inventoryv1.QANMySQLSlowlogAgent, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeQANMySQLSlowlogAgent(ctx context.Context, p *inventoryv1.ChangeQANMySQLSlowlogAgentParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.QANMySQLSlowlogAgent) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.QANMySQLSlowlogAgent) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_QanMysqlSlowlogAgent{ + QanMysqlSlowlogAgent: agent, + }, + } return res, nil } @@ -552,14 +585,20 @@ func (as *AgentsService) AddPostgresExporter(ctx context.Context, p *inventoryv1 } // ChangePostgresExporter updates postgres_exporter Agent with given parameters. -func (as *AgentsService) ChangePostgresExporter(ctx context.Context, req *inventoryv1.ChangePostgresExporterParams) (*inventoryv1.PostgresExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangePostgresExporter(ctx context.Context, p *inventoryv1.ChangePostgresExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.PostgresExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.PostgresExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_PostgresExporter{ + PostgresExporter: agent, + }, + } return res, nil } @@ -616,14 +655,20 @@ func (as *AgentsService) AddQANMongoDBProfilerAgent(ctx context.Context, p *inve // ChangeQANMongoDBProfilerAgent updates MongoDB Profiler QAN Agent with given parameters. // //nolint:lll,dupl -func (as *AgentsService) ChangeQANMongoDBProfilerAgent(ctx context.Context, req *inventoryv1.ChangeQANMongoDBProfilerAgentParams) (*inventoryv1.QANMongoDBProfilerAgent, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeQANMongoDBProfilerAgent(ctx context.Context, p *inventoryv1.ChangeQANMongoDBProfilerAgentParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.QANMongoDBProfilerAgent) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.QANMongoDBProfilerAgent) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_QanMongodbProfilerAgent{ + QanMongodbProfilerAgent: agent, + }, + } return res, nil } @@ -680,42 +725,48 @@ func (as *AgentsService) AddProxySQLExporter(ctx context.Context, p *inventoryv1 } // ChangeProxySQLExporter updates proxysql_exporter Agent with given parameters. -func (as *AgentsService) ChangeProxySQLExporter(ctx context.Context, req *inventoryv1.ChangeProxySQLExporterParams) (*inventoryv1.ProxySQLExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeProxySQLExporter(ctx context.Context, p *inventoryv1.ChangeProxySQLExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.ProxySQLExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.ProxySQLExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_ProxysqlExporter{ + ProxysqlExporter: agent, + }, + } return res, nil } // AddQANPostgreSQLPgStatementsAgent adds PostgreSQL Pg stat statements QAN Agent. // //nolint:lll -func (as *AgentsService) AddQANPostgreSQLPgStatementsAgent(ctx context.Context, req *inventoryv1.AddQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.QANPostgreSQLPgStatementsAgent, error) { +func (as *AgentsService) AddQANPostgreSQLPgStatementsAgent(ctx context.Context, p *inventoryv1.AddQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.QANPostgreSQLPgStatementsAgent, error) { var res *inventoryv1.QANPostgreSQLPgStatementsAgent e := as.db.InTransaction(func(tx *reform.TX) error { params := &models.CreateAgentParams{ - PMMAgentID: req.PmmAgentId, - ServiceID: req.ServiceId, - Username: req.Username, - Password: req.Password, - CustomLabels: req.CustomLabels, - MaxQueryLength: req.MaxQueryLength, - CommentsParsingDisabled: req.DisableCommentsParsing, - TLS: req.Tls, - TLSSkipVerify: req.TlsSkipVerify, - PostgreSQLOptions: models.PostgreSQLOptionsFromRequest(req), - LogLevel: services.SpecifyLogLevel(req.LogLevel, inventoryv1.LogLevel_LOG_LEVEL_FATAL), + PMMAgentID: p.PmmAgentId, + ServiceID: p.ServiceId, + Username: p.Username, + Password: p.Password, + CustomLabels: p.CustomLabels, + MaxQueryLength: p.MaxQueryLength, + CommentsParsingDisabled: p.DisableCommentsParsing, + TLS: p.Tls, + TLSSkipVerify: p.TlsSkipVerify, + PostgreSQLOptions: models.PostgreSQLOptionsFromRequest(p), + LogLevel: services.SpecifyLogLevel(p.LogLevel, inventoryv1.LogLevel_LOG_LEVEL_FATAL), } row, err := models.CreateAgent(tx.Querier, models.QANPostgreSQLPgStatementsAgentType, params) if err != nil { return err } - if !req.SkipConnectionCheck { - service, err := models.FindServiceByID(tx.Querier, req.ServiceId) + if !p.SkipConnectionCheck { + service, err := models.FindServiceByID(tx.Querier, p.ServiceId) if err != nil { return err } @@ -736,19 +787,25 @@ func (as *AgentsService) AddQANPostgreSQLPgStatementsAgent(ctx context.Context, return res, e } - as.state.RequestStateUpdate(ctx, req.PmmAgentId) + as.state.RequestStateUpdate(ctx, p.PmmAgentId) return res, e } // ChangeQANPostgreSQLPgStatementsAgent updates PostgreSQL Pg stat statements QAN Agent with given parameters. -func (as *AgentsService) ChangeQANPostgreSQLPgStatementsAgent(ctx context.Context, req *inventoryv1.ChangeQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.QANPostgreSQLPgStatementsAgent, error) { //nolint:lll - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeQANPostgreSQLPgStatementsAgent(ctx context.Context, p *inventoryv1.ChangeQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.ChangeAgentResponse, error) { //nolint:lll + ag, err := as.changeAgent(p.AgentId, p.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.QANPostgreSQLPgStatementsAgent) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.QANPostgreSQLPgStatementsAgent) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_QanPostgresqlPgstatementsAgent{ + QanPostgresqlPgstatementsAgent: agent, + }, + } return res, nil } @@ -803,14 +860,20 @@ func (as *AgentsService) AddQANPostgreSQLPgStatMonitorAgent(ctx context.Context, } // ChangeQANPostgreSQLPgStatMonitorAgent updates PostgreSQL Pg stat monitor QAN Agent with given parameters. -func (as *AgentsService) ChangeQANPostgreSQLPgStatMonitorAgent(ctx context.Context, req *inventoryv1.ChangeQANPostgreSQLPgStatMonitorAgentParams) (*inventoryv1.QANPostgreSQLPgStatMonitorAgent, error) { //nolint:lll - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeQANPostgreSQLPgStatMonitorAgent(ctx context.Context, req *inventoryv1.ChangeQANPostgreSQLPgStatMonitorAgentParams) (*inventoryv1.ChangeAgentResponse, error) { //nolint:lll + ag, err := as.changeAgent(req.AgentId, req.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.QANPostgreSQLPgStatMonitorAgent) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.QANPostgreSQLPgStatMonitorAgent) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_QanPostgresqlPgstatmonitorAgent{ + QanPostgresqlPgstatmonitorAgent: agent, + }, + } return res, nil } @@ -855,14 +918,20 @@ func (as *AgentsService) AddRDSExporter(ctx context.Context, p *inventoryv1.AddR } // ChangeRDSExporter updates rds_exporter Agent with given parameters. -func (as *AgentsService) ChangeRDSExporter(ctx context.Context, req *inventoryv1.ChangeRDSExporterParams) (*inventoryv1.RDSExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeRDSExporter(ctx context.Context, req *inventoryv1.ChangeRDSExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(req.AgentId, req.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.RDSExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.RDSExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_RdsExporter{ + RdsExporter: agent, + }, + } return res, nil } @@ -912,8 +981,8 @@ func (as *AgentsService) AddExternalExporter(ctx context.Context, p *inventoryv1 } // ChangeExternalExporter updates external-exporter Agent with given parameters. -func (as *AgentsService) ChangeExternalExporter(req *inventoryv1.ChangeExternalExporterParams) (*inventoryv1.ExternalExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +func (as *AgentsService) ChangeExternalExporter(req *inventoryv1.ChangeExternalExporterParams) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(req.AgentId, req.Common) if err != nil { return nil, err } @@ -921,7 +990,14 @@ func (as *AgentsService) ChangeExternalExporter(req *inventoryv1.ChangeExternalE // It's required to regenerate victoriametrics config file. as.vmdb.RequestConfigurationUpdate() - res := agent.(*inventoryv1.ExternalExporter) //nolint:forceTypeAssert + agent := ag.(*inventoryv1.ExternalExporter) //nolint:forceTypeAssert + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_ExternalExporter{ + ExternalExporter: agent, + }, + } + return res, nil } @@ -962,14 +1038,20 @@ func (as *AgentsService) AddAzureDatabaseExporter(ctx context.Context, p *invent func (as *AgentsService) ChangeAzureDatabaseExporter( ctx context.Context, req *inventoryv1.ChangeAzureDatabaseExporterParams, -) (*inventoryv1.AzureDatabaseExporter, error) { - agent, err := as.changeAgent(req.AgentId, req.Common) +) (*inventoryv1.ChangeAgentResponse, error) { + ag, err := as.changeAgent(req.AgentId, req.Common) if err != nil { return nil, err } - res := agent.(*inventoryv1.AzureDatabaseExporter) //nolint:forcetypeassert - as.state.RequestStateUpdate(ctx, res.PmmAgentId) + agent := ag.(*inventoryv1.AzureDatabaseExporter) //nolint:forcetypeassert + as.state.RequestStateUpdate(ctx, agent.PmmAgentId) + + res := &inventoryv1.ChangeAgentResponse{ + Agent: &inventoryv1.ChangeAgentResponse_AzureDatabaseExporter{ + AzureDatabaseExporter: agent, + }, + } return res, nil } diff --git a/managed/services/inventory/agents_test.go b/managed/services/inventory/agents_test.go index fcc8dcdbcc..341e32cf78 100644 --- a/managed/services/inventory/agents_test.go +++ b/managed/services/inventory/agents_test.go @@ -78,13 +78,14 @@ func TestAgents(t *testing.T) { } assert.Equal(t, expectedNodeExporter, actualNodeExporter) - actualNodeExporter, err = as.ChangeNodeExporter(ctx, &inventoryv1.ChangeNodeExporterParams{ + resp, err := as.ChangeNodeExporter(ctx, &inventoryv1.ChangeNodeExporterParams{ AgentId: "/agent_id/00000000-0000-4000-8000-000000000006", Common: &inventoryv1.ChangeCommonAgentParams{ Disable: true, }, }) require.NoError(t, err) + actualNodeExporter = resp.GetNodeExporter() expectedNodeExporter = &inventoryv1.NodeExporter{ AgentId: "/agent_id/00000000-0000-4000-8000-000000000006", PmmAgentId: "/agent_id/00000000-0000-4000-8000-000000000005", diff --git a/managed/services/inventory/grpc/agents_server.go b/managed/services/inventory/grpc/agents_server.go index a813ed0d20..98b14acb64 100644 --- a/managed/services/inventory/grpc/agents_server.go +++ b/managed/services/inventory/grpc/agents_server.go @@ -228,31 +228,31 @@ func (s *agentsServer) AddAgent(ctx context.Context, req *inventoryv1.AddAgentRe func (s *agentsServer) ChangeAgent(ctx context.Context, req *inventoryv1.ChangeAgentRequest) (*inventoryv1.ChangeAgentResponse, error) { switch req.Agent.(type) { case *inventoryv1.ChangeAgentRequest_NodeExporter: - return s.changeNodeExporter(ctx, req.GetNodeExporter()) + return s.s.ChangeNodeExporter(ctx, req.GetNodeExporter()) case *inventoryv1.ChangeAgentRequest_MysqldExporter: - return s.changeMySQLdExporter(ctx, req.GetMysqldExporter()) + return s.s.ChangeMySQLdExporter(ctx, req.GetMysqldExporter()) case *inventoryv1.ChangeAgentRequest_MongodbExporter: - return s.changeMongoDBExporter(ctx, req.GetMongodbExporter()) + return s.s.ChangeMongoDBExporter(ctx, req.GetMongodbExporter()) case *inventoryv1.ChangeAgentRequest_PostgresExporter: - return s.changePostgresExporter(ctx, req.GetPostgresExporter()) + return s.s.ChangePostgresExporter(ctx, req.GetPostgresExporter()) case *inventoryv1.ChangeAgentRequest_ProxysqlExporter: - return s.changeProxySQLExporter(ctx, req.GetProxysqlExporter()) + return s.s.ChangeProxySQLExporter(ctx, req.GetProxysqlExporter()) case *inventoryv1.ChangeAgentRequest_RdsExporter: - return s.changeRDSExporter(ctx, req.GetRdsExporter()) + return s.s.ChangeRDSExporter(ctx, req.GetRdsExporter()) case *inventoryv1.ChangeAgentRequest_ExternalExporter: - return s.changeExternalExporter(ctx, req.GetExternalExporter()) + return s.s.ChangeExternalExporter(req.GetExternalExporter()) case *inventoryv1.ChangeAgentRequest_AzureDatabaseExporter: - return s.changeAzureDatabaseExporter(ctx, req.GetAzureDatabaseExporter()) + return s.s.ChangeAzureDatabaseExporter(ctx, req.GetAzureDatabaseExporter()) case *inventoryv1.ChangeAgentRequest_QanMysqlPerfschemaAgent: - return s.changeQANMySQLPerfSchemaAgent(ctx, req.GetQanMysqlPerfschemaAgent()) + return s.s.ChangeQANMySQLPerfSchemaAgent(ctx, req.GetQanMysqlPerfschemaAgent()) case *inventoryv1.ChangeAgentRequest_QanMysqlSlowlogAgent: - return s.changeQANMySQLSlowlogAgent(ctx, req.GetQanMysqlSlowlogAgent()) + return s.s.ChangeQANMySQLSlowlogAgent(ctx, req.GetQanMysqlSlowlogAgent()) case *inventoryv1.ChangeAgentRequest_QanMongodbProfilerAgent: - return s.changeQANMongoDBProfilerAgent(ctx, req.GetQanMongodbProfilerAgent()) + return s.s.ChangeQANMongoDBProfilerAgent(ctx, req.GetQanMongodbProfilerAgent()) case *inventoryv1.ChangeAgentRequest_QanPostgresqlPgstatementsAgent: - return s.changeQANPostgreSQLPgStatementsAgent(ctx, req.GetQanPostgresqlPgstatementsAgent()) + return s.s.ChangeQANPostgreSQLPgStatementsAgent(ctx, req.GetQanPostgresqlPgstatementsAgent()) case *inventoryv1.ChangeAgentRequest_QanPostgresqlPgstatmonitorAgent: - return s.changeQANPostgreSQLPgStatMonitorAgent(ctx, req.GetQanPostgresqlPgstatmonitorAgent()) + return s.s.ChangeQANPostgreSQLPgStatMonitorAgent(ctx, req.GetQanPostgresqlPgstatmonitorAgent()) default: return nil, fmt.Errorf("invalid request %v", req.Agent) } @@ -273,21 +273,6 @@ func (s *agentsServer) addNodeExporter(ctx context.Context, params *inventoryv1. return res, nil } -// ChangeNodeExporter changes disabled flag and custom labels of node_exporter Agent. -func (s *agentsServer) changeNodeExporter(ctx context.Context, params *inventoryv1.ChangeNodeExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeNodeExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_NodeExporter{ - NodeExporter: agent, - }, - } - return res, nil -} - // addMySQLdExporter adds mysqld_exporter Agent. func (s *agentsServer) addMySQLdExporter(ctx context.Context, params *inventoryv1.AddMySQLdExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, tableCount, err := s.s.AddMySQLdExporter(ctx, params) @@ -304,21 +289,6 @@ func (s *agentsServer) addMySQLdExporter(ctx context.Context, params *inventoryv return res, nil } -// ChangeMySQLdExporter changes disabled flag and custom labels of mysqld_exporter Agent. -func (s *agentsServer) changeMySQLdExporter(ctx context.Context, params *inventoryv1.ChangeMySQLdExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeMySQLdExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_MysqldExporter{ - MysqldExporter: agent, - }, - } - return res, nil -} - // addMongoDBExporter adds mongodb_exporter Agent. func (s *agentsServer) addMongoDBExporter(ctx context.Context, params *inventoryv1.AddMongoDBExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, err := s.s.AddMongoDBExporter(ctx, params) @@ -334,21 +304,6 @@ func (s *agentsServer) addMongoDBExporter(ctx context.Context, params *inventory return res, nil } -// ChangeMongoDBExporter changes disabled flag and custom labels of mongo_exporter Agent. -func (s *agentsServer) changeMongoDBExporter(ctx context.Context, params *inventoryv1.ChangeMongoDBExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeMongoDBExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_MongodbExporter{ - MongodbExporter: agent, - }, - } - return res, nil -} - // AddQANMySQLPerfSchemaAgent adds MySQL PerfSchema QAN Agent. // //nolint:lll @@ -366,23 +321,6 @@ func (s *agentsServer) addQANMySQLPerfSchemaAgent(ctx context.Context, params *i return res, nil } -// ChangeQANMySQLPerfSchemaAgent changes disabled flag and custom labels of MySQL PerfSchema QAN Agent. -// -//nolint:lll -func (s *agentsServer) changeQANMySQLPerfSchemaAgent(ctx context.Context, params *inventoryv1.ChangeQANMySQLPerfSchemaAgentParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeQANMySQLPerfSchemaAgent(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_QanMysqlPerfschemaAgent{ - QanMysqlPerfschemaAgent: agent, - }, - } - return res, nil -} - // AddQANMySQLSlowlogAgent adds MySQL Slowlog QAN Agent. // //nolint:lll @@ -400,23 +338,6 @@ func (s *agentsServer) addQANMySQLSlowlogAgent(ctx context.Context, params *inve return res, nil } -// ChangeQANMySQLSlowlogAgent changes disabled flag and custom labels of MySQL Slowlog QAN Agent. -// -//nolint:lll -func (s *agentsServer) changeQANMySQLSlowlogAgent(ctx context.Context, params *inventoryv1.ChangeQANMySQLSlowlogAgentParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeQANMySQLSlowlogAgent(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_QanMysqlSlowlogAgent{ - QanMysqlSlowlogAgent: agent, - }, - } - return res, nil -} - // addPostgresExporter adds postgres_exporter Agent. func (s *agentsServer) addPostgresExporter(ctx context.Context, params *inventoryv1.AddPostgresExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, err := s.s.AddPostgresExporter(ctx, params) @@ -432,21 +353,6 @@ func (s *agentsServer) addPostgresExporter(ctx context.Context, params *inventor return res, nil } -// ChangePostgresExporter changes disabled flag and custom labels of postgres_exporter Agent. -func (s *agentsServer) changePostgresExporter(ctx context.Context, params *inventoryv1.ChangePostgresExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangePostgresExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_PostgresExporter{ - PostgresExporter: agent, - }, - } - return res, nil -} - // AddQANMongoDBProfilerAgent adds MongoDB Profiler QAN Agent. // //nolint:lll @@ -464,23 +370,6 @@ func (s *agentsServer) addQANMongoDBProfilerAgent(ctx context.Context, params *i return res, nil } -// ChangeQANMongoDBProfilerAgent changes disabled flag and custom labels of MongoDB Profiler QAN Agent. -// -//nolint:lll -func (s *agentsServer) changeQANMongoDBProfilerAgent(ctx context.Context, params *inventoryv1.ChangeQANMongoDBProfilerAgentParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeQANMongoDBProfilerAgent(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_QanMongodbProfilerAgent{ - QanMongodbProfilerAgent: agent, - }, - } - return res, nil -} - // addProxySQLExporter adds proxysql_exporter Agent. func (s *agentsServer) addProxySQLExporter(ctx context.Context, params *inventoryv1.AddProxySQLExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, err := s.s.AddProxySQLExporter(ctx, params) @@ -496,21 +385,6 @@ func (s *agentsServer) addProxySQLExporter(ctx context.Context, params *inventor return res, nil } -// ChangeProxySQLExporter changes disabled flag and custom labels of proxysql_exporter Agent. -func (s *agentsServer) changeProxySQLExporter(ctx context.Context, params *inventoryv1.ChangeProxySQLExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeProxySQLExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_ProxysqlExporter{ - ProxysqlExporter: agent, - }, - } - return res, nil -} - // AddQANPostgreSQLPgStatementsAgent adds PostgreSQL Pg stat statements QAN Agent. func (s *agentsServer) addQANPostgreSQLPgStatementsAgent(ctx context.Context, params *inventoryv1.AddQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.AddAgentResponse, error) { //nolint:lll agent, err := s.s.AddQANPostgreSQLPgStatementsAgent(ctx, params) @@ -526,21 +400,6 @@ func (s *agentsServer) addQANPostgreSQLPgStatementsAgent(ctx context.Context, pa return res, nil } -// ChangeQANPostgreSQLPgStatementsAgent changes disabled flag and custom labels of PostgreSQL Pg stat statements QAN Agent. -func (s *agentsServer) changeQANPostgreSQLPgStatementsAgent(ctx context.Context, params *inventoryv1.ChangeQANPostgreSQLPgStatementsAgentParams) (*inventoryv1.ChangeAgentResponse, error) { //nolint:lll - agent, err := s.s.ChangeQANPostgreSQLPgStatementsAgent(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_QanPostgresqlPgstatementsAgent{ - QanPostgresqlPgstatementsAgent: agent, - }, - } - return res, nil -} - // AddQANPostgreSQLPgStatMonitorAgent adds PostgreSQL Pg stat monitor QAN Agent. func (s *agentsServer) addQANPostgreSQLPgStatMonitorAgent(ctx context.Context, params *inventoryv1.AddQANPostgreSQLPgStatMonitorAgentParams) (*inventoryv1.AddAgentResponse, error) { //nolint:lll agent, err := s.s.AddQANPostgreSQLPgStatMonitorAgent(ctx, params) @@ -556,21 +415,6 @@ func (s *agentsServer) addQANPostgreSQLPgStatMonitorAgent(ctx context.Context, p return res, nil } -// ChangeQANPostgreSQLPgStatMonitorAgent changes disabled flag and custom labels of PostgreSQL Pg stat monitor QAN Agent. -func (s *agentsServer) changeQANPostgreSQLPgStatMonitorAgent(ctx context.Context, params *inventoryv1.ChangeQANPostgreSQLPgStatMonitorAgentParams) (*inventoryv1.ChangeAgentResponse, error) { //nolint:lll - agent, err := s.s.ChangeQANPostgreSQLPgStatMonitorAgent(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_QanPostgresqlPgstatmonitorAgent{ - QanPostgresqlPgstatmonitorAgent: agent, - }, - } - return res, nil -} - // addRDSExporter adds rds_exporter Agent. func (s *agentsServer) addRDSExporter(ctx context.Context, params *inventoryv1.AddRDSExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, err := s.s.AddRDSExporter(ctx, params) @@ -586,21 +430,6 @@ func (s *agentsServer) addRDSExporter(ctx context.Context, params *inventoryv1.A return res, nil } -// ChangeRDSExporter changes disabled flag and custom labels of rds_exporter Agent. -func (s *agentsServer) changeRDSExporter(ctx context.Context, params *inventoryv1.ChangeRDSExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeRDSExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_RdsExporter{ - RdsExporter: agent, - }, - } - return res, nil -} - // addExternalExporter adds external_exporter Agent. func (s *agentsServer) addExternalExporter(ctx context.Context, params *inventoryv1.AddExternalExporterParams) (*inventoryv1.AddAgentResponse, error) { agent, err := s.s.AddExternalExporter(ctx, params) @@ -616,21 +445,6 @@ func (s *agentsServer) addExternalExporter(ctx context.Context, params *inventor return res, nil } -//nolint:unparam -func (s *agentsServer) changeExternalExporter(ctx context.Context, params *inventoryv1.ChangeExternalExporterParams) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeExternalExporter(params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_ExternalExporter{ - ExternalExporter: agent, - }, - } - return res, nil -} - // addAzureDatabaseExporter adds azure_database_exporter Agent. func (s *agentsServer) addAzureDatabaseExporter( ctx context.Context, @@ -649,24 +463,6 @@ func (s *agentsServer) addAzureDatabaseExporter( return res, nil } -// ChangeAzureDatabaseExporter changes disabled flag and custom labels of azure_database_exporter Agent. -func (s *agentsServer) changeAzureDatabaseExporter( - ctx context.Context, - params *inventoryv1.ChangeAzureDatabaseExporterParams, -) (*inventoryv1.ChangeAgentResponse, error) { - agent, err := s.s.ChangeAzureDatabaseExporter(ctx, params) - if err != nil { - return nil, err - } - - res := &inventoryv1.ChangeAgentResponse{ - Agent: &inventoryv1.ChangeAgentResponse_AzureDatabaseExporter{ - AzureDatabaseExporter: agent, - }, - } - return res, nil -} - // RemoveAgent removes Agent. func (s *agentsServer) RemoveAgent(ctx context.Context, req *inventoryv1.RemoveAgentRequest) (*inventoryv1.RemoveAgentResponse, error) { if err := s.s.Remove(ctx, req.AgentId, req.Force); err != nil {