PMM-12375 revert changes, move to other PRs

percona · Sep 26, 2023 · b345c2e · b345c2e
1 parent aebc4d8
commit b345c2e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,11 +1,16 @@
 *                                       @percona/pmm-review-be
+/build/                                 @atymchuk @percona/pmm-review-be
+/admin/                                 @percona/pmm-review-be
 /agent/agents/postgres/                 @JiriCtvrtka @percona/pmm-review-be
 /agent/runner/                          @artemgavrilov @percona/pmm-review-be
 /api/                                   @BupycHuk @percona/pmm-review-be
+/docs/api/                              @atymchuk @percona/pmm-review-be
 /managed/services/checks/               @idoqo @percona/pmm-review-be
+/managed/                               @percona/pmm-review-be
 /managed/services/dbaas                 @gen1us2k @recharte @percona/pmm-review-be
 /managed/services/management/dbaas      @gen1us2k @recharte @percona/pmm-review-be
 /update/                                @BupycHuk @talhabinrizwan @percona/pmm-review-be
+/api-tests/                             @percona/pmm-review-be
 **/go.mod                               @percona/pmm-review-dependency @percona/pmm-review-be
 **/Dockerfile                           @percona/pmm-review-dependency @percona/pmm-review-be
 /cli-tests/package.json                 @percona/pmm-review-dependency @yurkovychv

diff --git a/.golangci.yml b/.golangci.yml
@@ -103,12 +103,8 @@ linters:
     - maligned         # deprecated
     - nlreturn         # too annoying
     - nosnakecase      # deprecated
-    - rowserrcheck     # disabled because of generics
     - scopelint        # too many false positives
-    - structcheck      # replaced by unused
-    - varcheck         # replaced by unused
     - varnamelen       # useless
-    - wastedassign     # disabled because of generics
     - wrapcheck        # we do not use wrapping everywhere
     - wsl              # too annoying
 

diff --git a/agent/runner/jobs/pbm_helpers.go b/agent/runner/jobs/pbm_helpers.go
@@ -279,7 +279,7 @@ func waitForPBMBackup(ctx context.Context, l logrus.FieldLogger, dbURL *string,
 				return nil
 			case "canceled":
 				return errors.New("backup was canceled")
-			case "error":
+			case "error": //nolint:goconst
 				return errors.New(info.Error)
 			}
 

diff --git a/managed/services/management/grpc/mysql_server.go b/managed/services/management/grpc/mysql_server.go
@@ -22,7 +22,7 @@ import (
 	"github.com/percona/pmm/managed/services/management"
 )
 
-// TODO merge into ../mysql.go.
+// TODO merge into ../mysql.go
 type mySQLServer struct {
 	svc *management.MySQLService
 

diff --git a/managed/services/telemetry/config.default.yml b/managed/services/telemetry/config.default.yml
@@ -936,14 +936,3 @@ telemetry:
     data:
       - metric_name: "postgresql_db_count"
         value: 1
-
-  - id: PMM
-    source: ENVVAR
-    # query: count by (service_id) (pg_stat_database_tup_fetched{service_name!="pmm-server-postgresql", datname!~"template.*|postgres", datid!="0"})
-    struct:
-      - PMM_TEST_AJKHKHK_HKHJKHJ
-      - 
-    summary: "Number of databases monitored per PostgreSQL server"
-    data:
-      - metric_name: "postgresql_db_count"
-        value: 1