Skip to content

Commit

Permalink
PMM-7570 Custom password for /metrics. (#767)
Browse files Browse the repository at this point in the history
* PMM-7570 Change API.

* PMM-7570 Gen.

* PMM-7570 Remove RDS.

* PMM-7570 Gen.

* PMM-75070 Change comment.

* PMM-7570 Gen.

* PMM-7570 Add field to exporters to expose agent password in inventory.

* Revert "PMM-7570 Add field to exporters to expose agent password in inventory."

This reverts commit 3bbc61a.
  • Loading branch information
JiriCtvrtka authored Jul 29, 2021
1 parent c6dbbdd commit 685e1d7
Show file tree
Hide file tree
Showing 25 changed files with 1,429 additions and 1,146 deletions.
1,932 changes: 989 additions & 943 deletions api/inventorypb/agents.pb.go

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions api/inventorypb/agents.proto
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,8 @@ message AddMySQLdExporterRequest {
bool push_metrics = 10;
// List of collector names to disable in this exporter.
repeated string disable_collectors = 11;
// Custom password for exporter endpoint /metrics.
string agent_password = 15;
}

message AddMySQLdExporterResponse {
Expand Down Expand Up @@ -708,6 +710,8 @@ message AddMongoDBExporterRequest {
string authentication_mechanism = 14;
// Authentication database.
string authentication_database = 15;
// Custom password for exporter endpoint /metrics.
string agent_password = 16;
}

message AddMongoDBExporterResponse {
Expand Down Expand Up @@ -768,6 +772,8 @@ message AddPostgresExporterRequest {
string tls_cert = 12;
// TLS Certificate Key.
string tls_key = 13;
// Custom password for exporter endpoint /metrics.
string agent_password = 14;
}

message AddPostgresExporterResponse {
Expand Down Expand Up @@ -822,6 +828,8 @@ message AddProxySQLExporterRequest {
bool push_metrics = 9;
// List of collector names to disable in this exporter.
repeated string disable_collectors = 10;
// Custom password for exporter endpoint /metrics.
string agent_password = 11;
}

message AddProxySQLExporterResponse {
Expand Down

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

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

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

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

20 changes: 20 additions & 0 deletions api/inventorypb/json/inventorypb.json
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,11 @@
"schema": {
"type": "object",
"properties": {
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 15
},
"authentication_database": {
"description": "Authentication database.",
"type": "string",
Expand Down Expand Up @@ -644,6 +649,11 @@
"schema": {
"type": "object",
"properties": {
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 14
},
"custom_labels": {
"description": "Custom user-assigned labels.",
"type": "object",
Expand Down Expand Up @@ -1180,6 +1190,11 @@
"schema": {
"type": "object",
"properties": {
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 13
},
"custom_labels": {
"description": "Custom user-assigned labels.",
"type": "object",
Expand Down Expand Up @@ -1405,6 +1420,11 @@
"schema": {
"type": "object",
"properties": {
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 10
},
"custom_labels": {
"description": "Custom user-assigned labels.",
"type": "object",
Expand Down

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

3 changes: 3 additions & 0 deletions api/managementpb/json/client/my_sql/add_my_sql_responses.go

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

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

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

3 changes: 3 additions & 0 deletions api/managementpb/json/client/rds/add_rds_responses.go

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

25 changes: 25 additions & 0 deletions api/managementpb/json/managementpb.json
Original file line number Diff line number Diff line change
Expand Up @@ -2362,6 +2362,11 @@
"type": "string",
"x-order": 4
},
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 25
},
"authentication_database": {
"description": "Authentication database.",
"type": "string",
Expand Down Expand Up @@ -2847,6 +2852,11 @@
"type": "string",
"x-order": 4
},
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 27
},
"cluster": {
"description": "Cluster name.",
"type": "string",
Expand Down Expand Up @@ -3796,6 +3806,11 @@
"type": "string",
"x-order": 4
},
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 25
},
"cluster": {
"description": "Cluster name.",
"type": "string",
Expand Down Expand Up @@ -4351,6 +4366,11 @@
"type": "string",
"x-order": 4
},
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 19
},
"cluster": {
"description": "Cluster name.",
"type": "string",
Expand Down Expand Up @@ -4672,6 +4692,11 @@
"type": "string",
"x-order": 4
},
"agent_password": {
"description": "Custom password for exporter endpoint /metrics.",
"type": "string",
"x-order": 28
},
"aws_access_key": {
"description": "AWS Access key.",
"type": "string",
Expand Down
74 changes: 43 additions & 31 deletions api/managementpb/mongodb.pb.go

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

2 changes: 2 additions & 0 deletions api/managementpb/mongodb.proto
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ message AddMongoDBRequest {
string authentication_mechanism = 25;
// Authentication database.
string authentication_database = 26;
// Custom password for exporter endpoint /metrics.
string agent_password = 27;
}

message AddMongoDBResponse {
Expand Down
Loading

0 comments on commit 685e1d7

Please sign in to comment.