From 473e6e581a3245969d4684d25c9229de04d9b961 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 01/12] Revert "[dockers] Prevent apt-get from installing suggested and recommended packages by default (#1666)" This reverts commit 832be7b8f4c37c3f41e022e62746fea24ab790d0. From 79957e0bc97514d1764dd7ef3e23668ed869593e Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 02/12] Revert "[broadcom]: update broadcom SAI to 3.1.3.4-11 (#1670)" This reverts commit 9a237701730d2a727218db6c1355ae6e9f193c32. From 63cb4646229d65eea61e6e8422a6caea92c57730 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 03/12] Revert "[snmp]: Stop spamming logs with statfs permission denied log message (#1668)" This reverts commit 74e8beaa12f0d252b9fbca8f931a0c45ed0c5aee. From 6f36c7a661659770f5291e8f7ab63ef494d8fbf4 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 04/12] Revert "[swss]: Change the hash seed to 0 for ToR and 10 for Leaf routers (#1667)" This reverts commit e082cd6d91a85865aa863424518c197789ca551c. From ebd6044626904a7bda5c5f6c1f5baa00fb79e361 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 05/12] Revert "[zebra.conf] Fix template issue with multiple lo addresses (#1662)" This reverts commit bebb7a0fa27374b884959c3bcd113ffd2d549ba9. From d79ad4de5a7b35e1f47fae904f16b337e7a9777f Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 06/12] Revert "Revert "Remove snmpd hw_fsys module, remove disk monitoring which is not in use" (#1665)" This reverts commit 5817e995203e41d3d3198175a8e814cc133d8bcf. --- dockers/docker-snmp-sv2/snmpd.conf.j2 | 8 -------- dockers/docker-snmp-sv2/supervisord.conf | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dockers/docker-snmp-sv2/snmpd.conf.j2 b/dockers/docker-snmp-sv2/snmpd.conf.j2 index 6353246acb08..62188892fa68 100644 --- a/dockers/docker-snmp-sv2/snmpd.conf.j2 +++ b/dockers/docker-snmp-sv2/snmpd.conf.j2 @@ -60,14 +60,6 @@ sysServices 72 # Note that this table will be empty if there are no "proc" entries in the snmpd.conf file -# -# Disk Monitoring -# - # 10MBs required on root disk, 5% free on /var, 10% free on all other disks -disk / 10000 -disk /var 5% -includeAllDisks 10% - # Walk the UCD-SNMP-MIB::dskTable to see the resulting output # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf index b3db3be95a2f..d07f584a6933 100644 --- a/dockers/docker-snmp-sv2/supervisord.conf +++ b/dockers/docker-snmp-sv2/supervisord.conf @@ -29,7 +29,7 @@ stdout_logfile=syslog stderr_logfile=syslog [program:snmpd] -command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid +command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw,hw_fsys -p /run/snmpd.pid priority=4 autostart=false autorestart=false From a087ece1235da2878993375f0df5da8ba4d38752 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 07/12] Revert "[swss]: update swss submodule (#1664)" This reverts commit c74be37ae016bbe4d64f711b38a3bd4edae767db. From 412b1bc474f8386bc7f858463a5e706cd0370413 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 08/12] Revert "Remove snmpd hw_fsys module, remove disk monitoring which are not in use (#1663)" This reverts commit 3d61df9d757e33524a26349865f21c8b0df5b10f. --- dockers/docker-snmp-sv2/snmpd.conf.j2 | 8 ++++++++ dockers/docker-snmp-sv2/supervisord.conf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dockers/docker-snmp-sv2/snmpd.conf.j2 b/dockers/docker-snmp-sv2/snmpd.conf.j2 index 62188892fa68..6353246acb08 100644 --- a/dockers/docker-snmp-sv2/snmpd.conf.j2 +++ b/dockers/docker-snmp-sv2/snmpd.conf.j2 @@ -60,6 +60,14 @@ sysServices 72 # Note that this table will be empty if there are no "proc" entries in the snmpd.conf file +# +# Disk Monitoring +# + # 10MBs required on root disk, 5% free on /var, 10% free on all other disks +disk / 10000 +disk /var 5% +includeAllDisks 10% + # Walk the UCD-SNMP-MIB::dskTable to see the resulting output # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf index d07f584a6933..b3db3be95a2f 100644 --- a/dockers/docker-snmp-sv2/supervisord.conf +++ b/dockers/docker-snmp-sv2/supervisord.conf @@ -29,7 +29,7 @@ stdout_logfile=syslog stderr_logfile=syslog [program:snmpd] -command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw,hw_fsys -p /run/snmpd.pid +command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid priority=4 autostart=false autorestart=false From aeca0e9402a31d2fc1e1c6aece97b8e5cad765d4 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 09/12] Revert "Quagga: Use bgp keepalive and holdtime timers from configdb (#1661)" This reverts commit 1ae4db3af77744badc4c50a5327b803474ad100d. From 6dc013a136c6f7d90a7b653e3bac68636274a996 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 10/12] Revert "Decrease usable space in log partition to 90% (#1648)" This reverts commit f3426e32dcf086cd02b82acfaa3956f96395b3e0. From 7fe18b32ac10e6e6e1d088356ccf9ddc8e80c2ec Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 11/12] Revert "[minigraph.py] Fix an issue that mirror table might be considered ctrlplane table (#1656)" This reverts commit 3ed4513d65861edb77ad078c6262428f676da065. From 1cefe27234ec8e560ea6bc23ae2b048a5cbad851 Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Wed, 2 May 2018 11:46:42 -0700 Subject: [PATCH 12/12] Revert "[docker-dhcp]: Fix the sonic build issue (#1659)" This reverts commit 8d3c5fbcc21e72d38827c742f208a9984456be2d. --- rules/docker-dhcp-relay.mk | 2 +- rules/isc-dhcp.mk | 6 +----- src/isc-dhcp/Makefile | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 53406ad1e15f..44d3904d7394 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -2,7 +2,7 @@ DOCKER_DHCP_RELAY = docker-dhcp-relay.gz $(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay -$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY) $(ISC_DHCP_CLIENT) +$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY) $(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE) SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY) diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk index 37c775da017a..7b7f69c6cfc6 100644 --- a/rules/isc-dhcp.mk +++ b/rules/isc-dhcp.mk @@ -8,9 +8,5 @@ ISC_DHCP_COMMON = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb $(ISC_DHCP_COMMON)_SRC_PATH = $(SRC_PATH)/isc-dhcp SONIC_MAKE_DEBS += $(ISC_DHCP_COMMON) -ISC_DHCP_CLIENT = isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb -$(ISC_DHCP_CLIENT)_SRC_PATH = $(SRC_PATH)/isc-dhcp -SONIC_MAKE_DEBS += $(ISC_DHCP_CLIENT) - ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb -$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY),$(ISC_DHCP_CLIENT))) +$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY))) diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile index b439ec7c1ee6..5b1cb8407005 100644 --- a/src/isc-dhcp/Makefile +++ b/src/isc-dhcp/Makefile @@ -3,8 +3,7 @@ SHELL = /bin/bash .SHELLFLAGS += -e MAIN_TARGET = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb -DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb \ - isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb +DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # Remove any stale files