Merge branch 'PMM-2.0' into PMM-12390_Make_the_text_search_case_insen…

…sitive
Percona-Lab · Dec 20, 2023 · 2afea8b · 2afea8b
2 parents 8b31565 + 2657cae
commit 2afea8b
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 52 deletions.
diff --git a/.github/workflows/pmm2-testsuite.yml b/.github/workflows/pmm2-testsuite.yml
@@ -71,12 +71,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        db-type: [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove]
+        db-type: [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, server-container, clientContainer, haproxy, proxysql, remove]
 
     steps:
       - name: Create status check
         if: ${{ env.SHA != 'null' }}
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -104,12 +104,10 @@ jobs:
       - name: Install playwright
         working-directory: ./pmm-ui-tests/cli
         run: |
-          npm install
-          npx playwright install
+          npm ci
 
       - name: Setup tools
         run: |
-          npm install -g bats
           sudo apt-get install -y apt-transport-https ca-certificates dirmngr ansible libaio1 libaio-dev libnuma-dev libncurses5 socat sysbench
           sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
           echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
@@ -123,11 +121,11 @@ jobs:
       - name: Setup PMM2-Server
         run: |
           docker create -v /srv --name pmm-server-data ${{ env.SERVER_IMAGE }}
-          docker run -d -p 80:80 -p 443:443 -p 9000:9000 -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.SERVER_IMAGE }}
-          sleep 30
-
-      - name: healthcheck PMM2-server
-        run: timeout 100 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost/ping)" != "200" ]]; do sleep 5; done' || false
+          docker run -d -p 80:80 -p 443:443 -p 9000:9000 \
+            -e PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443 \
+            -e PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTg+ZmCCjt7O8eWeAmTLAqW+1ozUbpRSKSwNTmO+exlS5KEIPYWuYdX \
+            --volumes-from pmm-server-data --name pmm-server --restart always ${{ env.SERVER_IMAGE }}
+          timeout 240 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://127.0.0.1/v1/readyz)" != "200" ]]; do sleep 2; done' || false
 
       - name: Setup PMM2-Client
         run: sudo -E bash -x ./pmm-tests/pmm2-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.CLIENT_VERSION }} --admin_password admin --use_metrics_mode no
@@ -139,12 +137,12 @@ jobs:
       - name: Run CLI '--help' tests
         if: ${{ matrix.db-type == 'help' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/help.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/help.spec.ts --quiet
 
       - name: Run CLI remove tests
         if: ${{ matrix.db-type == 'remove' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts --quiet
 
       - name: Run Setup for ps5.7
         working-directory: pmm-integration
@@ -158,10 +156,10 @@ jobs:
         run: |
           sudo npx ts-node ./integration-setup.ts --ps-version=8 --ci --addclient=ps,1
 
-      - name: Run bats tests for PS
+      - name: Run CLI tests for PS
         if: ${{ matrix.db-type == 'ps5.7' || matrix.db-type == 'ps8' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts --quiet
 
       - name: Run Setup for pdpgsql 13
         working-directory: pmm-integration
@@ -184,7 +182,7 @@ jobs:
       - name: Run CLI tests for PDPGSQL
         if: ${{ matrix.db-type == 'pdpgsql13' || matrix.db-type == 'pdpgsql14' || matrix.db-type == 'pdpgsql15' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test postgreSql
+        run: npx playwright test postgreSql --quiet
 
       - name: Run Setup for PSMDB 4.4
         working-directory: pmm-integration
@@ -204,7 +202,7 @@ jobs:
       - name: Run CLI tests for PSMDB
         if: ${{ matrix.db-type == 'modb6' || matrix.db-type == 'modb5' || matrix.db-type == 'modb4.4' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mongoDb-psmdb.spec.ts --quiet
 
 # TODO: Add setup for the official MongoDB and run "npx playwright test pmm-ui-tests/cli/tests/mongoDb.spec.ts"
 
@@ -216,17 +214,17 @@ jobs:
       - name: Run CLI tests for Generic Scenarios
         if: ${{ matrix.db-type == 'generic' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test generic unregister
+        run: npx playwright test generic unregister --quiet
 
-      - name: Run bats tests for generic Scenarios
-        if: ${{ matrix.db-type == 'generic' }}
-        run: |
-          sudo bats ./pmm-tests/pmm-2-0-bats-tests/generic-tests.bats
+      - name: Run CLI tests for PMM Server Container
+        if: ${{ matrix.db-type == 'server-container' && !contains(env.PMM_UI_BRANCH, 'pmm-2.') }}
+        working-directory: ./pmm-ui-tests/cli
+        run: npx playwright test pmm-server-only --quiet
 
       - name: Run CLI tests for PMM Client Docker Container
         if: ${{ matrix.db-type == 'clientContainer' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-client-docker
+        run: npx playwright test pmm-client-docker --quiet
 
       - name: Run Setup for HAPROXY
         if: ${{ matrix.db-type == 'haproxy' }}
@@ -238,7 +236,7 @@ jobs:
       - name: Run CLI tests for Client Container Scenarios
         if: ${{ matrix.db-type == 'haproxy' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test haproxy
+        run: npx playwright test haproxy --quiet
 
       - name: Run Setup for ProxySQL
         if: ${{ matrix.db-type == 'proxysql' }}
@@ -247,7 +245,7 @@ jobs:
       - name: Run CLI tests for ProxySQL
         if: ${{ matrix.db-type == 'proxysql' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test proxySql
+        run: npx playwright test proxySql --quiet
 
       - name: Run Setup for MySQL 8.0
         if: ${{ matrix.db-type == 'ms8.0' }}
@@ -256,12 +254,12 @@ jobs:
       - name: Run MySQL specific CLI tests
         if: ${{ matrix.db-type == 'ms8.0' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mysql.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mysql.spec.ts --quiet
 
       - name: Run CLI tests for MySQL Tests
         if: ${{ matrix.db-type == 'ms8.0' }}
         working-directory: ./pmm-ui-tests/cli
-        run: npx playwright test pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts
+        run: npx playwright test pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts --quiet
 
       - name: Generate and Attach the report
         if: ${{ always() }}
@@ -272,7 +270,7 @@ jobs:
 
       - name: Create status check
         if: ${{ always() }}
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/trivy_scan.yml b/.github/workflows/trivy_scan.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       SHA: ${{ github.event.inputs.sha || github.event.pull_request.head.sha || github.sha }}
-    
+
     strategy:
       fail-fast: false
       matrix:
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Communicate action status back to the PR
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -67,7 +67,7 @@ jobs:
 
       - name: Communicate action status back to the PR
         if: always()
-        uses: percona-platform/github-status-action@update-node
+        uses: percona/gh-action-github-status-action@update-node
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ui-tests-podman.yml b/.github/workflows/ui-tests-podman.yml
@@ -67,7 +67,7 @@ jobs:
     steps:
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -213,7 +213,7 @@ jobs:
           sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js
           ./node_modules/.bin/codeceptjs run -c pr.codecept.js --grep "${{ env.TAGS_FOR_TESTS }}"
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ always() }}
         id: artifact_name
         with:
@@ -223,7 +223,7 @@ jobs:
 
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' && always() }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -64,7 +64,7 @@ jobs:
     steps:
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
@@ -136,7 +136,7 @@ jobs:
           sed -i 's+http://localhost/+${PMM_UI_URL}/+g' pr.codecept.js
           ./node_modules/.bin/codeceptjs run -c pr.codecept.js --grep "${{ env.TAGS_FOR_TESTS }}"
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         if: ${{ always() }}
         id: artifact_name
         with:
@@ -146,7 +146,7 @@ jobs:
 
       - name: Create status check
         if: ${{ github.event_name != 'pull_request' && always() }}
-        uses: percona-platform/github-status-action@v1
+        uses: percona/gh-action-github-status-action@v1
         continue-on-error: true
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitmodules b/.gitmodules
@@ -16,7 +16,7 @@
 [submodule "mongodb_exporter"]
 	path = sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
 	url = https://github.com/percona/mongodb_exporter.git
-	branch = release-0.39.0
+	branch = release-0.40.0
 [submodule "postgres_exporter"]
 	path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
 	url = https://github.com/percona/postgres_exporter
@@ -40,7 +40,7 @@
 [submodule "percona-toolkit"]
 	path = sources/percona-toolkit/src/github.com/percona/percona-toolkit
 	url = https://github.com/percona/percona-toolkit.git
-	branch = release-v3.5.2
+	branch = release-v3.5.5
 
 # PMM Server
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.41.0
+2.41.1
diff --git a/ci-default.yml b/ci-default.yml
@@ -20,7 +20,7 @@ deps:
     component: client
 
   - name: mongodb_exporter
-    branch: release-0.39.0
+    branch: release-0.40.0
     path: sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
     url: https://github.com/percona/mongodb_exporter
     component: client
@@ -56,7 +56,7 @@ deps:
     component: client
 
   - name: percona-toolkit
-    branch: release-v3.5.2
+    branch: release-v3.5.5
     path: sources/percona-toolkit/src/github.com/percona/percona-toolkit
     url: https://github.com/percona/percona-toolkit
     component: client

diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
diff --git a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
diff --git a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter
diff --git a/sources/percona-toolkit/src/github.com/percona/percona-toolkit b/sources/percona-toolkit/src/github.com/percona/percona-toolkit
diff --git a/sources/pmm-dump b/sources/pmm-dump
diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa
diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter
diff --git a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
+8 −8		.github/workflows/build.yml
+8 −2		pmm-app/src/pmm-qan/panel/provider/provider.tsx
+28 −31		.github/check-license.go
+8 −5		.github/pull_request_template.md
+7 −48		.github/workflows/go.yml
+42 −0		.github/workflows/lint.yml
+8 −8		.github/workflows/release.yml
+11 −0		.golangci-required.yml
+7 −4		.golangci.yml
+11 −0		CHANGELOG
+2 −2		Makefile
+34 −2		README.md
+5 −1		REFERENCE.md
+13 −11		exporter/base_collector.go
+10 −11		exporter/collstats_collector.go
+9 −10		exporter/collstats_collector_test.go
+9 −10		exporter/common.go
+9 −10		exporter/common_test.go
+144 −0		exporter/currentop_collector.go
+81 −0		exporter/currentop_collector_test.go
+21 −13		exporter/dbstats_collector.go
+10 −11		exporter/dbstats_collector_test.go
+9 −10		exporter/debug.go
+11 −12		exporter/debug_test.go
+10 −11		exporter/diagnostic_data_collector.go
+11 −12		exporter/diagnostic_data_collector_test.go
+9 −10		exporter/dsn_fix/dsn_fix.go
+9 −10		exporter/dsn_fix/dsn_fix_test.go
+9 −10		exporter/encryption_info_test.go
+66 −69		exporter/exporter.go
+43 −0		exporter/exporter_metrics.go
+80 −25		exporter/exporter_test.go
+10 −11		exporter/general_collector.go
+9 −10		exporter/general_collector_test.go
+10 −11		exporter/indexstats_collector.go
+9 −10		exporter/indexstats_collector_test.go
+12 −11		exporter/metrics.go
+10 −11		exporter/metrics_test.go
+72 −0		exporter/multi_target_test.go
+96 −0		exporter/profile_status_collector.go
+69 −0		exporter/profile_status_collector_test.go
+10 −11		exporter/replset_status_collector.go
+9 −10		exporter/replset_status_collector_test.go
+9 −10		exporter/secondary_lag_test.go
+111 −0		exporter/server.go
+10 −11		exporter/top_collector.go
+13 −14		exporter/top_collector_test.go
+12 −12		exporter/topology_info.go
+9 −10		exporter/topology_info_test.go
+9 −10		exporter/utils_test.go
+13 −13		exporter/v1_compatibility.go
+12 −13		exporter/v1_compatibility_test.go
+28 −41		go.mod
+76 −89		go.sum
+22 −0		internal/proto/proto.go
+146 −0		internal/proto/replstatus.go
+9 −10		internal/tu/docker_inspect.go
+9 −10		internal/tu/docker_inspect_test.go
+12 −12		internal/tu/testutils.go
+85 −0		internal/util/util.go
+106 −49		main.go
+87 −12		main_test.go
+90 −76		tools/go.mod
+205 −751		tools/go.sum
+9 −10		tools/tools.go
+2 −2		.github/workflows/ci.yml
+12 −6		Makefile
+17 −10		README.md
+1 −1		cmd/pmm-dump/main.go
+24 −9		go.mod
+80 −20		go.sum
+92 −0		internal/test/README.md
+6 −4		internal/test/e2e/basic_test.go
+3 −2		internal/test/e2e/contentlimit_test.go
+2 −0		internal/test/e2e/errmsg_test.go
+29 −8		internal/test/e2e/qan_test.go
+6 −4		internal/test/e2e/validate_test.go
+6 −3		internal/test/e2e/version_test.go
+80 −11		internal/test/util/pmm.go
+1 −1		pkg/dump/source.go
+20 −13		support-files/run-tests
+58 −48		tools/go.mod
+164 −100		tools/go.sum
+6 −0		pmm-integration/postgres/addClientPdPgsql.ts
+7 −1		pmm-tests/pmm-framework.sh
+2 −2		.github/workflows/pmm-ui-tests.yml
+1 −1		.github/workflows/upgrade-tests-pipeline.yml
+1 −1		CONTRIBUTING.md
+106 −0		cli/helpers/cli-helper.ts
+0 −109		cli/helpers/cliHelper.ts
+24 −13		cli/helpers/custom-assertions.ts
+17 −0		cli/helpers/zip-helper.ts
+3,683 −0		cli/package-lock.json
+22 −20		cli/package.json
+25 −22		cli/support/types/exec-return.class.ts
+55 −0		cli/support/types/pipe-assertions.class.ts
+479 −6		cli/tests/generic.spec.ts
+8 −10		cli/tests/haproxy.spec.ts
+49 −4		cli/tests/help.spec.ts
+51 −52		cli/tests/mongoDb-psmdb.spec.ts
+73 −71		cli/tests/mongoDb.spec.ts
+14 −10		cli/tests/mysql-conf-file.spec.ts
+38 −39		cli/tests/mysql.spec.ts
+55 −58		cli/tests/perconaMySqlServer.spec.ts
+7 −8		cli/tests/pmm-client-docker.spec.ts
+4 −1		cli/tests/pmm-server-docker-generic.spec.ts
+19 −13		cli/tests/pmm-server-only.spec.ts
+80 −30		cli/tests/postgreSql-pdpgsql.spec.ts
+21 −22		cli/tests/postgreSql.spec.ts
+19 −20		cli/tests/proxySql.spec.ts
+1 −1		cli/tests/remove.spec.ts
+11 −11		cli/tests/unregister.spec.ts
+1 −0		codeceptConfigHelper.js
+3 −7		playwright-tests/helpers/command-line/cliHelper.ts
+1 −1		pr.codecept.js
+2 −1		tests/configuration/pages/agentsPage.js
+1 −1		tests/configuration/pages/pmmInventoryPage.js
+24 −1		tests/custom_steps.js
+95 −0		tests/dashboards/pages/DashboardPanelMenu.js
+11 −1		tests/helper/file_helper.js
+8 −2		tests/leftNavigation_test.js
+198 −22		tests/pages/api/grafanaAPI.js
+29 −0		tests/pages/api/serverApi.js
+11 −0		tests/pages/dashboardPage.js
+4 −4		tests/pages/homePage.js
+31 −26		tests/pages/remoteInstancesPage.js
+88 −10		tests/upgradePMM_test.js
+41 −1		tests/verifyAWSRDSPostgreSQLInstance_test.js
+1 −1		tests/verifyMongodbSharding_test.js
+1 −1		tests/verifyTLSPostgresRemoteInstance_test.js
+1 −1		cmd/postgres_exporter/queries.go
+1 −1		go.mod
+2 −2		go.sum
+1 −1		.github/workflows/go.yml
+19 −17		go.mod
+41 −196		go.sum