Merge branch 'v3' into PMM-13302-oraclelinux-fips

percona · Oct 2, 2024 · 1891697 · 1891697
2 parents 58d0e47 + 730ef71
commit 1891697
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/build/packages/deb/postinst b/build/packages/deb/postinst
@@ -21,7 +21,13 @@ case "$1" in
             mv /usr/local/percona/pmm/config/pmm-agent.yaml /usr/local/percona/pmm/config/pmm-agent.yaml.new
 
             echo "Restoring pmm-agent.yaml from backup..."
-            mv /usr/local/percona/pmm2/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml
+            # Take a backup of pmm-agent.yaml and then modify it to remove paths properties
+            mv /usr/local/percona/pmm2/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml.bak
+            cp /usr/local/percona/pmm/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml
+            sed '/^paths:/,/^[^[:space:]]/ {
+                 /^paths:/d
+                 /^[^[:space:]]/!d
+            }' "/usr/local/percona/pmm/config/pmm-agent.yaml" > "/usr/local/percona/pmm/config/pmm-agent.yaml.tmp" && mv "/usr/local/percona/pmm/config/pmm-agent.yaml.tmp" "/usr/local/percona/pmm/config/pmm-agent.yaml"
 
             # Clean up old directories if empty
             if [ -d /usr/local/percona/pmm2/config ] && [ -z "$(ls -A /usr/local/percona/pmm2/config)" ]; then

diff --git a/build/packages/deb/postrm b/build/packages/deb/postrm
@@ -28,6 +28,9 @@ if [ "$1" = "purge" ]; then
     if [ -f /usr/local/percona/pmm/config/pmm-agent.yaml.new ]; then
         rm -f /usr/local/percona/pmm/config/pmm-agent.yaml.new
     fi
+    if [ -f /usr/local/percona/pmm/config/pmm-agent.yaml.bak ]; then
+        rm -f /usr/local/percona/pmm/config/pmm-agent.yaml.bak
+    fi
 
     if [ -d /usr/local/percona/pmm/config ] && [ -z "$(ls -A /usr/local/percona/pmm/config)" ]; then
         rmdir /usr/local/percona/pmm/config

diff --git a/build/packages/rpm/client/pmm-client.spec b/build/packages/rpm/client/pmm-client.spec
@@ -44,7 +44,13 @@ fi
 %posttrans
 if [ -f /usr/local/percona/pmm2/config/pmm-agent.yaml.bak ]; then
     mv /usr/local/percona/pmm/config/pmm-agent.yaml /usr/local/percona/pmm/config/pmm-agent.yaml.new
-    mv /usr/local/percona/pmm2/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml
+    # Take a backup of pmm-agent.yaml and then modify it to remove paths properties
+    mv /usr/local/percona/pmm2/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml.bak
+    cp /usr/local/percona/pmm/config/pmm-agent.yaml.bak /usr/local/percona/pmm/config/pmm-agent.yaml
+    sed '/^paths:/,/^[^[:space:]]/ {
+        /^paths:/d
+        /^[^[:space:]]/!d
+    }' "/usr/local/percona/pmm/config/pmm-agent.yaml" > "/usr/local/percona/pmm/config/pmm-agent.yaml.tmp" && mv "/usr/local/percona/pmm/config/pmm-agent.yaml.tmp" "/usr/local/percona/pmm/config/pmm-agent.yaml"
 
     if [ -d /usr/local/percona/pmm2/config ] && [ ! "$(ls -A /usr/local/percona/pmm2/config)" ]; then
        rmdir /usr/local/percona/pmm2/config