PMM-12811 make custom_labels map optional

percona · Feb 1, 2024 · 050b741 · 050b741
1 parent 1555a22
commit 050b741
Show file tree

Hide file tree

Showing 22 changed files with 4,184 additions and 2,570 deletions.
diff --git a/api-tests/inventory/agents_azure_database_exporter_test.go b/api-tests/inventory/agents_azure_database_exporter_test.go
@@ -118,8 +118,10 @@ func TestAzureDatabaseExporter(t *testing.T) { //nolint:tparallel
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyAzureDatabaseExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "azure_database_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyAzureDatabaseExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "azure_database_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_external_exporter_test.go b/api-tests/inventory/agents_external_exporter_test.go
@@ -175,8 +175,10 @@ func TestExternalExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyExternalExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "external_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyExternalExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "external_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_mongodb_exporter_test.go b/api-tests/inventory/agents_mongodb_exporter_test.go
@@ -135,8 +135,10 @@ func TestMongoDBExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyMongodbExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "mongodb_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyMongodbExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "mongodb_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_mysqld_exporter_test.go b/api-tests/inventory/agents_mysqld_exporter_test.go
@@ -134,8 +134,10 @@ func TestMySQLdExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyMysqldExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "mysql_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyMysqldExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "mysql_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_node_exporter_test.go b/api-tests/inventory/agents_node_exporter_test.go
@@ -104,8 +104,10 @@ func TestNodeExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyNodeExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "node_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyNodeExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "node_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_postgres_exporter_test.go b/api-tests/inventory/agents_postgres_exporter_test.go
@@ -133,8 +133,10 @@ func TestPostgresExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyPostgresExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "postgres_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyPostgresExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "postgres_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_proxysql_exporter_test.go b/api-tests/inventory/agents_proxysql_exporter_test.go
@@ -133,8 +133,10 @@ func TestProxySQLExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyProxysqlExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "proxysql_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyProxysqlExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "proxysql_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_rds_exporter_test.go b/api-tests/inventory/agents_rds_exporter_test.go
@@ -119,8 +119,10 @@ func TestRDSExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyRDSExporterCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "rds_exporter",
+							CustomLabels: &agents.ChangeAgentParamsBodyRDSExporterCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "rds_exporter",
+								},
 							},
 						},
 					},

diff --git a/api-tests/inventory/agents_test.go b/api-tests/inventory/agents_test.go
@@ -590,8 +590,10 @@ func TestQanAgentExporter(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANMysqlPerfschemaAgentCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "QANMysqlPerfschemaAgent",
+							CustomLabels: &agents.ChangeAgentParamsBodyQANMysqlPerfschemaAgentCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "QANMysqlPerfschemaAgent",
+								},
 							},
 						},
 					},
@@ -851,8 +853,10 @@ func TestPGStatStatementsQanAgent(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatementsAgentCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "QANPostgreSQLPgStatementsAgent",
+							CustomLabels: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatementsAgentCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "QANPostgreSQLPgStatementsAgent",
+								},
 							},
 						},
 					},
@@ -1112,8 +1116,10 @@ func TestPGStatMonitorQanAgent(t *testing.T) {
 						AgentID: agentID,
 						Common: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatmonitorAgentCommon{
 							Enable: pointer.ToBool(true),
-							CustomLabels: map[string]string{
-								"new_label": "QANPostgreSQLPgStatMonitorAgent",
+							CustomLabels: &agents.ChangeAgentParamsBodyQANPostgresqlPgstatmonitorAgentCommonCustomLabels{
+								Values: map[string]string{
+									"new_label": "QANPostgreSQLPgStatMonitorAgent",
+								},
 							},
 						},
 					},

diff --git a/api/common/common.pb.go b/api/common/common.pb.go
diff --git a/api/common/common.pb.validate.go b/api/common/common.pb.validate.go