Update mikrotikbackup_clean.yml

mikrotikbackup_clean.yml

@@ -76,22 +76,23 @@
       register: update_info
  
     # ----------------------------
-    # ROBUST PARSING (FINAL FIX)
+    # Debug raw output (remove after confirming parsing works)
     # ----------------------------
-    - name: Split update output
-      set_fact:
-        update_lines: "{{ update_info.stdout[0].split('\n') }}"
+    - name: Debug raw update output
+      debug:
+        msg: "{{ update_info.stdout[0] }}"
  
+    # ----------------------------
+    # PARSING — regex_search with capture groups
+    # ----------------------------
     - name: Extract installed version
       set_fact:
         installed_version: >-
           {{
-            (update_lines
-            | select('search', '^\\s*installed-version:')
-            | list
+            update_info.stdout[0]
+            | regex_search('installed-version:\s*(\S+)', '\1')
             | first
-            | default('installed-version: unknown'))
-            | regex_replace('.*installed-version:\\s*', '')
+            | default('unknown')
             | trim
           }}
  
@@ -99,12 +100,10 @@
       set_fact:
         latest_version: >-
           {{
-            (update_lines
-            | select('search', '^\\s*latest-version:')
-            | list
+            update_info.stdout[0]
+            | regex_search('latest-version:\s*(\S+)', '\1')
             | first
-            | default('latest-version: unknown'))
-            | regex_replace('.*latest-version:\\s*', '')
+            | default('unknown')
             | trim
           }}
  
@@ -112,12 +111,10 @@
       set_fact:
         update_status: >-
           {{
-            (update_lines
-            | select('search', '^\\s*status:')
-            | list
+            update_info.stdout[0]
+            | regex_search('status:\s*(.+)', '\1')
             | first
-            | default('status: unknown'))
-            | regex_replace('.*status:\\s*', '')
+            | default('unknown')
             | trim
           }}
  
@@ -125,12 +122,10 @@
       set_fact:
         update_channel: >-
           {{
-            (update_lines
-            | select('search', '^\\s*channel:')
-            | list
+            update_info.stdout[0]
+            | regex_search('channel:\s*(\S+)', '\1')
             | first
-            | default('channel: unknown'))
-            | regex_replace('.*channel:\\s*', '')
+            | default('unknown')
             | trim
           }}
  
@@ -154,7 +149,7 @@
       set_fact:
         upgrade_needed: >-
           {{
-            not update_failed and
+            not update_failed | bool and
             installed_version != 'unknown' and
             latest_version != 'unknown' and
             installed_version != latest_version
@@ -164,10 +159,10 @@
       debug:
         msg: "Router={{ router_name }} installed={{ installed_version }} latest={{ latest_version }} upgrade_needed={{ upgrade_needed }}"
  
-    - name: Skip upgrade
+    - name: Skip upgrade (already up to date)
       debug:
         msg: "Router {{ router_name }} is already up to date ({{ installed_version }})"
-      when: not upgrade_needed
+      when: not upgrade_needed | bool
  
     # ----------------------------
     # Upgrade
@@ -175,7 +170,7 @@
     - name: Install update
       community.routeros.command:
         commands: /system package update install
-      when: upgrade_needed
+      when: upgrade_needed | bool
       register: upgrade_result
  
     - name: Wait for reboot
@@ -184,41 +179,41 @@
         timeout: 600
         sleep: 10
       when:
-        - upgrade_needed
+        - upgrade_needed | bool
         - upgrade_result is succeeded
  
-    - name: Confirm version
+    - name: Confirm version after upgrade
       community.routeros.command:
         commands: /system resource print
       register: post_upgrade_info
-      when: upgrade_needed
+      when: upgrade_needed | bool
  
     - name: Parse new version
       set_fact:
         post_upgrade_version: >-
           {{
-            (post_upgrade_info.stdout[0]
-            | regex_search('version: ([^\\s]+)')
-            | default('version: unknown'))
-            | regex_replace('version: ', '')
+            post_upgrade_info.stdout[0]
+            | regex_search('version:\s*(\S+)', '\1')
+            | first
+            | default('unknown')
             | trim
           }}
-      when: upgrade_needed
+      when: upgrade_needed | bool
  
     # ----------------------------
     # Checkmk
     # ----------------------------
-    - name: Result when no upgrade
+    - name: Result when no upgrade needed
       set_fact:
-        cmk_state: "{{ 2 if update_failed else 0 }}"
+        cmk_state: "{{ 2 if update_failed | bool else 0 }}"
         cmk_output: >-
-          {{ 'CRIT' if update_failed else 'OK' }} -
+          {{ 'CRIT' if update_failed | bool else 'OK' }} -
           router={{ router_name }}
           installed={{ installed_version }}
           latest={{ latest_version }}
           status="{{ update_status }}"
           upgrade_needed=no
-      when: not upgrade_needed
+      when: not upgrade_needed | bool
  
     - name: Result when upgrade happened
       set_fact:
@@ -226,10 +221,12 @@
         cmk_output: >-
           {{ 'OK' if post_upgrade_version == latest_version else 'CRIT' }} -
           router={{ router_name }}
+          upgraded_from={{ installed_version }}
           upgraded_to={{ post_upgrade_version }}
-      when: upgrade_needed
+          latest={{ latest_version }}
+      when: upgrade_needed | bool
  
-    - name: Send to Checkmk
+    - name: Send result to Checkmk
       delegate_to: localhost
       uri:
         url: "{{ checkmk_url }}"