Updates fix pgsm support (#109)

Author: saikumar-vs

pmm_qa/pdpgsql_pgsm_setup.yml

@@ -15,7 +15,7 @@
     pgstat_monitor_branch: "{{ lookup('vars', 'extra_pgstat_monitor_branch', default=lookup('env','PGSTAT_MONITOR_BRANCH') | default('2.1.0', true) ) }}"
     pgstat_monitor_repo: "{{ lookup('vars', 'extra_pgstat_monitor_repo', default=lookup('env','PGSTAT_MONITOR_REPO') | default('percona/pg_stat_monitor', true) ) }}"
     use_socket: "{{ lookup('vars', 'extra_pdpgsql_version', default=lookup('env','USE_SOCKET') | default('', true) ) }}"
-    port: "{{ lookup('vars', 'extra_pdpgsql_port', default=lookup('env','PORT') | default(5447, true) ) }}"
+    pdpgsql_pgsm_port: "{{ lookup('vars', 'extra_pdpgsql_port', default=lookup('env','PDPGSQL_PGSM_PORT') | default(5447, true) ) }}"
     distribution: "{{ lookup('vars', 'extra_pdpgsql_distribution', default=lookup('env','DISTRIBUTION') | default('PPG', true) ) }}"
 
   tasks:
@@ -33,7 +33,7 @@
   - name: Prepare Container for PostgreSQL
     shell: >
       sudo docker run -d --name={{ pdpgsql_pgsm_container }}
-      -p {{ port }}:5432
+      -p {{ pdpgsql_pgsm_port }}:5432
       phusion/baseimage:jammy-1.0.1
   
   - name: Copy all required Artifacts to the docker pdpgsql_pgsm_container

pmm_qa/pgsql_pgss_setup.yml

@@ -8,7 +8,7 @@
   vars:
     pgsql_version: "{{ lookup('vars', 'extra_pgsql_version', default=lookup('env','PGSQL_VERSION') | default('14', true) ) }}"
     pgsql_pgss_container: "{{ lookup('vars', 'extra_pgsql_pgss_container', default=lookup('env','PGSQL_PGSS_CONTAINER') | default('pgsql_pgss', true) ) }}"
-    pgsql_pgss_port: "{{ lookup('vars', 'extra_pgsql_port', default=lookup('env','PGSQL_PGSS_PORT') | default('5438', true) ) }}"
+    pgsql_pgss_port: "{{ lookup('vars', 'extra_pgsql_port', default=lookup('env','PGSQL_PGSS_PORT') | default('5448', true) ) }}"
     pmm_server_ip: "{{ lookup('vars', 'extra_pmm_server_ip', default=lookup('env','PMM_SERVER_IP') | default('127.0.0.1', true) ) }}"
     client_version: "{{ lookup('vars', 'extra_client_version', default=lookup('env','CLIENT_VERSION') | default('dev-latest', true) ) }}"
     admin_password: "{{ lookup('vars', 'extra_admin_password', default=lookup('env','ADMIN_PASSWORD') | default('admin', true) ) }}"

pmm_qa/pmm-framework.py

@@ -284,7 +284,7 @@ def setup_pdpgsql(db_type, db_version=None, db_config=None, args=None):
         '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',
-        'PORT': 5447,
+        'PDPGSQL_PGSM_PORT': 5447,
         'DISTRIBUTION': '',
         'PMM_QA_GIT_BRANCH': os.getenv('PMM_QA_GIT_BRANCH') or 'v3'
     }
@@ -337,20 +337,18 @@ def setup_pgsql(db_type, db_version=None, db_config=None, args=None):
 
     # Define environment variables for playbook
     env_vars = {
-        'PDPGSQL_VERSION': pgsql_version,
-        'PGSTAT_MONITOR_BRANCH': 'main',
+        'PGSQL_VERSION': pgsql_version,
         'PMM_SERVER_IP': args.pmm_server_ip or container_name or '127.0.0.1',
-        'PDPGSQL_PGSM_CONTAINER': 'pgsql_pgsm_pmm_' + str(pgsql_version),
+        'PGSQL_PGSM_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',
-        'PORT': 5448,
-        'DISTRIBUTION': 'PGDG',
+        'PGSQL_PGSS_PORT': 5448,
         'PMM_QA_GIT_BRANCH': os.getenv('PMM_QA_GIT_BRANCH') or 'v3'
     }
 
     # Ansible playbook filename
-    playbook_filename = 'pdpgsql_pgsm_setup.yml'
+    playbook_filename = 'pgsql_pgss_setup.yml'
 
     # Call the function to run the Ansible playbook
     run_ansible_playbook(playbook_filename, env_vars, args)