Merge branch 'main' into PMM-11341-autodiscovery-control

percona · Nov 16, 2023 · c045ca7 · c045ca7
2 parents efc4350 + 21d018b
commit c045ca7
Show file tree

Hide file tree

Showing 84 changed files with 390 additions and 558 deletions.
diff --git a/api/agentlocalpb/agentlocal.pb.go b/api/agentlocalpb/agentlocal.pb.go
diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go
diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go
diff --git a/api/buf.lock b/api/buf.lock
@@ -4,12 +4,15 @@ deps:
   - remote: buf.build
     owner: envoyproxy
     repository: protoc-gen-validate
-    commit: 6607b10f00ed4a3d98f906807131c44a
+    commit: eac44469a7af47e7839a7f1f3d7ac004
+    digest: shake256:0feabcde01b6b11e3c75a5e3f807968d5995626546f39c37e5d4205892b3a59cced0ed83b35a2eb9e6dddd3309660ad46b737c9dcd224b425de0a6654ce04417
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 75b4300737fb4efca0831636be94e517
+    commit: 28151c0d0a1641bf938a7672c500e01d
+    digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
-    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
+    commit: 3f42134f4c564983838425bc43c7a65f
+    digest: shake256:3d11d4c0fe5e05fda0131afefbce233940e27f0c31c5d4e385686aea58ccd30f72053f61af432fa83f1fc11cda57f5f18ca3da26a29064f73c5a0d076bba8d92
diff --git a/api/inventorypb/agent_status.pb.go b/api/inventorypb/agent_status.pb.go
diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go
diff --git a/api/inventorypb/log_level.pb.go b/api/inventorypb/log_level.pb.go
diff --git a/api/inventorypb/nodes.pb.go b/api/inventorypb/nodes.pb.go
diff --git a/api/inventorypb/services.pb.go b/api/inventorypb/services.pb.go
diff --git a/api/managementpb/actions.pb.go b/api/managementpb/actions.pb.go
diff --git a/api/managementpb/agent/agent.pb.go b/api/managementpb/agent/agent.pb.go
diff --git a/api/managementpb/agent/agent.pb.validate.go b/api/managementpb/agent/agent.pb.validate.go
diff --git a/api/managementpb/agent/agent.proto b/api/managementpb/agent/agent.proto
@@ -11,10 +11,8 @@ option go_package = "api/managementpb/agent;agentv1beta1";
 
 message UniversalAgent {
   message MySQLOptions {
-    // TLS CA certificate.
-    string tls_ca = 1;
-    // TLS certificate.
-    string tls_cert = 2;
+    reserved 1; // tls_ca
+    reserved 2; // tls_cert
     // True if TLS key is set.
     bool is_tls_key_set = 3;
   }
@@ -37,8 +35,7 @@ message UniversalAgent {
     bool is_tls_certificate_key_set = 1;
     // True if TLS certificate file password is set.
     bool is_tls_certificate_key_file_password_set = 2;
-    // TLS CA certificate.
-    string tls_ca = 3;
+    reserved 3; // tls_ca
     // MongoDB auth mechanism.
     string authentication_mechanism = 4;
     // MongoDB auth database.
@@ -52,10 +49,8 @@ message UniversalAgent {
   }
 
   message PostgreSQLOptions {
-    // TLS CA certificate.
-    string ssl_ca = 1;
-    // TLS certificate.
-    string ssl_cert = 2;
+    reserved 1; // ssl_ca
+    reserved 2; // ssl_cert
     // True if TLS key is set.
     bool is_ssl_key_set = 3;
     // Limit of databases for auto-discovery.

diff --git a/api/managementpb/agent/json/agent.json b/api/managementpb/agent/json/agent.json
@@ -196,23 +196,23 @@
                           "authentication_database": {
                             "description": "MongoDB auth database.",
                             "type": "string",
-                            "x-order": 4
+                            "x-order": 3
                           },
                           "authentication_mechanism": {
                             "description": "MongoDB auth mechanism.",
                             "type": "string",
-                            "x-order": 3
+                            "x-order": 2
                           },
                           "collections_limit": {
                             "description": "MongoDB collections limit.",
                             "type": "integer",
                             "format": "int32",
-                            "x-order": 6
+                            "x-order": 5
                           },
                           "enable_all_collectors": {
                             "description": "True if all collectors are enabled.",
                             "type": "boolean",
-                            "x-order": 7
+                            "x-order": 6
                           },
                           "is_tls_certificate_key_file_password_set": {
                             "description": "True if TLS certificate file password is set.",
@@ -230,12 +230,7 @@
                             "items": {
                               "type": "string"
                             },
-                            "x-order": 5
-                          },
-                          "tls_ca": {
-                            "description": "TLS CA certificate.",
-                            "type": "string",
-                            "x-order": 2
+                            "x-order": 4
                           }
                         },
                         "x-order": 16
@@ -246,17 +241,7 @@
                           "is_tls_key_set": {
                             "description": "True if TLS key is set.",
                             "type": "boolean",
-                            "x-order": 2
-                          },
-                          "tls_ca": {
-                            "description": "TLS CA certificate.",
-                            "type": "string",
                             "x-order": 0
-                          },
-                          "tls_cert": {
-                            "description": "TLS certificate.",
-                            "type": "string",
-                            "x-order": 1
                           }
                         },
                         "x-order": 17
@@ -278,22 +263,12 @@
                             "description": "Limit of databases for auto-discovery.",
                             "type": "integer",
                             "format": "int32",
-                            "x-order": 3
+                            "x-order": 1
                           },
                           "is_ssl_key_set": {
                             "description": "True if TLS key is set.",
                             "type": "boolean",
-                            "x-order": 2
-                          },
-                          "ssl_ca": {
-                            "description": "TLS CA certificate.",
-                            "type": "string",
                             "x-order": 0
-                          },
-                          "ssl_cert": {
-                            "description": "TLS certificate.",
-                            "type": "string",
-                            "x-order": 1
                           }
                         },
                         "x-order": 21

diff --git a/api/managementpb/agent/json/client/agent/list_agents_responses.go b/api/managementpb/agent/json/client/agent/list_agents_responses.go
diff --git a/api/managementpb/alerting/alerting.pb.go b/api/managementpb/alerting/alerting.pb.go
diff --git a/api/managementpb/alerting/params.pb.go b/api/managementpb/alerting/params.pb.go
diff --git a/api/managementpb/annotation.pb.go b/api/managementpb/annotation.pb.go
diff --git a/api/managementpb/azure/azure.pb.go b/api/managementpb/azure/azure.pb.go
diff --git a/api/managementpb/backup/artifacts.pb.go b/api/managementpb/backup/artifacts.pb.go
diff --git a/api/managementpb/backup/backups.pb.go b/api/managementpb/backup/backups.pb.go
diff --git a/api/managementpb/backup/common.pb.go b/api/managementpb/backup/common.pb.go
diff --git a/api/managementpb/backup/errors.pb.go b/api/managementpb/backup/errors.pb.go
diff --git a/api/managementpb/backup/locations.pb.go b/api/managementpb/backup/locations.pb.go
diff --git a/api/managementpb/backup/restores.pb.go b/api/managementpb/backup/restores.pb.go
diff --git a/api/managementpb/boolean_flag.pb.go b/api/managementpb/boolean_flag.pb.go
diff --git a/api/managementpb/checks.pb.go b/api/managementpb/checks.pb.go
diff --git a/api/managementpb/dbaas/components.pb.go b/api/managementpb/dbaas/components.pb.go
diff --git a/api/managementpb/dbaas/db_clusters.pb.go b/api/managementpb/dbaas/db_clusters.pb.go
diff --git a/api/managementpb/dbaas/dbaas.pb.go b/api/managementpb/dbaas/dbaas.pb.go