Skip to content

PMM-15039 Disable telemetry except for GA and RC builds #5435

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

Open
4nte wants to merge 12 commits into
base: v3
Choose a base branch
from
+16 −9
Open

PMM-15039 Disable telemetry except for GA and RC builds #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
988725a
PMM-15039 disable telemetry by default
4nte May 27, 2026
e1f72b5
PMM-15039 Drop redundant telemetry flag
4nte May 27, 2026
ab3a0ba
PMM-15039 Add build arg `PMM_ENABLE_TELEMETRY`
4nte May 28, 2026
348c38c
PMM-15039 Add missing trailing backslash
4nte May 28, 2026
aad4d76
PMM-15039 Remove redundant telemetry version gate
4nte May 28, 2026
6ca6c99
PMM-15039 Remove test
4nte May 28, 2026
bdb7301
PMM-15039 Enable telemetry in TestRunTelemetryService
4nte May 28, 2026
4c6eae6
Merge branch 'v3' into PMM-15039-disable-telemetry-except-for-ga-rc-b…
4nte May 28, 2026
223b73f
Revert "PMM-15039 Remove redundant telemetry version gate"
4nte Jun 1, 2026
cc2741e
Revert "PMM-15039 Remove test"
4nte Jun 1, 2026
8ece1ad
PMM-15039 Enable telemetry in test
4nte Jun 1, 2026
b5f892a
Merge branch 'v3' into PMM-15039-disable-telemetry-except-for-ga-rc-b…
4nte Jun 1, 2026
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
4 changes: 2 additions & 2 deletions api-tests/server/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func RestoreSettingsDefaults(t *testing.T) {
res, err := serverClient.Default.ServerService.ChangeSettings(&server.ChangeSettingsParams{
Body: server.ChangeSettingsBody{
EnableAdvisor: new(true),
EnableTelemetry: new(true),
EnableTelemetry: new(false),
EnableAlerting: new(true),
EnableUpdates: new(true),
MetricsResolutions: &server.ChangeSettingsParamsBodyMetricsResolutions{
Expand All @@ -58,7 +58,7 @@ func RestoreSettingsDefaults(t *testing.T) {
Context: pmmapitests.Context,
})
require.NoError(t, err)
assert.True(t, res.Payload.Settings.TelemetryEnabled)
assert.False(t, res.Payload.Settings.TelemetryEnabled)
assert.True(t, res.Payload.Settings.AdvisorEnabled)
expectedResolutions := &server.ChangeSettingsOKBodySettingsMetricsResolutions{
Hr: "5s",
Expand Down
8 changes: 4 additions & 4 deletions api-tests/server/settings/settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestSettings(t *testing.T) {
t.Run("GetSettings", func(t *testing.T) {
res, err := serverClient.Default.ServerService.GetSettings(nil)
require.NoError(t, err)
assert.True(t, res.Payload.Settings.TelemetryEnabled)
assert.False(t, res.Payload.Settings.TelemetryEnabled)
assert.True(t, res.Payload.Settings.AdvisorEnabled)
expected := &server.GetSettingsOKBodySettingsMetricsResolutions{
Hr: "5s",
Expand Down Expand Up @@ -224,7 +224,7 @@ func TestSettings(t *testing.T) {

resg, err := serverClient.Default.ServerService.GetSettings(nil)
require.NoError(t, err)
assert.True(t, resg.Payload.Settings.TelemetryEnabled)
assert.False(t, resg.Payload.Settings.TelemetryEnabled)
assert.False(t, resg.Payload.Settings.AdvisorEnabled)
})

Expand All @@ -243,7 +243,7 @@ func TestSettings(t *testing.T) {

resg, err := serverClient.Default.ServerService.GetSettings(nil)
require.NoError(t, err)
assert.True(t, resg.Payload.Settings.TelemetryEnabled)
assert.False(t, resg.Payload.Settings.TelemetryEnabled)
assert.True(t, resg.Payload.Settings.AdvisorEnabled)

t.Run("EnableAdvisorsWhileItIsEnabled", func(t *testing.T) {
Expand All @@ -258,7 +258,7 @@ func TestSettings(t *testing.T) {

resg, err := serverClient.Default.ServerService.GetSettings(nil)
require.NoError(t, err)
assert.True(t, resg.Payload.Settings.TelemetryEnabled)
assert.False(t, resg.Payload.Settings.TelemetryEnabled)
assert.True(t, resg.Payload.Settings.AdvisorEnabled)
})

Expand Down
2 changes: 2 additions & 0 deletions build/docker/server/Dockerfile.el9
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ FROM oraclelinux:9-slim

ARG VERSION
ARG BUILD_DATE
ARG PMM_ENABLE_TELEMETRY=0

ENV LANG=en_US.utf8
ENV GF_PLUGIN_DIR=/srv/grafana/plugins
ENV PERCONA_TELEMETRY_DISABLE=1
ENV PMM_ENABLE_TELEMETRY=${PMM_ENABLE_TELEMETRY}
Comment thread
4nte marked this conversation as resolved.
ENV PS1="[\u@\h \W] # "

WORKDIR /opt
Expand Down
1 change: 1 addition & 0 deletions build/scripts/build-server-docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ GO_VERSION=$(grep '^go ' ${root_dir}/tmp/source/pmm/go.mod | awk '{print $2}')
docker build --build-arg BUILD_DATE="`date --rfc-3339=seconds`" \
--build-arg VERSION="$IMAGE_VERSION" \
--build-arg GO_VERSION="$GO_VERSION" \
--build-arg PMM_ENABLE_TELEMETRY="${PMM_ENABLE_TELEMETRY:-0}" \
-f ${docker_root}/${docker_file} \
-t ${DOCKER_TAG} \
${docker_root}/
Expand Down
1 change: 0 additions & 1 deletion dev/api/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ pmm-api() {
-e AWS_ACCESS_KEY \
-e AWS_SECRET_KEY \
-e PMM_ENABLE_ACCESS_CONTROL=1 \
-e PMM_ENABLE_TELEMETRY=0 \
-v pmm-data:/srv \
"${PMM_SERVER_IMAGE:-perconalab/pmm-server:3-dev-latest}"

Expand Down
2 changes: 1 addition & 1 deletion managed/models/settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
const (
AdvisorsEnabledDefault = true
AlertingEnabledDefault = true
TelemetryEnabledDefault = true
TelemetryEnabledDefault = false
Comment thread
ademidoff marked this conversation as resolved.
UpdatesEnabledDefault = true
BackupManagementEnabledDefault = true
VictoriaMetricsCacheEnabledDefault = false
Expand Down
7 changes: 6 additions & 1 deletion managed/services/telemetry/telemetry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ func TestRunTelemetryService(t *testing.T) {
})
db := reform.NewDB(sqlDB, postgresql.Dialect, nil)

_, err := models.UpdateSettings(db, &models.ChangeSettingsParams{
EnableTelemetry: new(true),
})
require.NoError(t, err)

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
Expand Down Expand Up @@ -194,7 +199,7 @@ func TestRunSkipsNonReleaseVersion(t *testing.T) {
logEntry := logrus.NewEntry(logger)

// Settings JSON with a pre-existing UUID so makeMetric won't attempt an UPDATE.
settingsJSON := []byte(`{"telemetry":{"uuid":"00000000-0000-0000-0000-000000000001"}}`)
settingsJSON := []byte(`{"telemetry":{"enabled":true,"uuid":"00000000-0000-0000-0000-000000000001"}}`)

tests := []struct {
version string
Expand Down
Loading