Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-13082 Backwards compatibility with PMM v2 #3227

Merged
merged 16 commits into from
Nov 12, 2024
Merged

PMM-13082 Backwards compatibility with PMM v2 #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1c21ab6
PMM-13082 Backward-compatibility with PMM 2 Client.
BupycHuk Oct 3, 2024
a7fb0ed
PMM-13082 Strip prefixes, revert changes to collector.proto
ademidoff Oct 8, 2024
b9759d3
PMM-13082 remove unused proto imports
ademidoff Oct 8, 2024
0531d09
PMM-13082 renumber agent_status.proto fields
ademidoff Oct 8, 2024
72c6ad6
PMM-13082 fix the lint rules for pb/agent.proto pkg
ademidoff Oct 8, 2024
2874e22
PMM-13082 fix the proto field numbers for AGENT_TYPE
ademidoff Oct 8, 2024
60053bb
PMM-13082 fix the function comment
ademidoff Oct 8, 2024
52c3b06
Merge branch 'v3' into PMM-13082-backward-compatibility-with-pmm-2
ademidoff Oct 8, 2024
eed1615
PMM-13082 revert stripping the IDs
ademidoff Oct 9, 2024
9f82618
PMM-13082 revert the text fix
ademidoff Oct 9, 2024
0bf3408
PMM-13082 revert slowlog_test fix
ademidoff Oct 9, 2024
112d1f7
Merge branch 'v3' into PMM-13082-backward-compatibility-with-pmm-2
ademidoff Oct 9, 2024
4b3373a
PMM-13082 re-generate the code
ademidoff Oct 9, 2024
c82e6e9
PMM-13082 fix agent_type in slowlog_test payload
ademidoff Oct 9, 2024
7b2d5f8
PMM-13082 leave a TODO comment
ademidoff Oct 10, 2024
c3e58b5
Merge branch 'v3' into PMM-13082-backward-compatibility-with-pmm-2
ademidoff Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/agents/mongodb/internal/profiler/profiler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions agent/agents/mysql/slowlog/slowlog_expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
83 changes: 83 additions & 0 deletions api/agent/pb/agent.pb.go
View file
Open in desktop

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

36 changes: 36 additions & 0 deletions api/agent/pb/agent.pb.validate.go
View file
Open in desktop

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

13 changes: 13 additions & 0 deletions api/agent/pb/agent.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
syntax = "proto3";

package agent;
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
ademidoff marked this conversation as resolved.
Show resolved Hide resolved

import "agent/v1/agent.proto";

option go_package = "api/agentpb;agentpb";

// Agent service provides private methods for pmm-agent <-> pmm-managed interactions.
service Agent {
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
// Connect establishes two-way communication channel between pmm-agent and pmm-managed.
rpc Connect(stream agent.v1.AgentMessage) returns (stream agent.v1.ServerMessage);
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
ademidoff marked this conversation as resolved.
Show resolved Hide resolved
}
124 changes: 124 additions & 0 deletions api/agent/pb/agent_grpc.pb.go
View file
Open in desktop

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

Loading
Loading