From fea3dbd3c3420c2690aa300760560cda192902fb Mon Sep 17 00:00:00 2001
From: Alex Demidoff <a@demidoff.me>
Date: Sat, 4 Apr 2026 11:21:39 +0300
Subject: [PATCH 1/2] PMM-14825 Fix tests related to disabling telemetry in FB

---
 managed/services/telemetry/telemetry.go      | 10 +++++++++-
 managed/services/telemetry/telemetry_test.go |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/managed/services/telemetry/telemetry.go b/managed/services/telemetry/telemetry.go
index a9fd816e749..92b42d4994b 100644
--- a/managed/services/telemetry/telemetry.go
+++ b/managed/services/telemetry/telemetry.go
@@ -18,6 +18,7 @@ package telemetry
 
 import (
 	"context"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -103,13 +104,20 @@ func (s *Service) LocateTelemetryDataSource(name string) (DataSource, error) {
 	return s.dsRegistry.LocateTelemetryDataSource(name)
 }
 
-// Run start sending telemetry to SaaS.
+// releaseVersionRe matches only clean release versions like "3.7.0" or "3.7".
+var releaseVersionRe = regexp.MustCompile(`^\d+\.\d+(\.\d+)?$`)
+
+// Run sends telemetry.
 func (s *Service) Run(ctx context.Context) {
 	if !s.config.Enabled {
 		s.l.Warn("service is disabled, skip Run")
 		return
 	}
 
+	if !releaseVersionRe.MatchString(s.pmmVersion) {
+		return
+	}
+
 	ticker := time.NewTicker(s.config.Reporting.Interval)
 	defer ticker.Stop()
 
diff --git a/managed/services/telemetry/telemetry_test.go b/managed/services/telemetry/telemetry_test.go
index 805ed659f75..1a3e63914a7 100644
--- a/managed/services/telemetry/telemetry_test.go
+++ b/managed/services/telemetry/telemetry_test.go
@@ -172,7 +172,7 @@ func TestRunTelemetryService(t *testing.T) {
 				start:               tt.fields.start,
 				config:              tt.fields.config,
 				dsRegistry:          registry,
-				pmmVersion:          "",
+				pmmVersion:          tt.fields.pmmVersion,
 				os:                  tt.fields.os,
 				sDistributionMethod: 0,
 				tDistributionMethod: 0,

From 071f94e785c4b7b65ff13e08cde289f3974143d2 Mon Sep 17 00:00:00 2001
From: Alex Demidoff <a@demidoff.me>
Date: Sat, 4 Apr 2026 15:18:20 +0300
Subject: [PATCH 2/2] PMM-14825 Fix API agent test

---
 api-tests/inventory/agents_test.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/api-tests/inventory/agents_test.go b/api-tests/inventory/agents_test.go
index a6cb61f9253..95b113b79be 100644
--- a/api-tests/inventory/agents_test.go
+++ b/api-tests/inventory/agents_test.go
@@ -92,13 +92,14 @@ func TestAgents(t *testing.T) {
 		require.NotEmpty(t, resByAgent.Payload.MysqldExporter, "There should be at least one service")
 		assertMySQLExporterExists(t, resByAgent, mySqldExporterID)
 
-		resByNode, err := client.Default.AgentsService.ListAgents(&agents.ListAgentsParams{
-			NodeID:  pointer.ToString(nodeID),
+		resAgent, err := client.Default.AgentsService.GetAgent(&agents.GetAgentParams{
+			AgentID: pmmAgentID,
 			Context: pmmapitests.Context,
 		})
 		require.NoError(t, err)
-		require.NotNil(t, resByNode)
-		assertPMMAgentExists(t, resByNode, pmmAgentID)
+		require.NotNil(t, resAgent)
+		require.NotNil(t, resAgent.Payload.PMMAgent)
+		assert.Equal(t, pmmAgentID, resAgent.Payload.PMMAgent.AgentID)
 	})
 
 	t.Run("FilterList", func(t *testing.T) {