Skip to content

zabbix: Add optional SNMP support for all server/proxy variants #27716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

zabbix: Add optional SNMP support for all server/proxy variants #27716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions admin/zabbix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_ZABBIX_MYSQL \
CONFIG_ZABBIX_POSTGRESQL \
CONFIG_ZABBIX_SQLITE
CONFIG_ZABBIX_SQLITE \
CONFIG_ZABBIX_SNMP

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
Expand All @@ -48,6 +49,14 @@ choice
config ZABBIX_SQLITE
bool "SQLite"
endchoice

config ZABBIX_SNMP
bool "Enable SNMP support"
depends on PACKAGE_zabbix-server || PACKAGE_zabbix-server-openssl || PACKAGE_zabbix-server-gnutls || PACKAGE_zabbix-proxy || PACKAGE_zabbix-proxy-openssl || PACKAGE_zabbix-proxy-gnutls
default n
help
Enable SNMP support for Zabbix server and proxy.
This requires libnetsnmp package.
endef

define Package/zabbix/Default
Expand Down Expand Up @@ -166,6 +175,7 @@ endef
define Package/zabbix-server
$(call Package/zabbix-server/Default)
PROVIDES:=zabbix-server
DEPENDS+= +ZABBIX_SNMP:libnetsnmp
VARIANT:=nossl
DEFAULT_VARIANT:=1
endef
Expand All @@ -174,15 +184,15 @@ define Package/zabbix-server-openssl
$(call Package/zabbix-server/Default)
TITLE+= (with OpenSSL)
PROVIDES:=zabbix-server
DEPENDS+= +libopenssl
DEPENDS+= +libopenssl +ZABBIX_SNMP:libnetsnmp
VARIANT:=openssl
endef

define Package/zabbix-server-gnutls
$(call Package/zabbix-server/Default)
TITLE+= (with GnuTLS)
PROVIDES:=zabbix-server
DEPENDS+= +libgnutls
DEPENDS+= +libgnutls +ZABBIX_SNMP:libnetsnmp
VARIANT:=gnutls
endef

Expand Down Expand Up @@ -220,6 +230,7 @@ endef
define Package/zabbix-proxy
$(call Package/zabbix-proxy/Default)
PROVIDES:=zabbix-proxy
DEPENDS+= +ZABBIX_SNMP:libnetsnmp
VARIANT:=nossl
DEFAULT_VARIANT:=1
endef
Expand All @@ -228,15 +239,15 @@ define Package/zabbix-proxy-openssl
$(call Package/zabbix-proxy/Default)
TITLE+= (with OpenSSL)
PROVIDES:=zabbix-proxy
DEPENDS+= +libopenssl
DEPENDS+= +libopenssl +ZABBIX_SNMP:libnetsnmp
VARIANT:=openssl
endef

define Package/zabbix-proxy-gnutls
$(call Package/zabbix-proxy/Default)
TITLE+= (with GnuTLS)
PROVIDES:=zabbix-proxy
DEPENDS+= +libgnutls
DEPENDS+= +libgnutls +ZABBIX_SNMP:libnetsnmp
VARIANT:=gnutls
endef

Expand Down Expand Up @@ -267,6 +278,7 @@ CONFIGURE_ARGS+= \
$(if $(CONFIG_ZABBIX_MYSQL),--with-mysql) \
$(if $(CONFIG_ZABBIX_POSTGRESQL),--with-postgresql) \
$(if $(CONFIG_ZABBIX_SQLITE),--with-sqlite3=$(STAGING_DIR)/usr) \
$(if $(CONFIG_ZABBIX_SNMP),--with-net-snmp) \
--with-libevent=$(STAGING_DIR)/usr/include \
--with-libpcre2=$(STAGING_DIR)/usr/include \
--with-zlib=$(STAGING_DIR)/usr/include
Expand Down
11 changes: 11 additions & 0 deletions admin/zabbix/patches/120-fix-netsnmp-strong-auth-detection.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/m4/netsnmp.m4
+++ b/m4/netsnmp.m4
@@ -168,6 +168,7 @@ AC_DEFUN([LIBNETSNMP_CHECK_CONFIG],[
]], [[
struct snmp_session session;
session.securityAuthProto = usmHMAC384SHA512AuthProtocol;
+return (int)(long)session.securityAuthProto;
]])],[
AC_DEFINE(HAVE_NETSNMP_STRONG_AUTH, 1, [Define to 1 if strong SHA auth protocols are supported.])
AC_MSG_RESULT(yes)

Loading