Skip to content
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.

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

PMM-12545-dbaas-removal-ui (FB) #3474

Closed
wants to merge 205 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
205 commits
Select commit Hold shift + click to select a range
57aa14c
chore: rewind submodules for dev-latest
Sep 28, 2023
d8198d3
chore: rewind submodules for dev-latest
Sep 28, 2023
e258a9e
chore: rewind submodules for dev-latest
Sep 28, 2023
b484191
chore: rewind submodules for dev-latest
Sep 28, 2023
c754f13
chore: rewind submodules for dev-latest
Sep 28, 2023
88b3b08
chore(deps): bump gitpython from 3.1.36 to 3.1.37 (#3396)
dependabot[bot] Sep 29, 2023
26fc560
chore: rewind submodules for dev-latest
Sep 29, 2023
ce63ca8
chore: rewind submodules for dev-latest
Oct 1, 2023
f3d9651
PMM-7 fixed "removed" call (#3402)
Oct 2, 2023
684f006
chore: rewind submodules for dev-latest
Oct 2, 2023
c46e622
chore: rewind submodules for dev-latest
Oct 2, 2023
deb7477
Bump VERSION (#3406)
Oct 3, 2023
16e1083
chore: rewind submodules for dev-latest
Oct 4, 2023
3f6f4b6
chore: rewind submodules for dev-latest
Oct 4, 2023
60c00ab
chore: rewind submodules for dev-latest
Oct 5, 2023
4e6d380
chore: rewind submodules for dev-latest
Oct 5, 2023
a732bde
chore: rewind submodules for dev-latest
Oct 6, 2023
137c4b3
chore: rewind submodules for dev-latest
Oct 6, 2023
f8a9381
chore: rewind submodules for dev-latest
Oct 6, 2023
bf3f132
chore: rewind submodules for dev-latest
Oct 6, 2023
76eed3b
chore: rewind submodules for dev-latest
Oct 6, 2023
de606ed
chore: rewind submodules for dev-latest
Oct 9, 2023
f1fc987
chore: rewind submodules for dev-latest
Oct 10, 2023
55f0e87
chore: rewind submodules for dev-latest
Oct 10, 2023
5b00926
chore: rewind submodules for dev-latest
Oct 11, 2023
0a4376f
chore: rewind submodules for dev-latest
Oct 11, 2023
de437ac
chore: rewind submodules for dev-latest
Oct 11, 2023
cd366f7
chore: rewind submodules for dev-latest
Oct 12, 2023
296eaf2
chore: rewind submodules for dev-latest
Oct 12, 2023
636cba8
chore: rewind submodules for dev-latest
Oct 13, 2023
8dd40a1
chore: rewind submodules for dev-latest
Oct 13, 2023
9948772
chore: rewind submodules for dev-latest
Oct 15, 2023
daa056e
chore: rewind submodules for dev-latest
Oct 16, 2023
20208e6
chore: rewind submodules for dev-latest
Oct 16, 2023
37f56da
chore: rewind submodules for dev-latest
Oct 17, 2023
58a16ef
chore: rewind submodules for dev-latest
Oct 17, 2023
1057b9e
chore: rewind submodules for dev-latest
Oct 17, 2023
9227ff0
chore: rewind submodules for dev-latest
Oct 17, 2023
7c3ba68
chore: rewind submodules for dev-latest
Oct 18, 2023
5e2269b
chore: rewind submodules for dev-latest
Oct 18, 2023
cf720dd
chore: rewind submodules for dev-latest
Oct 18, 2023
77567f2
chore: rewind submodules for dev-latest
Oct 18, 2023
37ea001
chore: rewind submodules for dev-latest
Oct 18, 2023
e48fa0e
chore: rewind submodules for dev-latest
Oct 20, 2023
7e61f73
chore: rewind submodules for dev-latest
Oct 20, 2023
2caa80b
chore: rewind submodules for dev-latest
Oct 21, 2023
0b816e6
chore: rewind submodules for dev-latest
Oct 23, 2023
89a9c30
chore: rewind submodules for dev-latest
Oct 23, 2023
4a19ce0
chore: rewind submodules for dev-latest
Oct 24, 2023
70c07cd
chore: rewind submodules for dev-latest
Oct 24, 2023
91084b4
chore: rewind submodules for dev-latest
Oct 24, 2023
2845e67
chore: rewind submodules for dev-latest
Oct 24, 2023
e4d571b
chore: rewind submodules for dev-latest
Oct 24, 2023
73b481e
chore: rewind submodules for dev-latest
Oct 25, 2023
b481855
chore: rewind submodules for dev-latest
Oct 25, 2023
6d72ff9
chore: rewind submodules for dev-latest
Oct 25, 2023
5f8ab6f
chore: rewind submodules for dev-latest
Oct 25, 2023
1648a9b
chore: rewind submodules for dev-latest
Oct 25, 2023
f19a869
chore: rewind submodules for dev-latest
Oct 25, 2023
fc709cc
chore: rewind submodules for dev-latest
Oct 25, 2023
1ad5443
chore: rewind submodules for dev-latest
Oct 25, 2023
6cd75a2
chore: rewind submodules for dev-latest
Oct 26, 2023
919bfaf
chore: rewind submodules for dev-latest
Oct 26, 2023
40f7f7b
chore: rewind submodules for dev-latest
Oct 26, 2023
b635190
chore: rewind submodules for dev-latest
Oct 26, 2023
2056cfe
chore: rewind submodules for dev-latest
Oct 26, 2023
dd58618
chore: rewind submodules for dev-latest
Oct 26, 2023
5e74fa2
chore: rewind submodules for dev-latest
Oct 29, 2023
32cded2
chore: rewind submodules for dev-latest
Oct 30, 2023
12a177a
chore: rewind submodules for dev-latest
Oct 30, 2023
8f26b60
chore: rewind submodules for dev-latest
Oct 30, 2023
7ec911a
chore: rewind submodules for dev-latest
Oct 31, 2023
8245555
chore: rewind submodules for dev-latest
Oct 31, 2023
5513db0
chore: rewind submodules for dev-latest
Oct 31, 2023
bd77840
chore: rewind submodules for dev-latest
Oct 31, 2023
305a4e3
chore: rewind submodules for dev-latest
Oct 31, 2023
9fef71d
chore: rewind submodules for dev-latest
Oct 31, 2023
285c4e3
chore: rewind submodules for dev-latest
Nov 1, 2023
eab7f97
chore: rewind submodules for dev-latest
Nov 1, 2023
fe0b845
chore: rewind submodules for dev-latest
Nov 1, 2023
4f01bd3
chore: rewind submodules for dev-latest
Nov 1, 2023
312d5bf
chore: rewind submodules for dev-latest
Nov 1, 2023
46624bb
chore: rewind submodules for dev-latest
Nov 2, 2023
33dac15
chore: rewind submodules for dev-latest
Nov 2, 2023
b9220c7
chore: rewind submodules for dev-latest
Nov 2, 2023
2fadef7
chore: rewind submodules for dev-latest
Nov 3, 2023
ca884b9
chore: rewind submodules for dev-latest
Nov 3, 2023
69fd852
chore: rewind submodules for dev-latest
Nov 3, 2023
3680800
chore: rewind submodules for dev-latest
Nov 3, 2023
b8fec7b
chore: rewind submodules for dev-latest
Nov 6, 2023
42af5b2
chore: rewind submodules for dev-latest
Nov 6, 2023
56666b5
chore: rewind submodules for dev-latest
Nov 6, 2023
54e4042
chore: rewind submodules for dev-latest
Nov 6, 2023
3606b48
chore: rewind submodules for dev-latest
Nov 6, 2023
61ebe12
chore: rewind submodules for dev-latest
Nov 6, 2023
e443aee
chore: rewind submodules for dev-latest
Nov 7, 2023
d8f9434
chore: rewind submodules for dev-latest
Nov 7, 2023
c1de35e
chore: rewind submodules for dev-latest
Nov 7, 2023
b7e7bef
chore: rewind submodules for dev-latest
Nov 7, 2023
8765d6a
chore: rewind submodules for dev-latest
Nov 7, 2023
117aeef
chore: rewind submodules for dev-latest
Nov 8, 2023
4dd13a1
chore: rewind submodules for dev-latest
Nov 8, 2023
8cb2896
chore: rewind submodules for dev-latest
Nov 8, 2023
45619f4
chore: rewind submodules for dev-latest
Nov 8, 2023
d193981
chore: rewind submodules for dev-latest
Nov 8, 2023
0bf3fb1
chore: rewind submodules for dev-latest
Nov 8, 2023
978561f
chore: rewind submodules for dev-latest
Nov 9, 2023
36af053
chore: rewind submodules for dev-latest
Nov 9, 2023
67d8280
chore: rewind submodules for dev-latest
Nov 9, 2023
4fdca3e
chore: rewind submodules for dev-latest
Nov 10, 2023
f5d7a04
chore: rewind submodules for dev-latest
Nov 10, 2023
cff8139
chore: rewind submodules for dev-latest
Nov 10, 2023
a6659db
chore: rewind submodules for dev-latest
Nov 10, 2023
1d5ef55
chore: rewind submodules for dev-latest
Nov 13, 2023
a55144e
chore: rewind submodules for dev-latest
Nov 13, 2023
4916812
chore: rewind submodules for dev-latest
Nov 14, 2023
2159306
chore: rewind submodules for dev-latest
Nov 14, 2023
e840254
chore: rewind submodules for dev-latest
Nov 15, 2023
98b2a40
chore: rewind submodules for dev-latest
Nov 15, 2023
88c7054
chore: rewind submodules for dev-latest
Nov 15, 2023
5f0e4b2
chore: rewind submodules for dev-latest
Nov 15, 2023
4e45cca
chore: rewind submodules for dev-latest
Nov 16, 2023
06f2ee4
PMM-7 update percona-toolkit and mongodb_exporter (#3439)
BupycHuk Nov 16, 2023
d8d337c
chore: rewind submodules for dev-latest
Nov 16, 2023
4505854
chore: rewind submodules for dev-latest
Nov 17, 2023
2b13065
chore: rewind submodules for dev-latest
Nov 17, 2023
00f643b
chore: rewind submodules for dev-latest
Nov 20, 2023
487397a
chore: rewind submodules for dev-latest
Nov 20, 2023
c00a0a1
chore(deps): bump actions/github-script from 6 to 7 (#3452)
dependabot[bot] Nov 21, 2023
2e3f499
chore: rewind submodules for dev-latest
Nov 21, 2023
68ba083
chore: rewind submodules for dev-latest
Nov 22, 2023
767a30d
chore: rewind submodules for dev-latest
Nov 22, 2023
6842721
chore: rewind submodules for dev-latest
Nov 22, 2023
85208e0
chore: rewind submodules for dev-latest
Nov 22, 2023
6672222
chore: rewind submodules for dev-latest
Nov 22, 2023
f56d32e
chore: rewind submodules for dev-latest
Nov 22, 2023
1ccc68c
chore: rewind submodules for dev-latest
Nov 22, 2023
1be31a2
chore: rewind submodules for dev-latest
Nov 22, 2023
98283de
chore: rewind submodules for dev-latest
Nov 23, 2023
ef903f5
chore: rewind submodules for dev-latest
Nov 23, 2023
8c5aef1
PMM-7 update GH status action repo (#3457)
yurkovychv Nov 23, 2023
e011a3a
chore: rewind submodules for dev-latest
Nov 23, 2023
b874762
chore: rewind submodules for dev-latest
Nov 23, 2023
3db797f
chore: rewind submodules for dev-latest
Nov 23, 2023
6272809
PMM-11609 removed bats (#3459)
Nov 24, 2023
6286b4e
chore: rewind submodules for dev-latest
Nov 24, 2023
2c651bc
chore: rewind submodules for dev-latest
Nov 24, 2023
1e8a9ad
PMM-12622 added pmm-server only tests and quiet mode (#3458)
Nov 24, 2023
baee184
chore: rewind submodules for dev-latest
Nov 24, 2023
5690b5b
chore: rewind submodules for dev-latest
Nov 27, 2023
d42e00d
chore: rewind submodules for dev-latest
Nov 27, 2023
132570e
chore: rewind submodules for dev-latest
Nov 27, 2023
558de7e
chore: rewind submodules for dev-latest
Nov 27, 2023
c71239d
chore: rewind submodules for dev-latest
Nov 27, 2023
71a4e69
chore: rewind submodules for dev-latest
Nov 27, 2023
3845e86
chore: rewind submodules for dev-latest
Nov 28, 2023
073e78b
chore: rewind submodules for dev-latest
Nov 28, 2023
71de7de
chore: rewind submodules for dev-latest
Nov 29, 2023
d8074c5
chore: rewind submodules for dev-latest
Nov 29, 2023
19af4d1
chore: rewind submodules for dev-latest
Nov 29, 2023
d0b8a80
chore: rewind submodules for dev-latest
Nov 30, 2023
d4f1a50
chore: rewind submodules for dev-latest
Nov 30, 2023
5c2176e
Create feature build: PMM-12545-dbaas-removal-ui
YashSartanpara1 Dec 4, 2023
93eecce
Trigger FB
YashSartanpara1 Dec 5, 2023
86bcda0
PMM-7 Update VERSION 2.41.1 (#3477)
puneet0191 Dec 5, 2023
121d885
chore: rewind submodules for dev-latest
Dec 5, 2023
35954a8
chore: rewind submodules for dev-latest
Dec 5, 2023
e792a11
chore: rewind submodules for dev-latest
Dec 6, 2023
773b5f8
chore: rewind submodules for dev-latest
Dec 6, 2023
333c9c9
chore: rewind submodules for dev-latest
Dec 6, 2023
791c280
chore: rewind submodules for dev-latest
Dec 7, 2023
8bc7637
chore: rewind submodules for dev-latest
Dec 7, 2023
ead5fad
chore: rewind submodules for dev-latest
Dec 7, 2023
8d3f420
chore: rewind submodules for dev-latest
Dec 7, 2023
ad856df
chore: rewind submodules for dev-latest
Dec 7, 2023
a4cc420
chore: rewind submodules for dev-latest
Dec 7, 2023
b59187c
chore: rewind submodules for dev-latest
Dec 7, 2023
28c07e8
chore: rewind submodules for dev-latest
Dec 7, 2023
75d8939
chore: rewind submodules for dev-latest
Dec 8, 2023
98560b1
chore: rewind submodules for dev-latest
Dec 12, 2023
1858f91
chore: rewind submodules for dev-latest
Dec 12, 2023
c93ae52
chore: rewind submodules for dev-latest
Dec 13, 2023
9c1a24b
chore: rewind submodules for dev-latest
Dec 14, 2023
0db1919
chore: rewind submodules for dev-latest
Dec 18, 2023
83c4ac7
chore: rewind submodules for dev-latest
Dec 18, 2023
d987d3f
chore: rewind submodules for dev-latest
Dec 18, 2023
181dce7
chore: rewind submodules for dev-latest
Dec 18, 2023
2657cae
chore: rewind submodules for dev-latest
Dec 19, 2023
131dc6c
chore: rewind submodules for dev-latest
Dec 20, 2023
33f6228
chore: rewind submodules for dev-latest
Dec 20, 2023
66d3a50
chore: rewind submodules for dev-latest
Dec 20, 2023
82aaa10
chore: rewind submodules for dev-latest
Dec 20, 2023
b00fa87
chore: rewind submodules for dev-latest
Dec 20, 2023
da8f8c5
chore: rewind submodules for dev-latest
Dec 20, 2023
b5c64a4
chore: rewind submodules for dev-latest
Dec 21, 2023
03e0f11
chore: rewind submodules for dev-latest
Dec 22, 2023
123ba35
chore: rewind submodules for dev-latest
Dec 25, 2023
ba10f58
chore: rewind submodules for dev-latest
Dec 25, 2023
2ebb3cd
chore: rewind submodules for dev-latest
Dec 25, 2023
0957e41
chore: rewind submodules for dev-latest
Dec 25, 2023
9bda367
chore: rewind submodules for dev-latest
Dec 26, 2023
3a833a1
chore: rewind submodules for dev-latest
Dec 26, 2023
5df7186
chore(deps): bump actions/upload-artifact from 3 to 4 (#3487)
dependabot[bot] Dec 27, 2023
58835f9
chore(deps): bump gitpython from 3.1.37 to 3.1.40 (#3422)
dependabot[bot] Dec 27, 2023
be24a08
Merge branch 'PMM-2.0' into PMM-12545-dbaas-removal-ui
YashSartanpara1 Dec 27, 2023
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
60 changes: 29 additions & 31 deletions .github/workflows/pmm2-testsuite.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: pmm2 integration tests pipeline
name: PMM2 Integration Tests
on:
# run with default inputs
workflow_dispatch:
Expand Down Expand Up @@ -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 }}
Expand All @@ -101,15 +101,13 @@ jobs:
repository: percona/pmm-ui-tests
path: ./pmm-ui-tests

- name: Install playwright
- 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 \
Expand All @@ -123,12 +121,12 @@ 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
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: 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

- 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

Expand All @@ -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
run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts
working-directory: ./pmm-ui-tests/cli
run: npx playwright test pmm-ui-tests/cli/tests/remove.spec.ts --quiet

- name: Run Setup for ps5.7
working-directory: pmm-integration
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"

Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand All @@ -256,23 +254,23 @@ 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() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "report-${{ matrix.db-type }}"
path: ./pmm-ui-tests/cli/test-report

- 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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/trivy_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down Expand Up @@ -59,15 +59,15 @@ jobs:

- name: Archive trivy scan results
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.REPORT }}
path: ${{ env.REPORT }}
retention-days: 7

- 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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ui-tests-podman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.40.0
2.41.1
4 changes: 2 additions & 2 deletions ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
deps:
- name: grafana
branch: PMM-12545-dbaas-removal-ui
url: https://github.com/percona/grafana
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pyaml==23.9.5
GitPython==3.1.36
GitPython==3.1.40
PyGithub==1.59.1
2 changes: 1 addition & 1 deletion sources/grafana-dashboards
Submodule grafana-dashboards updated 45 files
+8 −8 .github/workflows/build.yml
+2 −2 dashboards/Insight/Home_Dashboard.json
+1 −1 dashboards/MongoDB/MongoDB_Cluster_Summary.json
+0 −38 panels/yesoreyeram-boomtable-panel/CHANGELOG.md
+0 −1 panels/yesoreyeram-boomtable-panel/LAST_UPDATED
+0 −62 panels/yesoreyeram-boomtable-panel/MANIFEST.txt
+0 −440 panels/yesoreyeram-boomtable-panel/README.md
+0 −67 panels/yesoreyeram-boomtable-panel/app/GrafanaUtils.js
+0 −74 panels/yesoreyeram-boomtable-panel/app/app.js
+0 −10 panels/yesoreyeram-boomtable-panel/app/boom/Boom.interface.js
+0 −90 panels/yesoreyeram-boomtable-panel/app/boom/BoomOutput.js
+0 −101 panels/yesoreyeram-boomtable-panel/app/boom/BoomPattern.js
+0 −109 panels/yesoreyeram-boomtable-panel/app/boom/BoomSeries.js
+0 −119 panels/yesoreyeram-boomtable-panel/app/boom/BoomSeriesUtils.js
+0 −22 panels/yesoreyeram-boomtable-panel/app/boom/BoomTimeBasedThreshold.js
+0 −300 panels/yesoreyeram-boomtable-panel/app/boom/BoomUtils.js
+0 −45 panels/yesoreyeram-boomtable-panel/app/boom/index.js
+0 −78 panels/yesoreyeram-boomtable-panel/app/config.js
+0 −45 panels/yesoreyeram-boomtable-panel/css/default.dark.css
+0 −45 panels/yesoreyeram-boomtable-panel/css/default.light.css
+0 −195 panels/yesoreyeram-boomtable-panel/module.js
+0 −605 panels/yesoreyeram-boomtable-panel/partials/editor.html
+0 −40 panels/yesoreyeram-boomtable-panel/partials/module.html
+0 −37 panels/yesoreyeram-boomtable-panel/plugin.json
+ panels/yesoreyeram-boomtable-panel/src/img/azure-monitor-usage.png
+ panels/yesoreyeram-boomtable-panel/src/img/debug-ui.png
+ panels/yesoreyeram-boomtable-panel/src/img/editor-1.png
+ panels/yesoreyeram-boomtable-panel/src/img/editor-2.png
+ panels/yesoreyeram-boomtable-panel/src/img/editor-default.png
+ panels/yesoreyeram-boomtable-panel/src/img/filters.png
+ panels/yesoreyeram-boomtable-panel/src/img/font-awesome-examples.png
+ panels/yesoreyeram-boomtable-panel/src/img/img-transform-example.png
+ panels/yesoreyeram-boomtable-panel/src/img/influx-usage.png
+ panels/yesoreyeram-boomtable-panel/src/img/metrics.png
+ panels/yesoreyeram-boomtable-panel/src/img/panel.png
+ panels/yesoreyeram-boomtable-panel/src/img/panels-fa.png
+ panels/yesoreyeram-boomtable-panel/src/img/prometheus-usage.png
+ panels/yesoreyeram-boomtable-panel/src/img/time-based-thresholds.png
+ panels/yesoreyeram-boomtable-panel/src/img/version-5.0.2.png
+0 −227 panels/yesoreyeram-boomtable-panel/tests/BoomSeries.spec.js
+1 −1 pmm-app/docker-compose.yaml
+1 −1 pmm-app/package.json
+8 −2 pmm-app/src/pmm-qan/panel/provider/provider.tsx
+166 −68 pmm-app/yarn.lock
+467 −451 setup-page/package-lock.json
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
Submodule mongodb_exporter updated 63 files
+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
Submodule percona-toolkit updated 942 files
2 changes: 1 addition & 1 deletion sources/pmm-dump
Submodule pmm-dump updated 907 files
2 changes: 1 addition & 1 deletion sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
Submodule pmm-ui-tests updated 81 files
+2 −2 .github/workflows/pmm-ui-tests.yml
+5 −1 .github/workflows/pmm-upgrade-ui-tests-matrix-full.yml
+4 −4 .github/workflows/pmm-version-getter.yml
+3 −18 .github/workflows/upgrade-tests-pipeline.yml
+1 −1 CONTRIBUTING.md
+170 −3 cli/.eslintrc
+106 −0 cli/helpers/cli-helper.ts
+0 −109 cli/helpers/cliHelper.ts
+39 −0 cli/helpers/custom-assertions.ts
+17 −0 cli/helpers/zip-helper.ts
+3,683 −0 cli/package-lock.json
+58 −0 cli/package.json
+4 −8 cli/playwright.config.ts
+32 −19 cli/support/types/exec-return.class.ts
+55 −0 cli/support/types/pipe-assertions.class.ts
+0 −0 cli/test-setup/docker-compose-pmm-admin-remove.yml
+478 −8 cli/tests/generic.spec.ts
+8 −10 cli/tests/haproxy.spec.ts
+47 −32 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
+29 −32 cli/tests/pmm-client-docker.spec.ts
+65 −103 cli/tests/pmm-server-docker-generic.spec.ts
+142 −0 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
+16 −11 cli/tests/remove.spec.ts
+11 −11 cli/tests/unregister.spec.ts
+28 −16 cli/tsconfig.json
+4 −3 codeceptConfigHelper.js
+0 −2 package.json
+3 −7 playwright-tests/helpers/command-line/cliHelper.ts
+1 −0 playwright-tests/helpers/enums/wait.ts
+6 −6 playwright-tests/pages/home-dashboard.page.ts
+0 −47 playwright-tests/pages/page-components/pmm-upgrade-panel.ts
+24 −0 playwright-tests/pages/page-components/pmm-upgrade-widget.ts
+2 −2 playwright-tests/playwright.config.ts
+7 −7 playwright-tests/tests/upgrade/upgrade-pmm-via-ui.spec.ts
+1 −1 pr.codecept.js
+1 −0 tests/DbaaS/pages/dbaasPage.js
+0 −204 tests/advisers/stt/allChecks_test.js
+5 −3 tests/advisors/pages/advisorsPage.js
+0 −0 tests/advisors/pages/api/advisorsAPI.js
+0 −0 tests/advisors/pages/databaseChecksPage.js
+204 −0 tests/advisors/stt/allChecks_test.js
+18 −18 tests/advisors/stt/checksExecution_test.js
+0 −0 tests/advisors/stt/databaseChecksTiers_test.js
+11 −11 tests/advisors/stt/databaseChecks_test.js
+0 −0 tests/advisors/stt/sttSettings_test.js
+19 −0 tests/advisors/v2/configuration_test.js
+6 −3 tests/backup/inventory_test.js
+1 −0 tests/backup/pages/scheduledPage.js
+2 −1 tests/backup/scheduled_test.js
+2 −1 tests/configuration/pages/agentsPage.js
+51 −3 tests/configuration/pages/pmmInventoryPage.js
+3 −2 tests/configuration/pages/pmmSettingsPage.js
+311 −0 tests/configuration/verifyPMMInventory_test.js
+18 −0 tests/configuration/verifyPMMSettingsPageElements_test.js
+1 −1 tests/configuration/verifyPMMSettingsPageFunctionality_test.js
+30 −1 tests/custom_steps.js
+95 −0 tests/dashboards/pages/DashboardPanelMenu.js
+15 −0 tests/dashboards/verifyMysqlDashboards_test.js
+11 −1 tests/helper/file_helper.js
+8 −2 tests/leftNavigation_test.js
+3 −1 tests/pages/adminPage.js
+198 −22 tests/pages/api/grafanaAPI.js
+29 −0 tests/pages/api/serverApi.js
+53 −0 tests/pages/dashboardPage.js
+4 −4 tests/pages/homePage.js
+111 −74 tests/pages/remoteInstancesPage.js
+2 −2 tests/perf_test.js
+27 −0 tests/qa-integration/pmm_pdpgsql_integration_test.js
+1 −0 tests/remoteInstances/remoteInstancesHelper.js
+129 −35 tests/upgradePMM_test.js
+41 −1 tests/verifyAWSRDSPostgreSQLInstance_test.js
+1 −1 tests/verifyMongodbSharding_test.js
+1 −1 tests/verifyTLSPostgresRemoteInstance_test.js
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 514 files
Submodule postgres_exporter updated 86 files
+4 −3 .circleci/config.yml
+6 −5 .github/workflows/golangci-lint.yml
+1 −4 .gitignore
+14 −1 .golangci.yml
+1 −1 .promu.yml
+1 −6 .yamllint
+75 −1 CHANGELOG.md
+12 −10 Makefile.common
+128 −24 README.md
+1 −1 VERSION
+11 −6 cmd/postgres_exporter/datasource.go
+84 −50 cmd/postgres_exporter/main.go
+1 −1 cmd/postgres_exporter/namespace.go
+4 −3 cmd/postgres_exporter/percona_compatibility_test.go
+57 −52 cmd/postgres_exporter/percona_exporter.go
+6 −2 cmd/postgres_exporter/pg_setting.go
+11 −11 cmd/postgres_exporter/pg_setting_test.go
+30 −67 cmd/postgres_exporter/postgres_exporter.go
+10 −2 cmd/postgres_exporter/postgres_exporter_integration_test.go
+2 −3 cmd/postgres_exporter/postgres_exporter_test.go
+107 −0 cmd/postgres_exporter/probe.go
+2 −26 cmd/postgres_exporter/queries.go
+22 −16 cmd/postgres_exporter/server.go
+37 −31 collector/collector.go
+62 −0 collector/collector_test.go
+150 −0 collector/instance.go
+81 −26 collector/pg_database.go
+101 −0 collector/pg_database_test.go
+115 −0 collector/pg_database_wraparound.go
+64 −0 collector/pg_database_wraparound_test.go
+5 −10 collector/pg_extensions.go
+129 −0 collector/pg_locks.go
+60 −0 collector/pg_locks_test.go
+93 −0 collector/pg_long_running_transactions.go
+63 −0 collector/pg_long_running_transactions_test.go
+69 −0 collector/pg_postmaster.go
+95 −0 collector/pg_postmaster_test.go
+132 −0 collector/pg_process_idle.go
+88 −0 collector/pg_replication.go
+130 −0 collector/pg_replication_slot.go
+186 −0 collector/pg_replication_slot_test.go
+63 −0 collector/pg_replication_test.go
+84 −0 collector/pg_stat_activity_autovacuum.go
+62 −0 collector/pg_stat_activity_autovacuum_test.go
+152 −114 collector/pg_stat_bgwriter.go
+153 −0 collector/pg_stat_bgwriter_test.go
+478 −0 collector/pg_stat_database.go
+506 −0 collector/pg_stat_database_test.go
+211 −0 collector/pg_stat_statements.go
+153 −0 collector/pg_stat_statements_test.go
+446 −0 collector/pg_stat_user_tables.go
+243 −0 collector/pg_stat_user_tables_test.go
+271 −0 collector/pg_stat_walreceiver.go
+186 −0 collector/pg_stat_walreceiver_test.go
+118 −0 collector/pg_statio_user_indexes.go
+109 −0 collector/pg_statio_user_indexes_test.go
+222 −0 collector/pg_statio_user_tables.go
+157 −0 collector/pg_statio_user_tables_test.go
+84 −0 collector/pg_wal.go
+63 −0 collector/pg_wal_test.go
+91 −0 collector/pg_xlog_location.go
+61 −0 collector/pg_xlog_location_test.go
+99 −0 collector/probe.go
+0 −100 collector/server.go
+120 −0 config/config.go
+58 −0 config/config_test.go
+238 −0 config/dsn.go
+228 −0 config/dsn_test.go
+7 −0 config/testdata/config-bad-auth-module.yaml
+8 −0 config/testdata/config-bad-extra-field.yaml
+8 −0 config/testdata/config-good.yaml
+35 −30 go.mod
+73 −476 go.sum
+3 −3 percona_tests/Makefile
+1 −0 percona_tests/assets/postgres_exporter.yml
+7 −0 percona_tests/assets/test.new-flags.txt
+0 −0 percona_tests/assets/test.old-flags.txt
+15 −0 percona_tests/docker-compose.yml
+62 −21 percona_tests/metrics_test.go
+9 −9 percona_tests/performance_test.go
+11 −5 percona_tests/utils_test.go
+2 −1 postgres_exporter.rc
+57 −83 postgres_mixin/dashboards/postgres-overview.json
+0 −2 scripts/errcheck_excludes.txt
+14 −14 tools/go.mod
+32 −105 tools/go.sum
Loading