Skip to content

Commit

Permalink
PMM-12375 re-generate interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Tymchuk committed Sep 27, 2023
1 parent dc51cdc commit b277882
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
2 changes: 1 addition & 1 deletion managed/models/service_model_reform.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 0 additions & 30 deletions managed/services/agents/service_info_broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"github.com/percona/pmm/api/inventorypb"
"github.com/percona/pmm/managed/models"
"github.com/percona/pmm/utils/logger"
"github.com/percona/pmm/version"
)

// ServiceInfoBroker checks if connection can be established to service.
Expand Down Expand Up @@ -137,19 +136,6 @@ func (c *ServiceInfoBroker) GetInfoFromService(ctx context.Context, q *reform.Qu
}

pmmAgentID := pointer.GetString(agent.PMMAgentID)

// Skip check connection to external exporter with old pmm-agent.
if service.ServiceType == models.ExternalServiceType || service.ServiceType == models.HAProxyServiceType {
isSupported, err := isExternalExporterServiceInfoSupported(q, pmmAgentID)
if err != nil {
return err
}

if !isSupported {
return nil
}
}

pmmAgent, err := c.r.get(pmmAgentID)
if err != nil {
return err
Expand Down Expand Up @@ -219,19 +205,3 @@ func updateServiceVersion(ctx context.Context, q *reform.Querier, resp agentpb.A

return nil
}

func isExternalExporterServiceInfoSupported(q *reform.Querier, pmmAgentID string) (bool, error) {
pmmAgent, err := models.FindAgentByID(q, pmmAgentID)
if err != nil {
return false, fmt.Errorf("failed to get PMM Agent: %w", err)
}
pmmAgentVersion, err := version.Parse(*pmmAgent.Version)
if err != nil {
return false, fmt.Errorf("failed to parse PMM agent version %q: %w", *pmmAgent.Version, err)
}

if pmmAgentVersion.Less(checkExternalExporterConnectionPMMVersion) {
return false, nil
}
return true, nil
}

0 comments on commit b277882

Please sign in to comment.