Merge 36b15d4 into 06bdc67

napalm-automation · Nov 12, 2020 · 02a7290 · 02a7290
2 parents 06bdc67 + 36b15d4
commit 02a7290
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 4 deletions.
diff --git a/napalm_logs/config/junos/SYSTEM_ALARM.yml b/napalm_logs/config/junos/SYSTEM_ALARM.yml
@@ -11,7 +11,7 @@ messages:
     values:
       component: (FPC \d)
       color|color_to_severity: (\w+)
-      reason: ([\w ]+)
+      reason: (.*)
     line: 'FPC color={color}, class=CHASSIS, reason={component} {reason}'
     model: ietf-hardware
     mapping:
@@ -29,7 +29,7 @@ messages:
       component: (\w+)
       color|color_to_severity: (\w+)
       class: (\w+)
-      reason: ([\w ]+)
+      reason: (.*)
     line: '{component} color={color}, class={class}, reason={reason}'
     model: ietf-hardware
     mapping:

diff --git a/napalm_logs/config/junos/SYSTEM_ALARM_CLEARED.yml b/napalm_logs/config/junos/SYSTEM_ALARM_CLEARED.yml
@@ -4,7 +4,7 @@ messages:
     values:
       component: (FPC \d)
       color|color_to_severity: (\w+)
-      reason: ([\w ]+)
+      reason: (.*)
     line: 'FPC color={color}, class=CHASSIS, reason={component} {reason}'
     model: ietf-hardware
     mapping:
@@ -22,7 +22,7 @@ messages:
       component: (\w+)
       color|color_to_severity: (\w+)
       class: (\w+)
-      reason: ([\w ]+)
+      reason: (.*)
     line: '{component} color={color}, class={class}, reason={reason}'
     model: ietf-hardware
     mapping:

diff --git a/tests/config/junos/SYSTEM_ALARM/reason_nonalpha/syslog.msg b/tests/config/junos/SYSTEM_ALARM/reason_nonalpha/syslog.msg
@@ -0,0 +1 @@
+<28>Jul  8 23:04:13  vmx01 alarmd[2449]: Alarm set: RE color=YELLOW, class=CHASSIS, reason=RE 0 /var partition usage is high
diff --git a/tests/config/junos/SYSTEM_ALARM/reason_nonalpha/yang.json b/tests/config/junos/SYSTEM_ALARM/reason_nonalpha/yang.json
@@ -0,0 +1,37 @@
+{
+  "severity": 4, 
+  "timestamp": 1594249453, 
+  "os": "junos", 
+  "message_details": {
+    "processName": "alarmd", 
+    "severity": 4, 
+    "tag": "Alarm set", 
+    "hostPrefix": null, 
+    "time": "23:04:13", 
+    "pri": "28", 
+    "message": "RE color=YELLOW, class=CHASSIS, reason=RE 0 /var partition usage is high", 
+    "facility": 3, 
+    "host": "vmx01", 
+    "date": "Jul  8", 
+    "processId": "2449"
+  }, 
+  "yang_model": "ietf-hardware", 
+  "yang_message": {
+    "hardware-state": {
+      "component": {
+        "RE": {
+          "class": "CHASSIS", 
+          "name": "RE", 
+          "state": {
+            "alarm-state": 4, 
+            "alarm-reason": "RE 0 /var partition usage is high"
+          }
+        }
+      }
+    }
+  }, 
+  "error": "SYSTEM_ALARM", 
+  "facility": 3, 
+  "host": "vmx01", 
+  "ip": "127.0.0.1"
+}
diff --git a/tests/config/junos/SYSTEM_ALARM_CLEARED/reason_nonalpha/syslog.msg b/tests/config/junos/SYSTEM_ALARM_CLEARED/reason_nonalpha/syslog.msg
@@ -0,0 +1 @@
+<28>Jul  8 23:04:13  vmx01 alarmd[2449]: Alarm cleared: RE color=YELLOW, class=CHASSIS, reason=RE 0 /var partition usage is high
diff --git a/tests/config/junos/SYSTEM_ALARM_CLEARED/reason_nonalpha/yang.json b/tests/config/junos/SYSTEM_ALARM_CLEARED/reason_nonalpha/yang.json
@@ -0,0 +1,37 @@
+{
+  "severity": 4, 
+  "timestamp": 1594249453, 
+  "os": "junos", 
+  "message_details": {
+    "processName": "alarmd", 
+    "severity": 4, 
+    "tag": "Alarm cleared", 
+    "hostPrefix": null, 
+    "time": "23:04:13", 
+    "pri": "28", 
+    "message": "RE color=YELLOW, class=CHASSIS, reason=RE 0 /var partition usage is high", 
+    "facility": 3, 
+    "host": "vmx01", 
+    "date": "Jul  8", 
+    "processId": "2449"
+  }, 
+  "yang_model": "ietf-hardware", 
+  "yang_message": {
+    "hardware-state": {
+      "component": {
+        "RE": {
+          "class": "CHASSIS", 
+          "name": "RE", 
+          "state": {
+            "alarm-state": 4, 
+            "alarm-reason": "RE 0 /var partition usage is high"
+          }
+        }
+      }
+    }
+  }, 
+  "error": "SYSTEM_ALARM_CLEARED", 
+  "facility": 3, 
+  "host": "vmx01", 
+  "ip": "127.0.0.1"
+}