PMM-12811 get rid of remove_custom_labels field

percona · Feb 1, 2024 · 8ecef17 · 8ecef17
1 parent 75ed7e3
commit 8ecef17
Show file tree

Hide file tree

Showing 17 changed files with 1,286 additions and 1,473 deletions.
diff --git a/api-tests/inventory/agents_azure_database_exporter_test.go b/api-tests/inventory/agents_azure_database_exporter_test.go
@@ -88,8 +88,8 @@ func TestAzureDatabaseExporter(t *testing.T) { //nolint:tparallel
 					AzureDatabaseExporter: &agents.ChangeAgentParamsBodyAzureDatabaseExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyAzureDatabaseExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyAzureDatabaseExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_external_exporter_test.go b/api-tests/inventory/agents_external_exporter_test.go
@@ -146,8 +146,8 @@ func TestExternalExporter(t *testing.T) {
 					ExternalExporter: &agents.ChangeAgentParamsBodyExternalExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyExternalExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyExternalExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_mongodb_exporter_test.go b/api-tests/inventory/agents_mongodb_exporter_test.go
@@ -103,8 +103,8 @@ func TestMongoDBExporter(t *testing.T) {
 					MongodbExporter: &agents.ChangeAgentParamsBodyMongodbExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyMongodbExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyMongodbExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_mysqld_exporter_test.go b/api-tests/inventory/agents_mysqld_exporter_test.go
@@ -104,8 +104,8 @@ func TestMySQLdExporter(t *testing.T) {
 					MysqldExporter: &agents.ChangeAgentParamsBodyMysqldExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyMysqldExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyMysqldExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_node_exporter_test.go b/api-tests/inventory/agents_node_exporter_test.go
@@ -75,8 +75,8 @@ func TestNodeExporter(t *testing.T) {
 					NodeExporter: &agents.ChangeAgentParamsBodyNodeExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyNodeExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyNodeExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_postgres_exporter_test.go b/api-tests/inventory/agents_postgres_exporter_test.go
@@ -102,8 +102,8 @@ func TestPostgresExporter(t *testing.T) {
 					PostgresExporter: &agents.ChangeAgentParamsBodyPostgresExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyPostgresExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyPostgresExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_proxysql_exporter_test.go b/api-tests/inventory/agents_proxysql_exporter_test.go
@@ -102,8 +102,8 @@ func TestProxySQLExporter(t *testing.T) {
 					ProxysqlExporter: &agents.ChangeAgentParamsBodyProxysqlExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyProxysqlExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyProxysqlExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_rds_exporter_test.go b/api-tests/inventory/agents_rds_exporter_test.go
@@ -88,8 +88,8 @@ func TestRDSExporter(t *testing.T) {
 					RDSExporter: &agents.ChangeAgentParamsBodyRDSExporter{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyRDSExporterCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyRDSExporterCommonCustomLabels{},
 						},
 					},
 				},

diff --git a/api-tests/inventory/agents_test.go b/api-tests/inventory/agents_test.go
@@ -65,11 +65,10 @@ func TestAgents(t *testing.T) {
 
 		mySqldExporter := addAgent(t, agents.AddAgentBody{
 			MysqldExporter: &agents.AddAgentParamsBodyMysqldExporter{
-				ServiceID:  serviceID,
-				Username:   "username",
-				Password:   "password",
-				PMMAgentID: pmmAgentID,
-
+				ServiceID:           serviceID,
+				Username:            "username",
+				Password:            "password",
+				PMMAgentID:          pmmAgentID,
 				SkipConnectionCheck: true,
 			},
 		})
@@ -560,8 +559,8 @@ func TestQanAgentExporter(t *testing.T) {
 					QANMysqlPerfschemaAgent: &agents.ChangeAgentParamsBodyQANMysqlPerfschemaAgent{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANMysqlPerfschemaAgentCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyQANMysqlPerfschemaAgentCommonCustomLabels{},
 						},
 					},
 				},
@@ -823,8 +822,8 @@ func TestPGStatStatementsQanAgent(t *testing.T) {
 					QANPostgresqlPgstatementsAgent: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatementsAgent{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatementsAgentCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatementsAgentCommonCustomLabels{},
 						},
 					},
 				},
@@ -1086,8 +1085,8 @@ func TestPGStatMonitorQanAgent(t *testing.T) {
 					QANPostgresqlPgstatmonitorAgent: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatmonitorAgent{
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatmonitorAgentCommon{
-							Enable:             pointer.ToBool(false),
-							RemoveCustomLabels: true,
+							Enable:       pointer.ToBool(false),
+							CustomLabels: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatmonitorAgentCommonCustomLabels{},
 						},
 					},
 				},