Skip to content

Commit

Permalink
PMM-12857 fix agent tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ademidoff
ademidoff committed Jun 28, 2024
1 parent c8b2668 commit bacf332
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 69 deletions.
2 changes: 1 addition & 1 deletion api-tests/inventory/agents_mysqld_exporter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func TestMySQLdExporter(t *testing.T) {
},
Context: pmmapitests.Context,
})
pmmapitests.AssertAPIErrorf(t, err, 404, codes.NotFound, "Agent with ID \"pmm-not-exist-server\" not found.")
pmmapitests.AssertAPIErrorf(t, err, 404, codes.NotFound, "Agent with ID pmm-not-exist-server not found.")
if !assert.Nil(t, res) {
pmmapitests.RemoveAgents(t, res.Payload.MysqldExporter.AgentID)
}
Expand Down
128 changes: 60 additions & 68 deletions api-tests/inventory/agents_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ func TestPGStatMonitorQanAgent(t *testing.T) {
func TestMetricsResolutionsChange(t *testing.T) {
t.Parallel()

genericNodeID := pmmapitests.AddGenericNode(t, pmmapitests.TestString(t, "")).NodeID
genericNodeID := pmmapitests.AddGenericNode(t, pmmapitests.TestString(t, "Generic node")).NodeID
require.NotEmpty(t, genericNodeID)
defer pmmapitests.RemoveNodes(t, genericNodeID)

Expand All @@ -1342,7 +1342,7 @@ func TestMetricsResolutionsChange(t *testing.T) {
res, err := client.Default.AgentsService.AddAgent(
&agents.AddAgentParams{
Body: agents.AddAgentBody{
QANPostgresqlPgstatmonitorAgent: &agents.AddAgentParamsBodyQANPostgresqlPgstatmonitorAgent{
PostgresExporter: &agents.AddAgentParamsBodyPostgresExporter{
ServiceID: serviceID,
Username: "username",
Password: "password",
Expand All @@ -1357,28 +1357,26 @@ func TestMetricsResolutionsChange(t *testing.T) {
})
require.NoError(t, err)
agentID := res.Payload.PostgresExporter.AgentID
defer pmmapitests.RemoveAgentsWithForce(t, agentID)
defer pmmapitests.RemoveAgents(t, agentID)

getAgentRes, err := client.Default.AgentsService.GetAgent(
&agents.GetAgentParams{
AgentID: agentID,
Context: pmmapitests.Context,
})
require.NoError(t, err)
assert.Equal(t, &agents.GetAgentOK{
Payload: &agents.GetAgentOKBody{
PostgresExporter: &agents.GetAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
Status: &AgentStatusUnknown,
},
assert.Equal(t, &agents.GetAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
}, getAgentRes)
Status: &AgentStatusUnknown,
LogLevel: pointer.ToString("LOG_LEVEL_UNSPECIFIED"),
DisabledCollectors: []string{},
}, getAgentRes.Payload.PostgresExporter)

// Change metrics resolutions
changePostgresExporterOK, err := client.Default.AgentsService.ChangeAgent(
Expand All @@ -1396,25 +1394,23 @@ func TestMetricsResolutionsChange(t *testing.T) {
Context: pmmapitests.Context,
})
require.NoError(t, err)
assert.Equal(t, &agents.ChangeAgentOK{
Payload: &agents.ChangeAgentOKBody{
PostgresExporter: &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
Status: &AgentStatusUnknown,
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "600s",
Mr: "300s",
Lr: "100s",
},
},
assert.Equal(t, &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
}, changePostgresExporterOK)
Status: &AgentStatusUnknown,
LogLevel: pointer.ToString("LOG_LEVEL_UNSPECIFIED"),
DisabledCollectors: []string{},
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "600s",
Mr: "300s",
Lr: "100s",
},
}, changePostgresExporterOK.Payload.PostgresExporter)

// Reset part of metrics resolutions
changePostgresExporterOK, err = client.Default.AgentsService.ChangeAgent(
Expand All @@ -1432,24 +1428,22 @@ func TestMetricsResolutionsChange(t *testing.T) {
Context: pmmapitests.Context,
})
require.NoError(t, err)
assert.Equal(t, &agents.ChangeAgentOK{
Payload: &agents.ChangeAgentOKBody{
PostgresExporter: &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
Status: &AgentStatusUnknown,
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "600s",
Mr: "300s",
},
},
assert.Equal(t, &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
}, changePostgresExporterOK)
Status: &AgentStatusUnknown,
LogLevel: pointer.ToString("LOG_LEVEL_UNSPECIFIED"),
DisabledCollectors: []string{},
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "600s",
Mr: "300s",
},
}, changePostgresExporterOK.Payload.PostgresExporter)

// Change part of metrics resolutions
changePostgresExporterOK, err = client.Default.AgentsService.ChangeAgent(
Expand All @@ -1465,22 +1459,20 @@ func TestMetricsResolutionsChange(t *testing.T) {
Context: pmmapitests.Context,
})
require.NoError(t, err)
assert.Equal(t, &agents.ChangeAgentOK{
Payload: &agents.ChangeAgentOKBody{
PostgresExporter: &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
Status: &AgentStatusUnknown,
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "500s",
Mr: "300s",
},
},
assert.Equal(t, &agents.ChangeAgentOKBodyPostgresExporter{
AgentID: agentID,
ServiceID: serviceID,
Username: "username",
PMMAgentID: pmmAgentID,
CustomLabels: map[string]string{
"custom_label_postgres_exporter": "postgres_exporter",
},
Status: &AgentStatusUnknown,
LogLevel: pointer.ToString("LOG_LEVEL_UNSPECIFIED"),
DisabledCollectors: []string{},
MetricsResolutions: &agents.ChangeAgentOKBodyPostgresExporterMetricsResolutions{
Hr: "500s",
Mr: "300s",
},
}, changePostgresExporterOK)
}, changePostgresExporterOK.Payload.PostgresExporter)
}

0 comments on commit bacf332

Please sign in to comment.