Skip to content

PMM-12977 adopt BM setup for PMM3 #39

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Mar 19, 2024
Merged

PMM-12977 adopt BM setup for PMM3 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dc4652d
PMM-12977 adopt BM setup for PMM 3
yurkovychv Mar 13, 2024
04a7e8b
PMM-12977 update workflow
yurkovychv Mar 13, 2024
9416fb4
PMM-12977 remove using setup docker-compose action
yurkovychv Mar 13, 2024
46ae79b
PMM-12977 fix tests
yurkovychv Mar 13, 2024
6ae5063
PMM-12977 fix tests
yurkovychv Mar 13, 2024
4bc5155
PMM-12977 fix tests
yurkovychv Mar 19, 2024
de6c4b0
PMM-12977 fix auth tests
yurkovychv Mar 19, 2024
a589db9
PMM-12977 formatting
yurkovychv Mar 19, 2024
93bf3c9
PMM-12977 fix sharded cluster docker-compose
yurkovychv Mar 19, 2024
6e2818b
PMM-12977 fix sharded cluster docker-compose
yurkovychv Mar 19, 2024
12017ba
PMM-12977 fix sharded cluster docker-compose
yurkovychv Mar 19, 2024
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
33 changes: 18 additions & 15 deletions .github/workflows/PMM_PSMDB_PBM.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,40 @@ on:
inputs:
psmdb_version:
description: "psmdb version"
default: "latest"
required: false
pbm_version:
description: "pbm version"
default: "latest"
required: false
pmm_version:
description: "pmm2-client version"
default: "3-dev-latest"
required: false
pmm_image:
description: "pmm-server docker image"
default: "perconalab/pmm-server:3-dev-latest"
required: false

push:
branches:
- main
- -v3

pull_request:
branches:
- main
- v3

jobs:
test_replica_set:
runs-on: ubuntu-20.04
timeout-minutes: 20
env:
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ github.event.inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ github.event.inputs.pmm_version || 'latest' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
PSMDB_VERSION: ${{ inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
steps:
- uses: actions/checkout@v2
- name: test-rs
Expand All @@ -44,10 +50,10 @@ jobs:
runs-on: ubuntu-20.04
timeout-minutes: 20
env:
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ github.event.inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ github.event.inputs.pmm_version || 'latest' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
PSMDB_VERSION: ${{ inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
steps:
- uses: actions/checkout@v2
- name: test-sharded
Expand All @@ -59,14 +65,11 @@ jobs:
runs-on: ubuntu-20.04
timeout-minutes: 20
env:
PSMDB_VERSION: ${{ github.event.inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ github.event.inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ github.event.inputs.pmm_version || 'latest' }}
PMM_IMAGE: ${{ github.event.inputs.pmm_image || 'perconalab/pmm-server:dev-latest' }}
PSMDB_VERSION: ${{ inputs.psmdb_version || 'latest' }}
PBM_VERSION: ${{ inputs.pbm_version || 'latest' }}
PMM_CLIENT_VERSION: ${{ inputs.pmm_version || '3-dev-latest' }}
PMM_IMAGE: ${{ inputs.pmm_image || 'perconalab/pmm-server:3-dev-latest' }}
steps:
- uses: KengoTODA/actions-setup-docker-compose@v1
with:
version: '2.17.2'
- uses: actions/checkout@v3
- name: test-auth
run: |
Expand Down
23 changes: 12 additions & 11 deletions pmm_psmdb-pbm_setup/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,21 @@ RUN set -ex; \
yum -y install percona-backup-mongodb ; \
else \
yum -y install percona-backup-mongodb-${PBM_VERSION}.el9 ; \
fi && \
if [[ $PMM_CLIENT_VERSION == http* ]]; then \
yum -y install pmm2-client && \
curl -Lf -o /tmp/pmm2-client.tar.gz $PMM_CLIENT_VERSION && \
cd /tmp && tar -xvf pmm2-client.tar.gz --transform 's,^/*[^/]*,/pmm2-client,S' && \
cd /tmp/pmm2-client && ./install_tarball && cd ../ && rm -rf pmm2* ;\
elif [[ "$PMM_CLIENT_VERSION" =~ latest|dev-latest ]]; then \
yum -y install pmm2-client ; \
elif [ $PMM_CLIENT_VERSION == "pmm2-rc" ]; then \
fi

RUN if [[ $PMM_CLIENT_VERSION == http* ]]; then \
yum -y install pmm-client && \
curl -Lf -o /tmp/pmm-client.tar.gz $PMM_CLIENT_VERSION && \
cd /tmp && tar -xvf pmm-client.tar.gz --transform 's,^/*[^/]*,/pmm-client,S' && \
cd /tmp/pmm-client && ./install_tarball && cd ../ && rm -rf pmm* ;\
elif [[ "$PMM_CLIENT_VERSION" =~ 3-dev-latest|latest ]]; then \
yum -y install pmm-client ; \
elif [[ $PMM_CLIENT_VERSION =~ pmm3-rc ]]; then \
percona-release enable original testing \
yum update --refresh -y \
yum -y install pmm2-client ; \
yum -y install pmm-client ; \
else \
yum -y install pmm2-client-${PMM_CLIENT_VERSION}-6.el9 ; \
yum -y install pmm-client-${PMM_CLIENT_VERSION}-6.el9 ; \
fi && \
systemctl enable mongod && \
systemctl enable pbm-agent && \
Expand Down
8 changes: 5 additions & 3 deletions pmm_psmdb-pbm_setup/docker-compose-pmm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: "3"
services:
pmm-server:
image: ${PMM_IMAGE:-perconalab/pmm-server:dev-latest}
image: ${PMM_IMAGE:-perconalab/pmm-server:3-dev-latest}
container_name: pmm-server
environment:
- "PMM_DEBUG=1"
- "ENABLE_BACKUP_MANAGEMENT=1"
ports:
- "443:443"
- "8081:80"
- "443:8443"
- "8081:8080"
networks:
- qa-integration
volumes:
Expand All @@ -18,6 +18,8 @@ services:
build:
dockerfile: ./Dockerfile-testinfra
context: .
environment:
PMM_SERVER_CONTAINER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
volumes:
- ./test:/test
- /var/run/docker.sock:/var/run/docker.sock:ro
Expand Down
14 changes: 7 additions & 7 deletions pmm_psmdb-pbm_setup/docker-compose-rs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- PMM_REPO=${PMM_REPO:-experimental}
- PBM_VERSION=${PBM_VERSION:-latest}
- PSMDB_VERSION=${PSMDB_VERSION:-latest}
- PMM_CLIENT_VERSION=${PMM_CLIENT_VERSION:-latest}
- PMM_CLIENT_VERSION=${PMM_CLIENT_VERSION:-3-dev-latest}
command: /bin/bash

rs101:
Expand All @@ -36,7 +36,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand All @@ -62,7 +62,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand All @@ -88,7 +88,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand Down Expand Up @@ -116,7 +116,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand All @@ -142,7 +142,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand All @@ -168,7 +168,7 @@ services:
privileged: true
environment:
PBM_MONGODB_URI: mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:443}
PMM_AGENT_SERVER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
PMM_AGENT_SERVER_USERNAME: admin
PMM_AGENT_SERVER_PASSWORD: ${ADMIN_PASSWORD:-password}
PMM_AGENT_SERVER_INSECURE_TLS: 1
Expand Down
30 changes: 16 additions & 14 deletions pmm_psmdb-pbm_setup/docker-compose-sharded.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ services:
context: .
args:
- REPO=${REPO:-testing}
- PMM_REPO=${PMM_REPO:-release}
- PMM_REPO=${PMM_REPO:-experimental}
- PBM_VERSION=${PBM_VERSION:-latest}
- PSMDB_VERSION=${PSMDB_VERSION:-latest}
- PMM_CLIENT_VERSION=${PMM_CLIENT_VERSION:-latest}
- PMM_CLIENT_VERSION=${PMM_CLIENT_VERSION:-3-dev-latest}
command: /bin/bash

rs101:
Expand All @@ -24,7 +24,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -44,7 +44,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -64,7 +64,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -84,7 +84,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -104,7 +104,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -124,7 +124,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -144,7 +144,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -164,7 +164,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand All @@ -184,7 +184,7 @@ services:
privileged: true
environment:
- "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:443"
- "PMM_AGENT_SERVER_ADDRESS=pmm-server:8443"
- "PMM_AGENT_SERVER_USERNAME=admin"
- "PMM_AGENT_SERVER_PASSWORD=password"
- "PMM_AGENT_SERVER_INSECURE_TLS=1"
Expand Down Expand Up @@ -237,14 +237,14 @@ services:
/bin/sh -c " sleep 5; /usr/bin/mc config host add myminio http://minio:9000 minio1234 minio1234; /usr/bin/mc mb myminio/bcp; exit 0; "

pmm-server:
image: ${PMM_IMAGE:-perconalab/pmm-server:dev-latest}
image: ${PMM_IMAGE:-perconalab/pmm-server:3-dev-latest}
container_name: pmm-server
environment:
- "PMM_DEBUG=1"
- "ENABLE_BACKUP_MANAGEMENT=1"
ports:
- "443:443"
- "8081:80"
- "443:8443"
- "8081:8080"
networks:
- test-network
volumes:
Expand All @@ -254,6 +254,8 @@ services:
build:
dockerfile: ./Dockerfile-testinfra
context: .
environment:
PMM_SERVER_CONTAINER_ADDRESS: ${PMM_SERVER_CONTAINER_ADDRESS:-pmm-server:8443}
volumes:
- ./test:/test
- /var/run/docker.sock:/var/run/docker.sock:ro
Expand Down
Loading