Revert "Event and alarm management (#17949)" (#20052)

This reverts commit 10f0fe8.
sonic-net · Aug 28, 2024 · 93f3cad · 93f3cad
1 parent 66e141b
commit 93f3cad
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 1,866 deletions.
diff --git a/dockers/docker-database/database_config.json.j2 b/dockers/docker-database/database_config.json.j2
@@ -130,12 +130,6 @@
             "instance" : {% if include_remote_db %} "remote_redis" {% else %} "redis" {% endif %}
         }
 {% endif %}
-        ,
-        "EVENT_DB" : {
-            "id" : 19,
-            "separator": "|",
-            "instance" : "redis"
-        }
     },
     "VERSION" : "1.0"
 }
diff --git a/dockers/docker-eventd/supervisord.conf b/dockers/docker-eventd/supervisord.conf
@@ -50,13 +50,3 @@ 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
-
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -91,16 +91,9 @@ function preStartAction()
             # Load redis content from /host/warmboot/dump.rdb
             docker cp $WARM_DIR/dump.rdb database$DEV:/var/lib/redis/dump.rdb
         else
-            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        
+            # 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
 {%- elif docker_container_name == "pde" %}

diff --git a/src/sonic-eventd/Makefile b/src/sonic-eventd/Makefile
@@ -1,16 +1,12 @@
 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
@@ -23,7 +19,7 @@ PWD := $(shell pwd)
 
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS) $(OBJS) $(EVENTDB_OBJS)
+-include $(C_DEPS) $(OBJS)
 endif
 endif
 
@@ -35,11 +31,10 @@ endif
 
 all: sonic-eventd eventd-tests eventd-tool rsyslog-plugin rsyslog-plugin-tests
 
-sonic-eventd: $(OBJS) $(EVENTDB_OBJS)
+sonic-eventd: $(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 ' '
 
@@ -57,14 +52,12 @@ rsyslog-plugin: $(RSYSLOG-PLUGIN_OBJS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
-eventd-tests: $(TEST_OBJS) $(EVENTDB_TEST_OBJS)
+eventd-tests: $(TEST_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: G++ Linker'
 	$(CC) $(LDFLAGS) -o $(EVENTD_TEST) $(TEST_OBJS) $(LIBS) $(TEST_LIBS)
-	$(CC) $(LDFLAGS) -o $(EVENTDB_TEST) $(EVENTDB_TEST_OBJS) $(LIBS) $(TEST_LIBS)
 	@echo 'Finished building target: $@'
 	$(EVENTD_TEST)
-	$(EVENTDB_TEST)
 	@echo 'Finished running tests'
 	@echo ' '
 
@@ -80,16 +73,12 @@ 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

diff --git a/src/sonic-eventd/debian/sonic-eventd.install b/src/sonic-eventd/debian/sonic-eventd.install
@@ -1,6 +1,3 @@
 usr/bin/eventd
-usr/bin/eventdb
 usr/bin/events_tool
 usr/bin/events_publish_tool.py
-etc/evprofile/default.json
-etc/eventd.json
diff --git a/src/sonic-eventd/etc/eventd.json b/src/sonic-eventd/etc/eventd.json