V3 - DO NOT MERGE

.devcontainer/Dockerfile

@@ -0,0 +1,21 @@
+ARG PMM_SERVER_IMAGE="perconalab/pmm-server:3-dev-latest"
+FROM $PMM_SERVER_IMAGE
+
+ARG PMM_SERVER_IMAGE
+ARG GO_VERSION="1.23.x"
+
+USER root
+
+RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE"
+ENV GOPATH=/root/go
+ENV PATH="$PATH:$GOPATH/bin"
+
+RUN mkdir -p $GOPATH/src/github.com/percona/pmm
+WORKDIR $GOPATH/src/github.com/percona/pmm
+
+COPY ./ ./
+# setup.py uses a task from Makefile.devcontainer but expects it to be in the default Makefile
+COPY ./Makefile.devcontainer ./Makefile
+
+RUN python ./.devcontainer/setup.py
+RUN mv -f $GOPATH/src/github.com/percona/pmm/bin/* $GOPATH/bin/

.devcontainer/setup.py

@@ -26,7 +26,7 @@ def install_packages():
     run_commands([
         "dnf install -y gcc git make pkgconfig \
             vim \
-            mc tmux psmisc lsof which iproute \
+            mc tmux psmisc lsof which iproute diffutils \
             bash-completion \
             man man-pages \
             openssl-devel \
@@ -47,16 +47,7 @@ def install_go():
 
     go_version = str(subprocess.check_output("gimme -r " + GO_VERSION, shell=True).strip().decode())
 
-    if GO_VERSION == "tip":
-        run_commands([
-            "mkdir $HOME/git_source",
-            "wget https://github.com/git/git/archive/refs/tags/v2.34.4.tar.gz -O $HOME/git.tar.gz",
-            "tar -xzf $HOME/git.tar.gz -C $HOME/git_source --strip-components 1",
-            "cd $HOME/git_source && make configure && ./configure --prefix=/usr && make all && make install",
-        ])
-        gimme_go_dir = "go"
-    else:
-        gimme_go_dir = "go{go_version}.linux.amd64".format(go_version=go_version)
+    gimme_go_dir = "go{go_version}.linux.amd64".format(go_version=go_version)
 
     run_commands([
         "gimme " + go_version,

.github/CONTRIBUTING.md

@@ -60,7 +60,7 @@ This project relies on the following dependencies:
 
 ## Run PMM-Server in Docker
 
-1. Run `docker run -d -p 80:80 -p 443:443  --name pmm-server public.ecr.aws/e7j3v3n0/pmm-server:dev-latest`.
+1. Run `docker run -d -p 80:8080 -p 443:8443  --name pmm-server public.ecr.aws/e7j3v3n0/pmm-server:3-dev-latest`.
 2. Open http://localhost/.
 
 Please note, the use of port 80 is discouraged and should be avoided. For optimal security, use port 443 along with a valid SSL certificate.

.github/workflows/admin.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - v3
       - pmm-*
     tags:
       - v[0-9]+.[0-9]+.[0-9]+*
@@ -20,6 +21,7 @@ on:
       - "qan-api2/**"
       - "update/**"
       - "vmproxy/**"
+      - "ui/**"
 
 permissions:
   contents: read
@@ -28,8 +30,6 @@ jobs:
   test:
     name: Tests
     runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
 
     defaults:
       run:
@@ -71,7 +71,7 @@ jobs:
         run: make test-cover
 
       - name: Upload coverage results
-        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           file: cover.out
           flags: admin

.github/workflows/agent.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - v3
       - pmm-*
     tags:
       - v[0-9]+.[0-9]+.[0-9]+*
@@ -21,6 +22,7 @@ on:
       - "qan-api2/**"
       - "update/**"
       - "vmproxy/**"
+      - "ui/**"
 
 permissions:
   contents: read
@@ -32,27 +34,30 @@ jobs:
     strategy:
       matrix:
         images:
-          - { mysql: 'mysql:5.6', mongo: 'mongo:4.2', postgres: 'postgres:14', pmm_server: 'percona/pmm-server:2.0.0' }
-          - { mysql: 'mysql:5.7', mongo: 'mongo:4.4', postgres: 'postgres:15', pmm_server: 'percona/pmm-server:2.0.1' }
-          - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:16', pmm_server: 'percona/pmm-server:2.1.0' }
-          - { mysql: 'mysql:8.0', mongo: 'mongo:4.4', postgres: 'postgres:17rc1', pmm_server: 'percona/pmm-server:2.2.0' }
+          - { mysql: 'mysql:5.6', mongo: 'mongo:4.4', postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mysql:5.7', mongo: 'mongo:5.0', postgres: 'postgres:14', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mysql:8.0', mongo: 'mongo:6.0', postgres: 'postgres:15', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mysql:lts', mongo: 'mongo:7.0', postgres: 'postgres:16', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mysql:latest', mongo: 'mongo:latest', postgres: 'postgres:latest', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
 
           # Percona + latest PMM Server release
-          - { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.2', postgres: 'perconalab/percona-distribution-postgresql:15', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' }
-          - { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:16', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' }
-          - { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:17-dev', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'percona/pmm-server:2' }
+          - { mysql: 'percona:5.6', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:14', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'percona:5.7', mongo: 'percona/percona-server-mongodb:5.0', postgres: 'perconalab/percona-distribution-postgresql:15', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'percona:8.0', mongo: 'percona/percona-server-mongodb:6.0', postgres: 'perconalab/percona-distribution-postgresql:16', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'percona:8', mongo: 'percona/percona-server-mongodb:7.0', postgres: 'perconalab/percona-distribution-postgresql:17', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'percona:latest', mongo: 'percona/percona-server-mongodb:latest', postgres: 'perconalab/percona-distribution-postgresql:latest', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
 
           # MariaDB (only 3 latest GA versions)
           #   + older supported MongoDB versions
           #   + older supported PostgreSQL versions
-          #   + dev-latest PMM Server
+          #   + 3-dev-latest PMM Server
           # - MYSQL_IMAGE=mariadb:5.5
           # - MYSQL_IMAGE=mariadb:10.0
           # - MYSQL_IMAGE=mariadb:10.1
 
-          - { mysql: 'mariadb:10.2', mongo: 'mongo:4.4',                          postgres: 'postgres:12', pmm_server: 'perconalab/pmm-server:dev-latest' }
-          - { mysql: 'mariadb:10.3', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:dev-latest' }
-          - { mysql: 'mariadb:10.4',                                              postgres: 'postgres:14', pmm_server: 'perconalab/pmm-server:dev-latest' }
+          - { mysql: 'mariadb:11.2', mongo: 'mongo:4.4',                          postgres: 'postgres:12', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mariadb:11.4', mongo: 'percona/percona-server-mongodb:4.4', postgres: 'perconalab/percona-distribution-postgresql:13', pg_libs: 'pg_stat_statements,pg_stat_monitor', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
+          - { mysql: 'mariadb:11.5',                                              postgres: 'postgres:13', pmm_server: 'perconalab/pmm-server:3-dev-latest' }
 
     continue-on-error: true
 
@@ -108,9 +113,9 @@ jobs:
         run: make test-cover
 
       - name: Upload coverage results
-        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
-          file: cover.out
+          files: cover.out
           flags: agent
           env_vars: MYSQL_IMAGE,MONGO_IMAGE,POSTGRES_IMAGE,PMM_SERVER_IMAGE
           fail_ci_if_error: false
@@ -119,8 +124,10 @@ jobs:
       - name: Run debug commands on failure
         if: ${{ failure() }}
         run: |
-          env
-          go version
-          go env
-          pwd
+          echo "--- Environment variables ---"
+          env | sort
+          echo "--- GO Environment ---"
+          go env | sort
           git status
+          docker compose logs
+          docker compose ps -a

.github/workflows/api-tests.yml

@@ -1,4 +1,4 @@
-name: 'API'
+name: 'API Tests'
 
 on:
   # NOTE: no action on `push` and `pull_request` since the API tests need to be run
@@ -73,7 +73,7 @@ jobs:
       MYSQL_IMAGE: ${{ github.event.inputs.MYSQL_IMAGE || 'percona:5.7' }}
       POSTGRESQL_IMAGE: ${{ github.event.inputs.POSTGRESQL_IMAGE || 'postgres:12' }}
       MONGODB_IMAGE: ${{ github.event.inputs.MONGODB_IMAGE || 'percona/percona-server-mongodb:4.4' }}
-      PMM_SERVER_IMAGE: ${{ github.event.inputs.PMM_SERVER_IMAGE || 'perconalab/pmm-server:dev-latest' }}
+      PMM_SERVER_IMAGE: ${{ github.event.inputs.PMM_SERVER_IMAGE || 'perconalab/pmm-server:3-dev-latest' }}
 
     steps:
       - name: Check out code
@@ -97,12 +97,11 @@ jobs:
               container_name: pmm-agent_pmm-server
               environment:
                 - PMM_DEBUG=1
-                - PERCONA_TEST_CHECKS_INTERVAL=10s
-                - PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com
-                - PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX
+                - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com
+                - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX
               ports:
-                - 80:80
-                - 443:443
+                - 80:8080
+                - 443:8443
               volumes:
                 - ./managed/testdata/checks:/srv/checks
           EOF
@@ -136,7 +135,7 @@ jobs:
         run: |
           docker run -e PMM_SERVER_URL=${{env.PMM_URL}} \
             -e PMM_RUN_UPDATE_TEST=0 \
-            -e PMM_RUN_STT_TESTS=0 \
+            -e PMM_RUN_ADVISOR_TESTS=0 \
             --name pmm-api-tests \
             --network host \
             percona/pmm-api-tests

.github/workflows/api.yml

@@ -0,0 +1,40 @@
+name: Docs
+on:
+  push:
+    branches:
+      - main
+      - v3
+    paths:
+      - "api/**"
+      - "docs/api/**"
+
+  workflow_dispatch:
+
+jobs:
+  sync:
+    name: Sync API Docs
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Detect PMM version and API ID
+        run: |
+          # For reference:
+          # PMM 2: VERSION=v2, ID=626badcabbc59c02acc1a53f
+          # PMM 3: VERSION=v3, ID=622892a957a7410330bc6184
+          export VERSION=$(cat api/swagger/swagger.json | jq -r '.info.version')
+          export ID=$(cat api/swagger/swagger.json | jq -r '."x-readme-id"')
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "ID=$ID" >> $GITHUB_ENV
+
+      - name: API
+        uses: readmeio/rdme@e770fc3b3af009753fb02f636b59498523dccb37 # v10.1.1
+        with:
+          rdme: openapi ./api/swagger/swagger.json --version=${{ env.VERSION }} --id=${{ env.ID }} --key=${{ secrets.README_TOKEN }}
+
+      - name: Markdown docs
+        uses: readmeio/rdme@e770fc3b3af009753fb02f636b59498523dccb37 # v10.1.1
+        with:
+          rdme: docs docs/api --version=${{ env.VERSION }}  --key=${{ secrets.README_TOKEN }}

.github/workflows/clean.yml

@@ -18,42 +18,27 @@ jobs:
         go:
           - version: 1.23.x
             may-fail: false
-          - version: tip
-            may-fail: true
 
     continue-on-error: ${{ matrix.go.may-fail }}
     runs-on: ubuntu-22.04
 
     env:
       GOFLAGS: -v -mod=readonly
-      GOPRIVATE: github.com/percona-platform
 
     steps:
       - name: Configure git for private modules
         env:
           ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
-        run: git config --global url."https://percona-platform-robot:${ROBOT_TOKEN}@github.com".insteadOf "https://github.com"
+        run: echo "machine github.com login percona-robot password ${{ secrets.ROBOT_TOKEN }}" > $HOME/.netrc
 
       - name: Set up Go release
-        if: matrix.go.version != 'tip'
         env:
           # to avoid error due to `go version` accepting -v flag with an argument since 1.15
           GOFLAGS: ""
         uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
         with:
           go-version: ${{ matrix.go.version }}
 
-      - name: Set up Go tip
-        if: matrix.go.version == 'tip'
-        env:
-          # to avoid error due to `go version` accepting -v flag with an argument since 1.15
-          GOFLAGS: ""
-        run: |
-          git clone --depth=1 https://go.googlesource.com/go $HOME/gotip
-          cd $HOME/gotip/src
-          ./make.bash
-          echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
-          echo "$HOME/gotip/bin" >> $GITHUB_PATH
       - name: Check out code into the Go module directory
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -63,17 +48,19 @@ jobs:
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/go/pkg/mod
-          key: ${{ matrix.os }}-go-${{ matrix.go.version }}-modules-${{ hashFiles('**/go.sum') }}
+          key: ${{ matrix.go.version }}-modules-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go.version }}-modules-
+            ${{ matrix.go.version }}-modules-
+
       - name: Enable Go build cache
         uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/.cache/go-build
-          key: ${{ matrix.os }}-go-${{ matrix.go.version }}-build-${{ github.ref }}-${{ hashFiles('**') }}
+          key: ${{ matrix.go.version }}-build-${{ github.ref }}-${{ hashFiles('**') }}
           restore-keys: |
-            ${{ matrix.os }}-go-${{ matrix.go.version }}-build-${{ github.ref }}-
-            ${{ matrix.os }}-go-${{ matrix.go.version }}-build-
+            ${{ matrix.go.version }}-build-${{ github.ref }}-
+            ${{ matrix.go.version }}-build-
+
       - name: Clean Go modules cache
         run: go clean -modcache
 

.github/workflows/dependabot.yml

@@ -8,7 +8,7 @@ permissions:
 jobs:
   dependabot:
     name: Enable auto-merge
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Dependabot metadata

.github/workflows/devcontainer.yml

@@ -4,14 +4,14 @@ on:
     inputs:
       branch:
         description: "The branch to build the devcontainer from"
-        default: "main"
+        default: "v3"
         required: true
         type: string
   workflow_call:
     inputs:
       branch:
         description: "The branch to build the devcontainer from"
-        default: "main"
+        default: "v3"
         required: true
         type: string
 
@@ -20,17 +20,15 @@ permissions:
 
 jobs:
   devcontainer:
-    name: Build
+    name: Devcontainer
     runs-on: ubuntu-22.04
     timeout-minutes: 15
-    strategy:
-      fail-fast: false
     permissions:
       packages: write
 
     env:
-      LAB_DEVCONTAINER_IMAGE: perconalab/pmm-server:dev-container
-      GH_DEVCONTAINER_IMAGE: ghcr.io/percona/pmm:dev-container
+      LAB_DEVCONTAINER_IMAGE: perconalab/pmm-server:3-dev-container
+      GH_DEVCONTAINER_IMAGE: ghcr.io/percona/pmm:3-dev-container
 
     steps:
       - name: Check out code
@@ -39,7 +37,7 @@ jobs:
           ref: ${{ github.event.inputs.branch }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Login to ghcr.io registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -56,9 +54,10 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Build and push to registries
-        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
+        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
         with:
-          file: ./devcontainer.Dockerfile
+          file: ./.devcontainer/Dockerfile
+          context: .
           push: true
           tags: |
             ${{ env.GH_DEVCONTAINER_IMAGE }}