corrected per YANG schema

sonic-net · Jul 11, 2022 · e5be04f · e5be04f
1 parent 9423d0d
commit e5be04f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/dockers/docker-fpm-frr/bgp_regex.json b/dockers/docker-fpm-frr/bgp_regex.json
@@ -1,13 +1,8 @@
 [
     {
-        "tag": "bgp_down",
-        "regex": "Peer .default\\|([0-9a-f:.]*[0-9a-f]*). admin state is set to .down.",
-        "params": [ "peer_ip" ]
-    },
-    {
-        "tag": "bgp_up",
-        "regex": "Peer .default\\|([0-9a-f:.]*[0-9a-f]*). admin state is set to .up.",
-        "params": [ "peer_ip" ]
+        "tag": "bgp-state",
+        "regex": "Peer .default\\|([0-9a-f:.]*[0-9a-f]*). admin state is set to .(up|down).",
+        "params": [ "peer_ip", "status" ]
     }
 ]
 
diff --git a/files/build_templates/rsyslog_plugin.conf.j2 b/files/build_templates/rsyslog_plugin.conf.j2
@@ -10,7 +10,7 @@ template(name="prog_msg" type="list") {
 $ModLoad omprog
 
 {% for proc in proclist %}
-if startswith($programname, "{{ proc.name }}") then {
+if re_match($programname, "{{ proc.name }}") then {
     action(type="omprog"
         binary="/usr/share/sonic/scripts/rsyslog_plugin -r /etc/rsyslog.d/{{ proc.parse_json }} -m {{ yang_module }}"
         output="/var/log/rsyslog_plugin.log"