Merge branch 'v3' into PMM-13534-consistent-env-vars

percona · Nov 14, 2024 · c68b02e · c68b02e
2 parents b9a7062 + 9369be0
commit c68b02e
Show file tree

Hide file tree

Showing 21 changed files with 1,135 additions and 794 deletions.
diff --git a/agent/agents/mongodb/internal/profiler/profiler_test.go b/agent/agents/mongodb/internal/profiler/profiler_test.go
@@ -185,7 +185,7 @@ func testProfiler(t *testing.T, url string) {
 		assert.Equal(t, "INSERT people", bucket.Common.Fingerprint)
 		assert.Equal(t, []string{"people"}, bucket.Common.Tables)
 		assert.Equal(t, "test-id", bucket.Common.AgentId)
-		assert.Equal(t, inventoryv1.AgentType(10), bucket.Common.AgentType)
+		assert.Equal(t, inventoryv1.AgentType(9), bucket.Common.AgentType)
 		expected := &agentv1.MetricsBucket_MongoDB{
 			MDocsReturnedCnt:   docsCount,
 			MResponseLengthCnt: docsCount,

diff --git a/agent/agents/mysql/slowlog/slowlog_expected.json b/agent/agents/mysql/slowlog/slowlog_expected.json
@@ -7,7 +7,7 @@
 			"fingerprint": "select name, subsystem, type, comment, count from information_schema.innodb_metrics where status = ?",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "SELECT\n\t\t  name, subsystem, type, comment,\n\t\t  count\n\t\t  FROM information_schema.innodb_metrics\n\t\t  WHERE status = 'enabled'",
@@ -52,7 +52,7 @@
 			"schema": "sbtest",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "SELECT pad FROM sbtest1 WHERE id=775815",
@@ -95,7 +95,7 @@
 			"fingerprint": "ping",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "Ping",
@@ -126,7 +126,7 @@
 			"fingerprint": "show global status",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "SHOW GLOBAL STATUS",
@@ -170,7 +170,7 @@
 			"fingerprint": "set lock_wait_timeout=?",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "SET lock_wait_timeout=2",
@@ -201,7 +201,7 @@
 			"fingerprint": "select @@version",
 			"username": "root",
 			"agent_id": "73ee2f92-d5aa-45f0-8b09-6d3df605fd44",
-			"agent_type": 9,
+			"agent_type": 8,
 			"period_start_unix_secs": 1557137220,
 			"period_length_secs": 60,
 			"example": "SELECT @@version",

diff --git a/api/agent/pb/agent.pb.go b/api/agent/pb/agent.pb.go
diff --git a/api/agent/pb/agent.pb.validate.go b/api/agent/pb/agent.pb.validate.go
diff --git a/api/agent/pb/agent.proto b/api/agent/pb/agent.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package agent;
+
+import "agent/v1/agent.proto";
+
+option go_package = "api/agentpb;agentpb";
+
+// Agent service provides private methods for pmm-agent <-> pmm-managed interactions.
+service Agent {
+  // Connect establishes two-way communication channel between pmm-agent and pmm-managed.
+  rpc Connect(stream agent.v1.AgentMessage) returns (stream agent.v1.ServerMessage);
+}
diff --git a/api/agent/pb/agent_grpc.pb.go b/api/agent/pb/agent_grpc.pb.go