Event and alarm management

dockers/docker-database/database_config.json.j2

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

dockers/docker-eventd/supervisord.conf

@@ -50,3 +50,13 @@ stderr_logfile=syslog
 dependent_startup=true
 dependent_startup_wait_for=start:exited
 
+[program:eventdb]
+command=/usr/bin/eventdb
+priority=3
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
+

files/build_templates/docker_image_ctl.j2

@@ -91,9 +91,16 @@ function preStartAction()
             # Load redis content from /host/warmboot/dump.rdb
             docker cp $WARM_DIR/dump.rdb database$DEV:/var/lib/redis/dump.rdb
         else
-            # Create an emtpy file and overwrite any RDB if already there
-            echo -n > /tmp/dump.rdb
-            docker cp /tmp/dump.rdb database$DEV:/var/lib/redis/
+            COLD_DIR=/host/coldboot
+            #In case of cold reboot, load redis content from /host/coldboot/dump.rdb
+            if [[ -f $COLD_DIR/dump.rdb ]]; then
+                #Load redis content from /host/coldboot/dump.rdb
+                docker cp $COLD_DIR/dump.rdb database$DEV:/var/lib/redis/dump.rdb
+            else   
+                # Create an emtpy file and overwrite any RDB if already there
+                echo -n > /tmp/dump.rdb
+                docker cp /tmp/dump.rdb database$DEV:/var/lib/redis/
+            fi        
         fi
     fi
 {%- elif docker_container_name == "pde" %}

src/eventdb_ut.cpp

@@ -0,0 +1,107 @@
+#include<string>
+#include "gtest/gtest.h"
+#include "events_common.h"
+#include "events.h"
+#include "../src/eventd.h"
+#include "../src/eventconsume.h"
+
+using namespace std;
+using namespace swss;
+
+typedef struct {
+    int key;
+    string type-id;
+    string resource;
+    string action;
+    string text;
+} event_data_t;
+
+static const event_data_t events[] = {
+    {1, "SYSTEM_STATE", "System", "", "System Ready"},
+    {2, "USER_LOGIN", "ssh", "", "user testuser logged in"},
+};
+
+static const event_data_t alarms[] = {
+    {1, "TEMP_THRESHOLD_HIGH", "CPU_SENSOR", "RAISE", "Temperature cross threshold 50C"},
+    {2, "INTERFACE_OPER_STATE", "eth1", "RAISE", "Operational Down"},
+    {3, "INTERFACE_OPER_STATE", "eth1", "CLEAR", "Operational Down"},
+    {4, "TEMP_THRESHOLD_HIGH", "CPU_SENSOR", "CLEAR", "Temperature cross threshold 50C"},    
+
+};
+
+const string event_profile = "default_event.json";
+const string event_db_profile = "event_db.json";
+
+//typedef unordered_map<string, string> params;
+
+//params events_lst[] = [("id":" 1", "type-id": SYSTEM_STATE, "resource": "System", "text": "System Ready", "severity" : "INFORMATIONAL"},
+//                       {"id":"2", "type-id": USER_LOGIN, "resource": "SSH", "text": "User login", "severity": "WARNING"}];
+/*
+ 1) "time-created"
+ 2) "1706507049241598976"
+ 3) "type-id"
+ 4) "SYSTEM_STATUS"
+ 5) "text"
+ 6) "System is ready"
+ 7) "resource"
+ 8) "system_status"
+ 9) "severity"
+10) "INFORMATIONAL"
+11) "id"
+12) "4"
+*/
+
+class EventDbFixture : public ::testing::Environment { 
+    protected:
+    void SetUp() override {
+        zctx = zmq_ctx_new();
+        EXPECT_TRUE(NULL != zctx);
+
+        /* Run proxy to enable receive as capture test needs to receive */
+        eventd_proxy *pxy = new eventd_proxy(zctx);
+        EXPECT_TRUE(NULL != pxy);
+
+        /* Starting proxy */
+        EXPECT_EQ(0, pxy->init());
+
+        /* Start Eventdb in a separate thread*/
+        swss::DBConnector eventDb("EVENT_DB", 0);
+
+        EventConsume evtd(&eventDb, event_profile, event_db_profile);
+        thread thr(&EventConsume::run, &evtd);
+    }
+
+    void TearDown() override {
+
+    }
+    void *zctx;
+}
+
+void *init_publish(void *zctx)
+{
+    void *mock_pub = zmq_socket (zctx, ZMQ_PUB);
+    EXPECT_TRUE(NULL != mock_pub);
+    EXPECT_EQ(0, zmq_connect(mock_pub, get_config(XSUB_END_KEY).c_str()));
+
+    /* Provide time for async connect to complete */
+    this_thread::sleep_for(chrono::milliseconds(200));
+
+    return mock_pub;
+}
+
+
+TEST_F(EventDbFixture, validate_events)
+{
+    DBConnector db("EVENT_DB", 0, true);
+    void* pub_handle = init_publish(zctx);
+//    pub_handle = events_init_publisher("test_db");    
+    for(int i = 0; i < ARRAY_SIZE(events); i++) {
+        string tag = string("test_db_tag_") + to_string(i);
+        const event_params_t params = {{"type-id", events[i].type-id},
+                                 { "resource", events[i].resource},
+                                 { "action", events[i].action},
+                                 { "text", events[i].text}};
+
+        event_publish(pub_handle, tag, &params);
+    }
+}

src/sonic-eventd/Makefile

@@ -7,6 +7,9 @@ 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 +22,7 @@ PWD := $(shell pwd)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS) $(OBJS)
+-include $(C_DEPS) $(OBJS) $(EVENTDB_OBJS)
 endif
 endif
 
@@ -31,10 +34,11 @@ endif
 
 all: sonic-eventd eventd-tool rsyslog-plugin
 
-sonic-eventd: $(OBJS)
+sonic-eventd: $(OBJS) $(EVENTDB_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: G++ Linker'
 	$(CC) $(LDFLAGS) -o $(EVENTD_TARGET) $(OBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -o $(EVENTDB_TARGET) $(EVENTDB_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
@@ -73,12 +77,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
+}