Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 2 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ linters:
desc: use "github.com/golang/protobuf/proto" instead
- pkg: github.com/percona/go-mysql/log/slow
desc: only use the forked parser
- pkg: github.com/percona-platform/platform
desc: use "github.com/percona/saas" instead
- pkg: github.com/percona/platform
desc: use "github.com/percona/saas" instead
- pkg: github.com/percona/saas
desc: use "github.com/percona/platform" instead
- pkg: gopkg.in/yaml.v2
desc: use "gopkg.in/yaml.v3" instead
exhaustive:
Expand All @@ -61,7 +59,6 @@ linters:
- error
- empty
- stdlib
- github.com/charmbracelet/bubbletea.Model
- github.com/percona/pmm/admin/commands.Result
- github.com/percona/pmm/agent/runner/actions.Action
- github.com/percona/pmm/managed/services/telemetry.DataSource
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ require (
github.com/percona/exporter_shared v0.7.5
github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74
github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd
github.com/percona/platform v0.0.0-20260407153518-6e332c057963
github.com/percona/promconfig v0.3.0
github.com/percona/saas v0.0.0-20260107224938-470337be1058
github.com/pganalyze/pg_query_go/v6 v6.2.2
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.13.6
Expand Down
12 changes: 8 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,9 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk=
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=
github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
github.com/dhui/dktest v0.4.6 h1:+DPKyScKSEp3VLtbMDHcUq6V5Lm5zfZZVb0Sk7Ahom4=
Expand Down Expand Up @@ -247,8 +248,11 @@ github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63Y
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
github.com/golang-migrate/migrate/v4 v4.19.1 h1:OCyb44lFuQfYXYLx1SCxPZQGU7mcaZ7gH9yH4jSFbBA=
github.com/golang-migrate/migrate/v4 v4.19.1/go.mod h1:CTcgfjxhaUtsLipnLoQRWCrjYXycRz/g5+RWDuYgPrE=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
Expand Down Expand Up @@ -463,10 +467,10 @@ github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74 h1:uULelXfIrpmKtI
github.com/percona/go-mysql v0.0.0-20251202083530-b3e1c16efc74/go.mod h1:8n6mF3Igr3YYdh19ZUvyVyEH+hQr9LVSjG9hrlp0YTU=
github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd h1:V5I+drJ8ZsCTBRlZZCS0BHPPTG+ZVuQHQtLCs+TA0J8=
github.com/percona/percona-toolkit v0.0.0-20251217124347-6b3e5ed485dd/go.mod h1:r44H7VKB5Fvw5lZNw0v7IF7plpHMSpjg8f59QO0J9jg=
github.com/percona/platform v0.0.0-20260407153518-6e332c057963 h1:nD0+u6WHJktheHZlFRDb+jSBgq3DyodGsM/lV35q9MA=
github.com/percona/platform v0.0.0-20260407153518-6e332c057963/go.mod h1:avKEf3Ydt/2td7IIcvbrosOq0jzCaHryjUyxh4+u8xM=
github.com/percona/promconfig v0.3.0 h1:uGNaHD9Hc+MbUyk24F4GsjEUZdvj/wpGGvvw0U7uDLM=
github.com/percona/promconfig v0.3.0/go.mod h1:GQ3NeieiBFy0dCDtNTl/xR9L6spdzU1zfspT/HWNeMw=
github.com/percona/saas v0.0.0-20260107224938-470337be1058 h1:xoBIL9ylRJCrbZAH/MRotJFZMZg41m1MAp5qgr5VTo8=
github.com/percona/saas v0.0.0-20260107224938-470337be1058/go.mod h1:hiLKQAtFZ0b7vGQxb4rPk8hM1DN1X1oZRen3vccayYc=
github.com/pganalyze/pg_query_go/v6 v6.2.2 h1:O0L6zMC226R82RF3X5n0Ki6HjytDsoAzuzp4ATVAHNo=
github.com/pganalyze/pg_query_go/v6 v6.2.2/go.mod h1:Cn6+j4870kJz3iYNsb0VsNG04vpSWgEvBwc590J4qD0=
github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0=
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/datasource_envvars.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"os"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/datasource_envvars_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"testing"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"database/sql"
"net/url"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/datasource_pmmdb_select.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"database/sql"
"net/url"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/datasource_qandb_select.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"database/sql"
"net/url"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/prometheus/client_golang/api"
v1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/prometheus/common/model"
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/datasources.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/AlekSi/pointer"
telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions managed/services/telemetry/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package telemetry
import (
"context"

pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"

serverv1 "github.com/percona/pmm/api/server/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package telemetry
import (
"context"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
)

// Extension provides dynamic extension point for Telemetry.
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/mock_data_source_test.go

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

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

2 changes: 1 addition & 1 deletion managed/services/telemetry/mock_sender_test.go

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

4 changes: 2 additions & 2 deletions managed/services/telemetry/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"github.com/google/uuid"
pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"google.golang.org/protobuf/proto"
Expand Down
4 changes: 2 additions & 2 deletions managed/services/telemetry/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

_ "github.com/ClickHouse/clickhouse-go/v2"
sqlmock "github.com/DATA-DOG/go-sqlmock"
pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/transform.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package telemetry
import (
"encoding/json"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/transform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package telemetry
import (
"testing"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion managed/services/telemetry/uievents/uievents.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"time"

"github.com/HdrHistogram/hdrhistogram-go"
telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/sirupsen/logrus"

uieventsv1 "github.com/percona/pmm/api/uievents/v1"
Expand Down
2 changes: 1 addition & 1 deletion managed/utils/distribution/distribution_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"regexp"

pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm"
pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm"
"github.com/sirupsen/logrus"

serverv1 "github.com/percona/pmm/api/server/v1"
Expand Down
2 changes: 1 addition & 1 deletion managed/utils/distribution/distribution_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"
"testing"

pmmv1 "github.com/percona/saas/gen/telemetry/events/pmm"
pmmv1 "github.com/percona/platform/gen/telemetry/events/pmm"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion managed/utils/platform/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"io"
"net/http"

telemetryv1 "github.com/percona/saas/gen/telemetry/generic"
telemetryv1 "github.com/percona/platform/gen/telemetry/generic"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
Expand Down
Loading