From 30e75c529884dfd42d1eeb5cb2c49ddf8f2fe782 Mon Sep 17 00:00:00 2001
From: Zachary Puls <zach@zachpuls.com>
Date: Tue, 17 Sep 2024 09:45:54 -0500
Subject: [PATCH 1/2] Update show_alarm.py

Update schema for ShowFacilityAlarmStatus - add syslog_string
---
 src/genie/libs/parser/iosxe/show_alarm.py | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/genie/libs/parser/iosxe/show_alarm.py b/src/genie/libs/parser/iosxe/show_alarm.py
index 2a9d346862..913230ee4e 100644
--- a/src/genie/libs/parser/iosxe/show_alarm.py
+++ b/src/genie/libs/parser/iosxe/show_alarm.py
@@ -294,6 +294,7 @@ class ShowFacilityAlarmStatusSchema(MetaParser):
                     Any() : {
                         Optional('severity'): str,
                         Optional('description'): str,
+                        Optional('syslog_string'): str,
                         Optional('relay'): str,
                         Optional('time'): str,
                         Optional('index'): int,
@@ -330,6 +331,14 @@ def cli(self, output=None):
         # xcvr container 0/0/3       Jan 21 2024 19:15:56   CRITICAL      Transceiver Missing - Link Down [1]
         p4 = re.compile(r'^(?P<source>([\w\/\d\-\_ ]+))\s\s+()?(?P<time>([\w\d\s\:]+))\s\s+(?P<severity>([A-Z]+))\s\s+(?P<description>([\w\s\d\/\/\-]+))\s+(\[(?P<index>(\d+))\])$')
         
+        # Source                     Time                   Severity      Syslog String                  Description [Index]
+        p5 = re.compile(r'^Source(\s+Time)\s+Severity\s+Syslog(\s+String)\s+Description(\s+\[Index])$')
+
+        # Power Supply Module 1      Sep 11 2023 08:06:40   CRITICAL      PSU_FAILURE                    Power Supply Failure [0]
+        # GigabitEthernet0           May 11 2023 02:55:45   INFO          ETHERNET_PORT_ADMIN_DOWN       Physical Port Administrative State Down [2]
+        # xcvr container 0/0/6       May 11 2023 02:57:56   INFO          XCVR_MISSING                   Transceiver Missing [0]
+        p6 = re.compile(r'^(?P<source>([\w\/\d\-\_ ]+))\s\s+()?(?P<time>([\w\d\s\:]+))\s\s+(?P<severity>([A-Z]+))\s\s+(?P<syslog_string>([\w\/\d\-\_ ]+))\s\s+(?P<description>([\w\s\d\/\/\-]+))\s+(\[(?P<index>(\d+))\])$')
+
         for line in out.splitlines():
             line = line.strip()
 
@@ -361,6 +370,21 @@ def cli(self, output=None):
                 alarm_dict = root_dict.setdefault(group['source'].strip().replace(" ","_").lower() , {})
                 alarm_dict.update({'severity' : group['severity'].strip() , 'description':group['description'].strip(), 'index' : int(group['index'].strip()), 'time' : group['time'].strip() })
 
+            # Source                     Time                   Severity      Syslog String                  Description [Index]
+            m = p5.match(line)
+            if m:
+                root_dict = ret_dict.setdefault('alarms', {})
+                continue
+                
+            # Power Supply Module 1      Sep 11 2023 08:06:40   CRITICAL      PSU_FAILURE                    Power Supply Failure [0]
+            # GigabitEthernet0           May 11 2023 02:55:45   INFO          ETHERNET_PORT_ADMIN_DOWN       Physical Port Administrative State Down [2]
+            # xcvr container 0/0/6       May 11 2023 02:57:56   INFO          XCVR_MISSING                   Transceiver Missing [0]
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                alarm_dict = root_dict.setdefault(group['source'].strip().replace(" ","_").lower() , {})
+                alarm_dict.update({'severity' : group['severity'].strip() , 'description':group['description'].strip(), 'syslog_string': group['syslog_string'].strip(),'index' : int(group['index'].strip()), 'time' : group['time'].strip() })
+
         return ret_dict
 
 

From efc7d00d5e219478405054d09febfc644e5c1ae6 Mon Sep 17 00:00:00 2001
From: Zachary Puls <zach@zachpuls.com>
Date: Tue, 17 Sep 2024 09:50:13 -0500
Subject: [PATCH 2/2] Create
 changelog_show_facility_alarm_status_iosxe_20240917094959.rst

---
 ...og_show_facility_alarm_status_iosxe_20240917094959.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 changelog/undistributed/changelog_show_facility_alarm_status_iosxe_20240917094959.rst

diff --git a/changelog/undistributed/changelog_show_facility_alarm_status_iosxe_20240917094959.rst b/changelog/undistributed/changelog_show_facility_alarm_status_iosxe_20240917094959.rst
new file mode 100644
index 0000000000..e9d68b7373
--- /dev/null
+++ b/changelog/undistributed/changelog_show_facility_alarm_status_iosxe_20240917094959.rst
@@ -0,0 +1,8 @@
+--------------------------------------------------------------------------------
+                            Fix
+--------------------------------------------------------------------------------
+* IOSXE
+    * Modified ShowFacilityAlarmStatusSchema:
+        * Update schema to include optional 'syslog_string'.
+    * Modified ShowFacilityAlarmStatus:
+        * Update 'show facility-alarm status', add two new patterns to match table format including "Syslog String".