Revert "Streaming structured events implementation (#11848)"

This reverts commit 6a54bc4.
sonic-net · Sep 6, 2022 · 13b654d · 13b654d
1 parent 1b5d07f
commit 13b654d
Show file tree

Hide file tree

Showing 59 changed files with 4 additions and 4,088 deletions.
diff --git a/dockers/docker-eventd/Dockerfile.j2 b/dockers/docker-eventd/Dockerfile.j2
diff --git a/dockers/docker-eventd/critical_processes b/dockers/docker-eventd/critical_processes
diff --git a/dockers/docker-eventd/start.sh b/dockers/docker-eventd/start.sh
diff --git a/dockers/docker-eventd/supervisord.conf b/dockers/docker-eventd/supervisord.conf
diff --git a/dockers/docker-fpm-frr/Dockerfile.j2 b/dockers/docker-fpm-frr/Dockerfile.j2
@@ -55,15 +55,9 @@ COPY ["TSC", "/usr/bin/TSC"]
 COPY ["TS", "/usr/bin/TS"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["zsocket.sh", "/usr/bin/"]
-COPY ["*.json", "/etc/rsyslog.d/"]
-COPY ["files/rsyslog_plugin.conf.j2", "/etc/rsyslog.d/"]
 RUN chmod a+x /usr/bin/TSA && \
  chmod a+x /usr/bin/TSB && \
  chmod a+x /usr/bin/TSC && \
  chmod a+x /usr/bin/zsocket.sh
 
-RUN j2 -f json /etc/rsyslog.d/rsyslog_plugin.conf.j2 /etc/rsyslog.d/events_info.json > /etc/rsyslog.d/bgp_events.conf
-RUN rm -f /etc/rsyslog.d/rsyslog_plugin.conf.j2*
-RUN rm -f /etc/rsyslog.d/events_info.json*
-
 ENTRYPOINT ["/usr/bin/docker_init.sh"]
diff --git a/dockers/docker-fpm-frr/bgp_regex.json b/dockers/docker-fpm-frr/bgp_regex.json
diff --git a/dockers/docker-fpm-frr/events_info.json b/dockers/docker-fpm-frr/events_info.json
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -515,7 +515,6 @@ start() {
 {%- endif -%}
 {%- if docker_container_name == "bgp" %}
  -v /etc/sonic/frr/$DEV:/etc/frr:rw \
- -v /usr/share/sonic/scripts:/usr/share/sonic/scripts:ro \
 {%- endif %}
 {%- if docker_container_name == "database" %}
  $DB_OPT \

diff --git a/files/build_templates/eventd.service.j2 b/files/build_templates/eventd.service.j2
diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
@@ -39,7 +39,6 @@
  ("pmon", "enabled", false, "enabled"),
  ("radv", "enabled", false, "enabled"),
  ("snmp", "enabled", true, "enabled"),
- ("eventd", "enabled", true, "enabled"),
  ("swss", "enabled", false, "enabled"),
  ("syncd", "enabled", false, "enabled"),
  ("teamd", "enabled", false, "enabled")] %}
@@ -70,7 +69,7 @@
  "check_up_status" : "false",
 {%- endif %}
 {%- if include_kubernetes == "y" %}
-{%- if feature in ["lldp", "pmon", "radv", "eventd", "snmp", "telemetry"] %}
+{%- if feature in ["lldp", "pmon", "radv", "snmp", "telemetry"] %}
  "set_owner": "kube", {% else %}
  "set_owner": "local", {% endif %} {% endif %}
  "high_mem_alert": "disabled"

diff --git a/files/build_templates/rsyslog_plugin.conf.j2 b/files/build_templates/rsyslog_plugin.conf.j2
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -799,10 +799,6 @@ sudo bash -c "echo { > $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_name
 {% endfor %}
 sudo bash -c "echo } >> $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/ctr_image_names.json"
 
-# copy rsyslog plugin binary for use by all dockers that use plugin to publish events.
-sudo mkdir -p ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}
-sudo cp ${files_path}/rsyslog_plugin ${FILESYSTEM_ROOT_USR_SHARE_SONIC_SCRIPTS}/
-
 {% for script in installer_start_scripts.split(' ') -%}
 if [ -f $TARGET_MACHINE"_{{script}}" ]; then
  sudo cp $TARGET_MACHINE"_{{script}}" $FILESYSTEM_ROOT/usr/bin/{{script}}

diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk
@@ -8,15 +8,13 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DEPENDS += $(LIBSWSSCOMMON) \
  $(LIBYANG_CPP) \
  $(LIBYANG_PY3) \
  $(PYTHON3_SWSSCOMMON) \
- $(SONIC_DB_CLI) \
- $(SONIC_EVENTD)
+ $(SONIC_DB_CLI)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
  $(SONIC_YANG_MGMT_PY3) \
  $(SONIC_YANG_MODELS_PY3)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_LOAD_DOCKERS += $(DOCKER_BASE_BULLSEYE)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(SWSS_VARS_TEMPLATE)
-$(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
 
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEPENDS) \

diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk
@@ -15,7 +15,6 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
 $(DOCKER_CONFIG_ENGINE_BUSTER)_PYTHON_WHEELS += $(SONIC_CONFIG_ENGINE_PY3)
 $(DOCKER_CONFIG_ENGINE_BUSTER)_LOAD_DOCKERS += $(DOCKER_BASE_BUSTER)
 $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $(SWSS_VARS_TEMPLATE)
-$(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
 $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
 
 $(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS = $($(DOCKER_BASE_BUSTER)_DBG_DEPENDS) \

diff --git a/rules/docker-eventd.dep b/rules/docker-eventd.dep
diff --git a/rules/docker-eventd.mk b/rules/docker-eventd.mk
diff --git a/rules/eventd.dep b/rules/eventd.dep
diff --git a/rules/eventd.mk b/rules/eventd.mk
diff --git a/rules/scripts.mk b/rules/scripts.mk
@@ -32,9 +32,6 @@ $(SWSS_VARS_TEMPLATE)_PATH = files/build_templates
 COPP_CONFIG_TEMPLATE = copp_cfg.j2
 $(COPP_CONFIG_TEMPLATE)_PATH = files/image_config/copp
 
-RSYSLOG_PLUGIN_CONF_J2 = rsyslog_plugin.conf.j2
-$(RSYSLOG_PLUGIN_CONF_J2)_PATH = files/build_templates
-
 SONIC_COPY_FILES += $(CONFIGDB_LOAD_SCRIPT) \
  $(ARP_UPDATE_SCRIPT) \
  $(ARP_UPDATE_VARS_TEMPLATE) \
@@ -45,5 +42,4 @@ SONIC_COPY_FILES += $(CONFIGDB_LOAD_SCRIPT) \
  $(SYSCTL_NET_CONFIG) \
  $(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
  $(SWSS_VARS_TEMPLATE) \
- $(RSYSLOG_PLUGIN_CONF_J2) \
  $(COPP_CONFIG_TEMPLATE)
diff --git a/rules/telemetry.mk b/rules/telemetry.mk
@@ -2,7 +2,6 @@
 
 SONIC_TELEMETRY = sonic-gnmi_0.1_$(CONFIGURED_ARCH).deb
 $(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/sonic-gnmi
-$(SONIC_TELEMETRY)_DEPENDS = $(SONIC_MGMT_COMMON) $(SONIC_MGMT_COMMON_CODEGEN) \
- $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON) 
-$(SONIC_TELEMETRY)_RDEPENDS = $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DEV)
+$(SONIC_TELEMETRY)_DEPENDS = $(SONIC_MGMT_COMMON) $(SONIC_MGMT_COMMON_CODEGEN)
+$(SONIC_TELEMETRY)_RDEPENDS = 
 SONIC_DPKG_DEBS += $(SONIC_TELEMETRY)
diff --git a/slave.mk b/slave.mk
@@ -1292,8 +1292,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
  $(if $($(docker:-dbg.gz=.gz)_MACHINE),\
  mv $($(docker:-dbg.gz=.gz)_CONTAINER_NAME).sh $($(docker:-dbg.gz=.gz)_MACHINE)_$($(docker:-dbg.gz=.gz)_CONTAINER_NAME).sh
  )
- $(foreach file, $($(docker)_SHARED_FILES), \
- { cp $($(file)_PATH)/$(file) $(FILES_PATH)/ $(LOG) || exit 1 ; } ; )
  )
 
  # Exported variables are used by sonic_debian_extension.sh