PMM-14125 scripts update (#160)

* PMM-14125 fix ip bug

* PMM-14125 fix ip bug

* PMM-7: Generate Random suffix on percona server service name

* PMM-14125 fix diff auth execution

* PMM-14125 verify diff auth fix

* PMM-14125 verify diff auth fix

* PMM-14125 verify diff auth fix

* PMM-14125 revert workflow changes

---------

Co-authored-by: Peter Sirotnak <[email protected]>

Author: yurkovychv

.github/workflows/PMM_PSMDB_PBM_FULL.yml

@@ -73,3 +73,11 @@ jobs:
       run: |
         PSMDB_VERSION=${{ matrix.psmdb }} ./test-auth.sh
       working-directory: ./pmm_psmdb_diffauth_setup
+    - name: PMM Server container logs
+      if: failure()
+      run: |
+        docker logs pmm-server || true
+    - name: PSMDB Server container logs
+      if: failure()
+      run: |
+        docker logs psmdb-server || true

pmm_qa/percona_server/percona-server-setup.yml

@@ -96,24 +96,9 @@
         container_name: "ps_pmm_{{ ps_version }}_{{ item }}"
       loop: "{{ range(1, nodes_count | int + 1) | list }}"
 
-    - name: Get already connected services to pmm server
-      community.docker.docker_container_exec:
-        container: "ps_pmm_{{ ps_version }}_1"
-        command: >
-          sh -c 'curl --location --insecure -u"admin:{{ admin_password }}" -s --request GET "https://{{ pmm_server_ip }}:{{ '443' if pmm_server_ip is ansible.utils.ipv4 else '8443' }}/v1/management/services" | jq -r ".services[].service_name"'
-      register: pmm_server_services
-
-    - name: Display already connected services to pmm server
-      debug:
-        msg: "{{ pmm_server_services.stdout | split('\n') }}"
-
-    - name: Find out if service is already connected to pmm server
-      block:
-        - name: Loop through percona servers
-          set_fact:
-            random_service_name_value: "_{{ 9999 | random + 1 }}"
-          loop: "{{ range(1, nodes_count | int + 1) | list }}"
-          when: "('ps_pmm_' ~ ps_version ~ '_' ~ item) in pmm_server_services.stdout"
+    - name: Generate random service name suffix
+      set_fact:
+        random_service_name_value: "_{{ 99999 | random + 1 }}"
 
     - name: Add service to pmm server
       community.docker.docker_container_exec:

pmm_qa/pmm3-client-setup.sh

@@ -41,7 +41,7 @@ if [ ! -z "$upgrade" ]; then
 fi
 
 port=8443
-if [[  "$pmm_server_ip" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+if [[  "$pmm_server_ip" =~ \. ]]; then
   port=443
 fi
 
@@ -101,21 +101,21 @@ if [[ "$client_version" == http* ]]; then
     pwd
     popd
     pmm-admin --version
-fi    
+fi
 
 ## Check if we are upgrading or attempting fresh install.
 if [[ -z "$upgrade" ]]; then
     if [[ "$use_metrics_mode" == "yes" ]]; then
         echo "setup pmm-agent"
         pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=${pmm_server_ip}:${port} --server-insecure-tls --metrics-mode=${metrics_mode} --server-username=admin --server-password=${admin_password}
-    else 
+    else
         echo "setup pmm-agent"
         pmm-agent setup --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml --server-address=${pmm_server_ip}:${port} --server-insecure-tls --server-username=admin --server-password=${admin_password}
-    fi    
+    fi
     sleep 10
     pmm-agent --config-file=/usr/local/percona/pmm/config/pmm-agent.yaml > pmm-agent.log 2>&1 &
     sleep 10
-else    
+else
    pid=`ps -ef | grep pmm-agent | grep -v grep | awk -F ' ' '{print $2}'`
    if [[ ! -z "$pid" ]]; then
        kill -9 $pid

pmm_qa/tasks/install_pmm_client.yml

@@ -25,12 +25,12 @@
 - name: Set correct pmm server port
   set_fact:
     pmm_server_port: 443
-  when: pmm_server_ip is ansible.utils.ipv4
+  when: pmm_server_ip | default('') | regex_search('\.')
 
 - name: Set correct pmm server port
   set_fact:
     pmm_server_port: 8443
-  when: pmm_server_ip is not ansible.utils.ipv4
+  when: not (pmm_server_ip | default('') | regex_search('\.'))
 
 - name: Detect OS inside the container
   community.docker.docker_container_exec: