Event and alarm management

dockers/docker-database/database_config.json.j2

@@ -147,6 +147,12 @@
             "instance" : "redis_bmp"
         }
 {% endif %}
+        ,
+        "EVENT_DB" : {
+            "id" : 19,
+            "separator": "|",
+            "instance" : "redis"
+        }
     },
     "VERSION" : "1.0"
 }

dockers/docker-eventd/Dockerfile.j2

@@ -27,6 +27,7 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["critical_processes", "/etc/supervisor"]
 COPY ["*.json", "/etc/rsyslog.d/rsyslog_plugin_conf/"]
 COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/rsyslog_plugin_conf/"]
+COPY ["eventdb_wrapper.sh", "/usr/bin"]
 
 RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin_conf/rsyslog_plugin.conf.j2 /etc/rsyslog.d/rsyslog_plugin_conf/host_events_info.json > /etc/rsyslog.d/rsyslog_plugin_conf/host_events.conf
 RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin_conf/rsyslog_plugin.conf.j2 /etc/rsyslog.d/rsyslog_plugin_conf/bgp_events_info.json > /etc/rsyslog.d/rsyslog_plugin_conf/bgp_events.conf

dockers/docker-eventd/eventdb_wrapper.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+JSON_FILE="/etc/evprofile/default.json"
+
+# Check if file exists and is not empty
+if [ -s "$JSON_FILE" ]; then
+    # Check if "events" is defined and has at least one entry
+    if jq -e '.events and (.events | length > 0)' "$JSON_FILE" > /dev/null; then
+        echo "Valid events found. Starting eventdb."
+        exec /usr/bin/eventdb
+    else
+        echo "'events' list is missing or empty. Skipping eventdb start."
+        exit 0
+    fi
+else
+    echo "JSON file missing or empty. Skipping eventdb start."
+    exit 0
+fi

dockers/docker-eventd/supervisord.conf

@@ -56,3 +56,16 @@ stderr_syslog=true
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:eventdb]
+command=/usr/bin/eventdb_wrapper.sh
+priority=3
+autostart=false
+autorestart=false
+startsecs=0
+startretries=0
+exitcodes=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+

src/sonic-eventd/Makefile

@@ -1,12 +1,16 @@
 RM := rm -rf
 EVENTD_TARGET := eventd
 EVENTD_TEST := tests/tests
+EVENTDB_TEST := tests/eventdb
 EVENTD_TOOL := tools/events_tool
 EVENTD_PUBLISH_TOOL := tools/events_publish_tool.py
 RSYSLOG-PLUGIN_TARGET := rsyslog_plugin/rsyslog_plugin
 RSYSLOG-PLUGIN_TEST := rsyslog_plugin_tests/tests
 EVENTD_MONIT := tools/events_monit_test.py
 EVENTD_MONIT_CONF := tools/monit_events
+EVENTDB_TARGET := eventdb
+EVENTDB_DEFAULT_PROFILE := var/evprofile/default.json
+EVENTDB_PROF := etc/eventd.json
 
 CP := cp
 MKDIR := mkdir
@@ -19,7 +23,7 @@ PWD := $(shell pwd)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS) $(OBJS)
+-include $(C_DEPS) $(OBJS) $(EVENTDB_OBJS)
 endif
 endif
 
@@ -29,9 +33,9 @@ endif
 -include rsyslog_plugin/subdir.mk
 -include rsyslog_plugin_tests/subdir.mk
 
-all: sonic-eventd eventd-tool rsyslog-plugin
+all: sonic-eventd eventd-tool rsyslog-plugin sonic-eventdb
 
-test: eventd-tests rsyslog-plugin-tests
+test: eventd-tests rsyslog-plugin-tests eventdb-tests
 
 sonic-eventd: $(OBJS)
 	@echo 'Building target: $@'
@@ -40,6 +44,13 @@ sonic-eventd: $(OBJS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
+sonic-eventdb: $(EVENTDB_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: G++ Linker'
+	$(CC) $(LDFLAGS) -o $(EVENTDB_TARGET) $(EVENTDB_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
 eventd-tool: $(TOOL_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: G++ Linker'
@@ -63,6 +74,15 @@ eventd-tests: $(TEST_OBJS)
 	@echo 'Finished running tests'
 	@echo ' '
 
+eventdb-tests: $(EVENTDB_TEST_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: G++ Linker'
+	$(CC) $(LDFLAGS) -o $(EVENTDB_TEST) $(EVENTDB_TEST_OBJS) $(LIBS) $(TEST_LIBS)
+	@echo 'Finished building target: $@'
+	$(EVENTDB_TEST)
+	@echo 'Finished running tests'
+	@echo ' '
+
 rsyslog-plugin-tests: $(RSYSLOG-PLUGIN-TEST_OBJS)
 	@echo 'BUILDING target: $@'
 	@echo 'Invoking G++ Linker'
@@ -75,12 +95,16 @@ rsyslog-plugin-tests: $(RSYSLOG-PLUGIN-TEST_OBJS)
 install:
 	$(MKDIR) -p $(DESTDIR)/usr/bin
 	$(MKDIR) -p $(DESTDIR)/etc/monit/conf.d
+	$(MKDIR) -p $(DESTDIR)/etc/evprofile
 	$(CP) $(EVENTD_TARGET) $(DESTDIR)/usr/bin
 	$(CP) $(EVENTD_TOOL) $(DESTDIR)/usr/bin
 	$(CP) $(EVENTD_PUBLISH_TOOL) $(DESTDIR)/usr/bin
 	$(CP) $(RSYSLOG-PLUGIN_TARGET) $(DESTDIR)/usr/bin
 	$(CP) $(EVENTD_MONIT) $(DESTDIR)/usr/bin
 	$(CP) $(EVENTD_MONIT_CONF) $(DESTDIR)/etc/monit/conf.d
+	$(CP) $(EVENTDB_TARGET) $(DESTDIR)/usr/bin
+	$(CP) $(EVENTDB_PROF) $(DESTDIR)/etc/eventd.json
+	$(CP) $(EVENTDB_DEFAULT_PROFILE) $(DESTDIR)/etc/evprofile/default.json
 
 deinstall:
 	$(RM) -rf $(DESTDIR)/usr

src/sonic-eventd/debian/sonic-eventd.install

@@ -1,3 +1,6 @@
 usr/bin/eventd
+usr/bin/eventdb
 usr/bin/events_tool
 usr/bin/events_publish_tool.py
+etc/evprofile/default.json
+etc/eventd.json

src/sonic-eventd/etc/eventd.json

@@ -0,0 +1,5 @@
+{
+    "__README__": "Specify size of event history table. Whichever limit is hit first, eventd wraps event history table around and deletes older records.",
+    "max-records": 40000,
+    "max-days": 30
+}