From a642db444f8f5da20feca74a9ca4442d03409235 Mon Sep 17 00:00:00 2001 From: Saikumar Date: Tue, 26 Mar 2024 16:34:27 +0530 Subject: [PATCH] Updates for PMM3 Support and Sync with V3 Branch --- pmm_psmdb-pbm_setup/Dockerfile | 26 ++++----- pmm_qa/haproxy_setup.yml | 4 +- pmm_qa/ms_pmm_setup.yml | 4 +- pmm_qa/pdpgsql_pgsm_setup.yml | 4 +- pmm_qa/pgsql_pgss_setup.yml | 4 +- pmm_qa/pmm-framework.py | 39 +++++++++----- ...2-client-setup.sh => pmm3-client-setup.sh} | 53 ++++++++++--------- pmm_qa/ps_pmm_setup.yml | 4 +- pmm_qa/psmdb_setup.yml | 4 +- pmm_qa/pxc_proxysql_setup.yml | 4 +- 10 files changed, 79 insertions(+), 67 deletions(-) rename pmm_qa/{pmm2-client-setup.sh => pmm3-client-setup.sh} (61%) diff --git a/pmm_psmdb-pbm_setup/Dockerfile b/pmm_psmdb-pbm_setup/Dockerfile index ea2c0db..bca3144 100644 --- a/pmm_psmdb-pbm_setup/Dockerfile +++ b/pmm_psmdb-pbm_setup/Dockerfile @@ -52,19 +52,19 @@ 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 \ - percona-release enable original testing && \ - yum update --refresh -y && \ - yum -y install pmm2-client ; \ - + 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 pmm-client ; \ else \ yum -y install pmm-client-${PMM_CLIENT_VERSION}-6.el9 ; \ fi && \ diff --git a/pmm_qa/haproxy_setup.yml b/pmm_qa/haproxy_setup.yml index f5c6c99..d106838 100644 --- a/pmm_qa/haproxy_setup.yml +++ b/pmm_qa/haproxy_setup.yml @@ -43,9 +43,9 @@ - name: Install pmm2-client on the haproxy_container shell: "{{ item }}" with_items: - - docker exec {{ haproxy_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ haproxy_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ haproxy_container }} - - docker exec {{ haproxy_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ haproxy_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Wait for Haproxy building to be finished and binary available shell: docker exec {{ haproxy_container }} ls -la /usr/sbin/haproxy diff --git a/pmm_qa/ms_pmm_setup.yml b/pmm_qa/ms_pmm_setup.yml index 1358a52..158a5a8 100644 --- a/pmm_qa/ms_pmm_setup.yml +++ b/pmm_qa/ms_pmm_setup.yml @@ -60,9 +60,9 @@ - name: Install pmm2-client on the ms_container shell: "{{ item }}" with_items: - - docker exec {{ ms_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ ms_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ ms_container }} - - docker exec {{ ms_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ ms_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Execute Setup script inside the MySQL ms_container shell: "{{ item }}" diff --git a/pmm_qa/pdpgsql_pgsm_setup.yml b/pmm_qa/pdpgsql_pgsm_setup.yml index 76c26e9..9170d1d 100644 --- a/pmm_qa/pdpgsql_pgsm_setup.yml +++ b/pmm_qa/pdpgsql_pgsm_setup.yml @@ -49,9 +49,9 @@ - name: Install pmm2-client on the pdpgsql_pgsm_container shell: "{{ item }}" with_items: - - docker exec {{ pdpgsql_pgsm_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ pdpgsql_pgsm_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ pdpgsql_pgsm_container }} - - docker exec {{ pdpgsql_pgsm_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ pdpgsql_pgsm_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Set Random Number Fact set_fact: diff --git a/pmm_qa/pgsql_pgss_setup.yml b/pmm_qa/pgsql_pgss_setup.yml index c09cb4f..d1c3f0e 100644 --- a/pmm_qa/pgsql_pgss_setup.yml +++ b/pmm_qa/pgsql_pgss_setup.yml @@ -47,9 +47,9 @@ - name: Install pmm2-client on the pgsql_pgss_container shell: "{{ item }}" with_items: - - docker exec {{ pgsql_pgss_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ pgsql_pgss_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ pgsql_pgss_container }} - - docker exec {{ pgsql_pgss_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ pgsql_pgss_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Set Random Number Fact set_fact: diff --git a/pmm_qa/pmm-framework.py b/pmm_qa/pmm-framework.py index 2d9e779..02c0375 100755 --- a/pmm_qa/pmm-framework.py +++ b/pmm_qa/pmm-framework.py @@ -8,24 +8,24 @@ database_configs = { "PSMDB": { "versions": ["4.4", "5.0", "6.0", "7.0", "latest"], - "configurations": {"CLIENT_VERSION": "dev-latest", "SETUP_TYPE": "replica", "COMPOSE_PROFILES": "classic", "TARBALL": ""} + "configurations": {"CLIENT_VERSION": "3-dev-latest", "SETUP_TYPE": "pss", "COMPOSE_PROFILES": "classic", "TARBALL": ""} }, "MYSQL": { "versions": ["8.0"], - "configurations": {"QUERY_SOURCE": "perfschema", "GROUP_REPLICATION": "", "CLIENT_VERSION": "dev-latest", + "configurations": {"QUERY_SOURCE": "perfschema", "GROUP_REPLICATION": "", "CLIENT_VERSION": "3-dev-latest", "TARBALL": ""} }, "PDMYSQL": { "versions": ["5.7", "8.0"], - "configurations": {"QUERY_SOURCE": "perfschema", "CLIENT_VERSION": "dev-latest", "TARBALL": ""} + "configurations": {"QUERY_SOURCE": "perfschema", "CLIENT_VERSION": "3-dev-latest", "TARBALL": ""} }, "PGSQL": { "versions": ["11", "12", "13", "14", "15", "16"], - "configurations": {"QUERY_SOURCE": "pgstatements", "CLIENT_VERSION": "dev-latest", "USE_SOCKET": ""} + "configurations": {"QUERY_SOURCE": "pgstatements", "CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": ""} }, "PDPGSQL": { "versions": ["11", "12", "13", "14", "15", "16"], - "configurations": {"CLIENT_VERSION": "dev-latest", "USE_SOCKET": ""} + "configurations": {"CLIENT_VERSION": "3-dev-latest", "USE_SOCKET": ""} }, } @@ -91,7 +91,7 @@ def get_value(key, db_type, args, db_config): # Only for client_version we accept global command line argument if key == "CLIENT_VERSION" and args.client_version is not None: - return args.client_version.upper() + return args.client_version # Check if the variable exists in the args config config_value = db_config.get(key) @@ -121,7 +121,8 @@ def setup_pdmysql(db_type, db_version=None, db_config=None, args=None): 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), 'QUERY_SOURCE': get_value('QUERY_SOURCE', db_type, args, db_config), 'PS_TARBALL': get_value('TARBALL', db_type, args, db_config), - 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin' + 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin', + 'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'PMM7-Framework' } # Ansible playbook filename @@ -151,7 +152,8 @@ def setup_mysql(db_type, db_version=None, db_config=None, args=None): 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), 'QUERY_SOURCE': get_value('QUERY_SOURCE', db_type, args, db_config), 'MS_TARBALL': get_value('TARBALL', db_type, args, db_config), - 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin' + 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin', + 'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'PMM7-Framework' } # Ansible playbook filename @@ -179,7 +181,8 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None): 'PDPGSQL_PGSM_CONTAINER': 'pdpgsql_pgsm_pmm_' + str(pdpgsql_version), 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), 'USE_SOCKET': get_value('USE_SOCKET', db_type, args, db_config), - 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin' + 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin', + 'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'PMM7-Framework' } # Ansible playbook filename @@ -206,7 +209,8 @@ def setup_pgsql(db_type, db_version=None, db_config=None, args=None): 'PGSQL_PGSS_CONTAINER': 'pgsql_pgss_pmm_' + str(pgsql_version), 'CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), 'USE_SOCKET': get_value('USE_SOCKET', db_type, args, db_config), - 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin' + 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin', + 'PMM_QA_GIT_BRANCH': os.getenv('ADMIN_PASSWORD') or 'PMM7-Framework' } # Ansible playbook filename @@ -294,7 +298,8 @@ def setup_psmdb(db_type, db_version=None, db_config=None, args=None): 'PSMDB_CONTAINER': 'psmdb_pmm_' + str(psmdb_version), 'ADMIN_PASSWORD': os.getenv('ADMIN_PASSWORD') or args.pmm_server_password or 'admin', 'PMM_CLIENT_VERSION': get_value('CLIENT_VERSION', db_type, args, db_config), - 'COMPOSE_PROFILES': get_value('COMPOSE_PROFILES', db_type, args, db_config) + 'COMPOSE_PROFILES': get_value('COMPOSE_PROFILES', db_type, args, db_config), + 'MONGO_SETUP_TYPE': get_value('SETUP_TYPE', db_type, args, db_config), } # Docker Compose filename @@ -310,7 +315,7 @@ def setup_psmdb(db_type, db_version=None, db_config=None, args=None): execute_docker_compose(compose_filename, commands, env_vars, args) shell_scripts = [] - if get_value('SETUP_TYPE', db_type, args, db_config).lower() == "replica": + if get_value('SETUP_TYPE', db_type, args, db_config).lower() == "pss": # Shell script names shell_scripts = ['configure-replset.sh', 'configure-agents.sh'] @@ -318,6 +323,11 @@ def setup_psmdb(db_type, db_version=None, db_config=None, args=None): if get_value('COMPOSE_PROFILES', db_type, args, db_config).lower() == "extra": shell_scripts.append('configure-extra-replset.sh') shell_scripts.append('configure-extra-agents.sh') + elif get_value('SETUP_TYPE', db_type, args, db_config).lower() == "psa": + # Shell script names + shell_scripts = ['configure-psa.sh', 'configure-agents.sh'] + else: + print("Todo Sharding") # Execute shell scripts execute_shell_scripts(shell_scripts) @@ -358,8 +368,9 @@ def setup_database(db_type, db_version=None, db_config=None, args=None): parser.add_argument("--database", action='append', nargs=1, metavar='db_name[,=version][,option1=value1,option2=value2,...]', help="(e.g: " - "--database mysql=5.7,QUERY_SOURCE=perfschema,CLIENT_VERSION=dev-latest " - "--database pdpgsql=16,USE_SOCKET=1,CLIENT_VERSION=2.41.1)") + "--database mysql=5.7,QUERY_SOURCE=perfschema,CLIENT_VERSION=3-dev-latest " + "--database pdpgsql=16,USE_SOCKET=1,CLIENT_VERSION=3.0.0 " + "--database psmdb=latest,SETUP_TYPE=psa,CLIENT_VERSION=3.0.0)") parser.add_argument("--pmm-server-ip", nargs='?', help='PMM Server IP to connect', default='pmm-server') parser.add_argument("--pmm-server-password", nargs='?', help='PMM Server password') parser.add_argument("--client-version", nargs='?', help='PMM Client version/tarball') diff --git a/pmm_qa/pmm2-client-setup.sh b/pmm_qa/pmm3-client-setup.sh similarity index 61% rename from pmm_qa/pmm2-client-setup.sh rename to pmm_qa/pmm3-client-setup.sh index 146f373..54c144b 100755 --- a/pmm_qa/pmm2-client-setup.sh +++ b/pmm_qa/pmm3-client-setup.sh @@ -48,50 +48,51 @@ apt-get update export PMM_AGENT_SETUP_NODE_NAME=client_container_$(echo $((1 + $RANDOM % 9999))) mv -v /artifacts/* . -if [[ "$client_version" == "dev-latest" ]]; then +if [[ "$client_version" == "3-dev-latest" ]]; then percona-release enable-only original experimental apt-get update - apt-get -y install pmm2-client + apt-get -y install pmm-client fi -if [[ "$client_version" == "pmm2-rc" ]]; then +if [[ "$client_version" == "pmm3-rc" ]]; then percona-release enable-only original testing apt-get update - apt-get -y install pmm2-client + apt-get -y install pmm-client fi -if [[ "$client_version" == "pmm2-latest" ]]; then - apt-get -y install pmm2-client +if [[ "$client_version" == "pmm3-latest" ]]; then + apt-get -y install pmm-client apt-get -y update percona-release enable-only original experimental fi -## only supported for debian based systems for now -if [[ "$client_version" == 2* ]]; then - wget -O pmm2-client.deb https://repo.percona.com/pmm2-client/apt/pool/main/p/pmm2-client/pmm2-client_${client_version}-6.$(lsb_release -sc)_amd64.deb - dpkg -i pmm2-client.deb +## Only supported for debian based systems for now +if [[ "$client_version" == 3* ]]; then + ## Note: only experimental packages are present atm. + wget -O pmm-client.deb https://repo.percona.com/pmm3-client/apt/pool/experimental/p/pmm-client/pmm-client_${client_version}-6.$(lsb_release -sc)_amd64.deb + dpkg -i pmm-client.deb fi ## Default Binary path -path="/usr/local/percona/pmm2"; +path="/usr/local/percona/pmm"; ## As export PATH is not working link the paths ln -sf ${path}/bin/pmm-admin /usr/local/bin/pmm-admin ln -sf ${path}/bin/pmm-agent /usr/local/bin/pmm-agent if [[ "$client_version" == http* ]]; then if [[ "$install_client" == "yes" ]]; then - wget -O pmm2-client.tar.gz --progress=dot:giga "${client_version}" + wget -O pmm-client.tar.gz --progress=dot:giga "${client_version}" fi - tar -zxpf pmm2-client.tar.gz - rm -r pmm2-client.tar.gz - PMM2_CLIENT=`ls -1td pmm2-client* 2>/dev/null | grep -v ".tar" | grep -v ".sh" | head -n1` - echo ${PMM2_CLIENT} - rm -rf pmm2-client - mv ${PMM2_CLIENT} pmm2-client - rm -rf /usr/local/bin/pmm2-client - mv -f pmm2-client /usr/local/bin - pushd /usr/local/bin/pmm2-client - ## only setting up all binaries in default path /usr/local/percona/pmm2 + tar -zxpf pmm-client.tar.gz + rm -r pmm-client.tar.gz + PMM_CLIENT=`ls -1td pmm-client* 2>/dev/null | grep -v ".tar" | grep -v ".sh" | head -n1` + echo ${PMM_CLIENT} + rm -rf pmm-client + mv ${PMM_CLIENT} pmm-client + rm -rf /usr/local/bin/pmm-client + mv -f pmm-client /usr/local/bin + pushd /usr/local/bin/pmm-client + ## only setting up all binaries in default path /usr/local/percona/pmm bash -x ./install_tarball ${upgrade} pwd popd @@ -102,20 +103,20 @@ fi if [[ -z "$upgrade" ]]; then if [[ "$use_metrics_mode" == "yes" ]]; then echo "setup pmm-agent" - pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmm_server_ip}:443 --server-insecure-tls --metrics-mode=${metrics_mode} --server-username=admin --server-password=${admin_password} + pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=${pmm_server_ip}:8443 --server-insecure-tls --metrics-mode=${metrics_mode} --server-username=admin --server-password=${admin_password} else echo "setup pmm-agent" - pmm-agent setup --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml --server-address=${pmm_server_ip}:443 --server-insecure-tls --server-username=admin --server-password=${admin_password} + pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=${pmm_server_ip}:8443 --server-insecure-tls --server-username=admin --server-password=${admin_password} fi sleep 10 - pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml > pmm-agent.log 2>&1 & + pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > pmm-agent.log 2>&1 & sleep 10 else pid=`ps -ef | grep pmm-agent | grep -v grep | awk -F ' ' '{print $2}'` if [[ ! -z "$pid" ]]; then kill -9 $pid echo "killed old agent, restarting agent...." - pmm-agent --config-file=/usr/local/percona/pmm2/config/pmm-agent.yaml > pmm-agent.log 2>&1 & + pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > pmm-agent.log 2>&1 & sleep 10 fi fi diff --git a/pmm_qa/ps_pmm_setup.yml b/pmm_qa/ps_pmm_setup.yml index 6e541fd..419429b 100644 --- a/pmm_qa/ps_pmm_setup.yml +++ b/pmm_qa/ps_pmm_setup.yml @@ -59,9 +59,9 @@ - name: Install pmm2-client on the ps_container shell: "{{ item }}" with_items: - - docker exec {{ ps_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ ps_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ ps_container }} - - docker exec {{ ps_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ ps_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Execute Setup script inside the ps ps_container shell: "{{ item }}" diff --git a/pmm_qa/psmdb_setup.yml b/pmm_qa/psmdb_setup.yml index d051a47..8dd03d4 100644 --- a/pmm_qa/psmdb_setup.yml +++ b/pmm_qa/psmdb_setup.yml @@ -38,10 +38,10 @@ - name: Install pmm2-client on the psmdb_container shell: "{{ item }}" with_items: - - docker exec {{ psmdb_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ psmdb_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker exec {{ psmdb_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/mongodb_user_setup.js - docker network connect pmm-qa {{ psmdb_container }} - - docker exec {{ psmdb_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ psmdb_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - name: Setup psmdb for monitoring shell: "{{ item }}" diff --git a/pmm_qa/pxc_proxysql_setup.yml b/pmm_qa/pxc_proxysql_setup.yml index aad6360..9fa5a12 100644 --- a/pmm_qa/pxc_proxysql_setup.yml +++ b/pmm_qa/pxc_proxysql_setup.yml @@ -78,9 +78,9 @@ - name: Install pmm2-client on the pxc_container shell: "{{ item }}" with_items: - - docker exec {{ pxc_container }} wget https://raw.githubusercontent.com/percona/pmm-qa/{{ pmm_qa_branch }}/pmm-tests/pmm2-client-setup.sh + - docker exec {{ pxc_container }} wget https://raw.githubusercontent.com/Percona-Lab/qa-integration/{{ pmm_qa_branch }}/pmm_qa/pmm3-client-setup.sh - docker network connect pmm-qa {{ pxc_container }} - - docker exec {{ pxc_container }} bash -x ./pmm2-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no + - docker exec {{ pxc_container }} bash -x ./pmm3-client-setup.sh --pmm_server_ip {{ pmm_server_ip }} --client_version {{ client_version }} --admin_password {{ admin_password }} --use_metrics_mode no - docker exec {{ pxc_container }} usermod -aG pmm-agent pxc - name: Execute User & Proxysql Setup inside the PXC pxc_container