package/zabbix: new package
PATCH v3 1/1 package/zabbix: new package
From: Alexey <[email protected]>
Provides zabbix server (with sql-files and php-frontend, which placed in /usr/zabbix) and client. Zabbix client always installed.
----
Changes v2 -> v3:
Remove PHP dependencies (server frontend may be installed on other machine) Add GLIBC dependence
PID-files moved to /run/zabbix
Zabbix updated to 4.2.4
SNMP-patch removed (now build fine)
--- DEVELOPERS | 3 ++ package/Config.in | 1 + package/zabbix/Config.in | 55 +++++++++++++++++++++ package/zabbix/zabbix-agent.service | 14 ++++++ package/zabbix/zabbix-server.service | 15 ++++++ package/zabbix/zabbix.hash | 1 + package/zabbix/zabbix.mk | 73 ++++++++++++++++++++++++++++ 7 files changed, 162 insertions(+) create mode 100644 package/zabbix/Config.in create mode 100644 package/zabbix/zabbix-agent.service create mode 100644 package/zabbix/zabbix-server.service create mode 100644 package/zabbix/zabbix.hash create mode 100644 package/zabbix/zabbix.mk
DEVELOPERS +3 -0
@@ -122,6 +122,9 @@ N: Alexandre Esse <[email protected]> F: package/kvazaar/ F: package/v4l2loopback/ +N: Alexey Lukyanchuk <[email protected]> +F: package/zabbix/ + N: Alistair Francis <[email protected]> F: boot/opensbi/ F: package/xen/
package/Config.in +1 -0
@@ -2094,6 +2094,7 @@ endif source "package/xinetd/Config.in" source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" + source "package/zabbix/Config.in" source "package/znc/Config.in" endmenu
package/zabbix/Config.in new file +55 -0
55 lines not on this page · raw message
package/zabbix/zabbix-agent.service new file +14 -0
@@ -0,0 +1,14 @@ +Description=Zabbix Agent Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_agentd +ExecReload=/usr/local/sbin/zabbix_agentd -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_agentd.pid +User=zabbix +Group=zabbix + +[Install] +WantedBy=multi-user.target
package/zabbix/zabbix-server.service new file +15 -0
@@ -0,0 +1,15 @@ +Description=Zabbix Server Daemon +Requires= +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_server +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_server.pid +User=zabbix +Group=zabbix + +[Install] +WantedBy=multi-user.target
package/zabbix/zabbix.hash new file +1 -0
@@ -0,0 +1 @@ +sha256 f6de0e0b91908d8da72d087931fb232988b391d3724d7c951833488fd96942bd zabbix-4.2.4.tar.gz
package/zabbix/zabbix.mk new file +73 -0
73 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 1/1 package/zabbix: new package
Hello Alexey,
Thanks for this new iteration. However, there are still a lot of things to fix before we can apply the patch.
Quoted 1 line · On Mon, 1 Jul 2019 14:06:33 +0300 Alexey Lukyanchuk <[email protected]> wrote:
From: Alexey <[email protected]>
Please use your full first name + last name as the author of the commit, as it must match the Signed-off-by.
Quoted 2 lines
Provides zabbix server (with sql-files and php-frontend, which placed in
/usr/zabbix) and client. Zabbix client always installed.
Please wrap the commit log to 72 characters.
Quoted 2 lines
Signed-off-by Alexey Lukyanchuk <[email protected])
The e-mail should be enclosed in <>, not in <)
DEVELOPERS N: Alexandre Esse <[email protected]> · line 126
Quoted 10 lines
DEVELOPERS +2
-0@@ -122,6 +122,9 @@ N: Alexandre Esse <[email protected]> F: package/kvazaar/ F: package/v4l2loopback/ +N: Alexey Lukyanchuk <[email protected]> +F: package/zabbix/
This file is indented with tabs, not spaces.
package/zabbix/Config.in line 3
Quoted 9 lines
package/zabbix/Config.in new file +3
-0@@ -0,0 +1,55 @@ +config BR2_PACKAGE_ZABBIX + bool "zabbix" + depends on BR2_TOOLCHAIN_BUILDROOT_GLIBC
BR2_TOOLCHAIN_BUILDROOT_GLIBC is only relevant for internal toolchains, and won't work for external toolchains. What you want to use is:
depends on BR2_TOOLCHAIN_USES_GLIBC
package/zabbix/Config.in line 6
Quoted 3 lines
package/zabbix/Config.in new file +3
-0+ select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_NETSNMP
You need to replicate the depencies of netsnmp, i.e:
depends on BR2_USE_MMU # netsnmp
package/zabbix/Config.in line 7
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ select BR2_PACKAGE_ZABBIX_CLIENT
If you select this sub-option, then it doesn't make sense to have it as an option, please remove it and always build/install the client.
package/zabbix/Config.in line 8
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ select BR2_PACKAGE_PCRE # runtime
It's not a runtime dependency, because your zabbix.mk has pcre in ZABBIX_DEPENDENCIES.
package/zabbix/Config.in line 9
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ select BR2_TOOLCHAIN_BUILDROOT_WCHAR #zabbix runtime
You can't select this, and it's only valid for internal toolchains. Please use:
depends on BR2_USE_WCHAR
instead.
package/zabbix/Config.in line 10
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ select BR2_TOOLCHAIN_BUILDROOT_CXX #oracle-mysql
oracle-mysql is only used when the zabbix server is enabled, so this seems irrelevant. If you really need C++ for zabbix itself (without the server), then this should be:
depends on BR2_INSTALL_LIBSTDCPP
package/zabbix/Config.in line 12
Quoted 2 lines
package/zabbix/Config.in new file +2
-0+ select BR2_PACKAGE_ZLIB + help
This "help" keyword should be intended with just one tab.
Please run "make check-package" to make sure you don't have basic coding style issues like this.
package/zabbix/Config.in line 13
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ zabbix monitoring system
Please extend the help text with more details about what Zabbix is. Also, the help text should finish by an empty line, followed by the upstream URL of the project. See other packages.
Also, you need to add a Config.in comment to document the dependencies of the package. Something like this:
comment "zabbix needs a glibc toolchain w/ wchar"
depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR
of course, extend that with C++ if you need C++ support.
package/zabbix/Config.in line 19
Quoted 6 lines
package/zabbix/Config.in new file +6
-0+ +if BR2_PACKAGE_ZABBIX + +config BR2_PACKAGE_ZABBIX_SERVER + bool "zabbix server" + depends on BR2_USE_MMU # netsnmp
netsnmp is selected by the top-level zabbix option, so this doesn't make sense here.
package/zabbix/Config.in line 20
Quoted 1 line
package/zabbix/Config.in new file +1
-0+ select BR2_SYSTEM_ENABLE_NLS
Please use a depends on for this option. Are you sure it really needs NLS ? What happens when NLS is disabled ?
package/zabbix/Config.in line 29
Quoted 9 lines
package/zabbix/Config.in new file +9
-0+ select BR2_PACKAGE_LIBCURL # runtime + help + Zabbix monitoring server + Server php-frontends files placed in \ + $(TARGET_DIR)/usr/zabbix/php-frontend + Database initial files for postgres are placed in \ + /usr/zabbix/postgresql_schema/ + Database initial files for mysql are placed in\ + /usr/zabbix/mysql_schema/
The \ are not needed. This is a bit messy. Is it really useful to have those details about the paths of things in the help text ?
package/zabbix/Config.in line 43
Quoted 13 lines
package/zabbix/Config.in new file +13
-0+if BR2_PACKAGE_ZABBIX_SERVER + +choice + prompt "zabbix server database backend" + default BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + help + Select database backend for zabbix server + +config BR2_PACKAGE_ZABBIX_SERVER_MYSQL + bool "Use mysql support" + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_ORACLE_MYSQL + select BR2_PACKAGE_ORACLE_MYSQL_SERVER
You cannot select BR2_PACKAGE_ORACLE_MYSQL, because it's part of a choice. The only thing you can do is depend on it.
package/zabbix/Config.in line 47
Quoted 4 lines
package/zabbix/Config.in new file +4
-0+ +config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL + bool "Use postgresql support" + select BR2_PACKAGE_POSTGRESQL
postgresql depends on MMU, WCHAR and !STATIC_LIBS, so you need to replicate these dependencies here.
Overall, I think this is too complicated, you should probably do it like this instead:
config BR2_PACKAGE_ZABBIX_SERVER
bool "zabbix server" depends on BR2_PACKAGE_ORACLE_MYSQL || BR2_PACKAGE_POSTGRESQL
if BR2_PACKAGE_ZABBIX_SERVER
choice
prompt "server database backend"
config BR2_PACKAGE_ZABBIX_SERVER_MYSQL
bool "mysql"
depends on BR2_PACKAGE_ORACLE_MYSQL
select BR2_PACKAGE_ORACLE_MYSQL_SERVER
config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL
bool "postgresql"
depends on BR2_PACKAGE_POSTGRESQL
endchoice
endif
package/zabbix/Config.in line 54
Quoted 2 lines
package/zabbix/Config.in new file +2
-0+config BR2_PACKAGE_ZABBIX_CLIENT + bool "zabbix client"
This option is not needed, as it's always selected by the top-level BR2_PACKAGE_ZABBIX option.
Quoted 32 lines
package/zabbix/Config.in new file +1
-0+endifpackage/zabbix/zabbix-agent.service new file +14
-0@@ -0,0 +1,14 @@ +Description=Zabbix Agent Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/zabbix_agentd +ExecReload=/usr/local/sbin/zabbix_agentd -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_agentd.pid +User=zabbix +Group=zabbix + +[Install] +WantedBy=multi-user.targetpackage/zabbix/zabbix-server.service new file +5
-0@@ -0,0 +1,15 @@ +Description=Zabbix Server Daemon +Requires= +After=syslog.target network.target + +[Service]
package/zabbix/zabbix-server.service line 15
Quoted 10 lines
package/zabbix/zabbix-server.service new file +10
-0+Type=forking +ExecStart=/usr/sbin/zabbix_server +ExecReload=/usr/sbin/zabbix_server -R config_cache_reload +RuntimeDirectory=zabbix +PIDFile=/run/zabbix/zabbix_server.pid +User=zabbix +Group=zabbix + +[Install] +WantedBy=multi-user.target
I am not qualified enough to review systemd unit files.
package/zabbix/zabbix.hash line 1
Quoted 7 lines
package/zabbix/zabbix.hash new file +1
-0@@ -0,0 +1 @@ +sha256 f6de0e0b91908d8da72d087931fb232988b391d3724d7c951833488fd96942bd zabbix-4.2.4.tar.gz
Please add a comment above this that gives the origin of this hash. Is it provided by upstream in some release notes on the web site ? Is it simply locally calculated by you ? See how other packages do that.
Also, we want the hash of the license file(s).
Quoted 6 lines
package/zabbix/zabbix.mk new file +0
-0
package/zabbix/zabbix.mk line 8
Quoted 8 lines
package/zabbix/zabbix.mk new file +8
-0@@ -0,0 +1,73 @@ +################################################################################ +# +#zabbix +# +################################################################################ + +ZABBIX_VERSION = 4.2.4 +ZABBIX_SITE = https://sourceforge.net/projects/zabbix/files
Please add ZABBIX_LICENSE and ZABBIX_LICENSE_FILES.
package/zabbix/zabbix.mk line 11
Quoted 2 lines
package/zabbix/zabbix.mk new file +2
-0+ZABBIX_DEPENDENCIES = libevent libxml2 netsnmp libcurl pcre zlib +ZABBIX_CONF_OPTS = --with-libpcre=$(STAGING_DIR)/usr/bin/ --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config --with-libevent --with-libxml2--with-net-snmp=$(STAGING_DIR)/usr/bin/
There is a missing space between --with-libxml2 and --with-net-snmp. Was this tested properly ?
Also, please split this long line:
ZABBIX_CONF_OPTS = \ --with-foo \ --with-bar \ --with-baz
Quoted 4 lines
package/zabbix/zabbix.mk new file +4
-0+define ZABBIX_SERVER_COPY_FRONTEND + mkdir -p $(TARGET_DIR)/usr/zabbix/php-frontend/ + cp -r $(@D)/frontends/php/* $(TARGET_DIR)/usr/zabbix/php-frontend/ +endef
package/zabbix/zabbix.mk line 26
Quoted 10 lines
package/zabbix/zabbix.mk new file +10
-0+ +define ZABBIX_SERVER_PREPARE_POSTGRESQL + mkdir -p $(TARGET_DIR)/usr/zabbix/postgresql_schema + cp -r $(@D)/database/postgresql/*\.sql $(TARGET_DIR)/usr/zabbix/postgresql_schema/ +endef + +define ZABBIX_SERVER_PREPARE_MYSQL + mkdir -p $(TARGET_DIR)/usr/zabbix/mysql_schema/ + cp -r $(@D)/database/mysql/*\.sql $(TARGET_DIR)/usr/zabbix/mysql_schema/ +endef
Please put the definition of those macros near where they are used.
package/zabbix/zabbix.mk line 40
Quoted 13 lines
package/zabbix/zabbix.mk new file +13
-0+define ZABBIX_INSTALL_INIT_SYSTEMD + $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ + $(INSTALL) -D -m 644 $(ZABBIX_PKGDIR)$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants && \ + ln -fs ../../../../usr/lib/systemd/system/$(unit) $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(unit) ;) +endef + +define ZABBIX_USERS + zabbix -1 zabbix -1 !- /var/lib/zabbix - zabbix zabbix user +endef + +define ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION + sed -i 's/\#\ PidFile=\/tmp\/zabbix_agentd.pid/PidFile=\/run\/zabbix\/zabbix_agentd.pid/g' $(TARGET_DIR)/etc/zabbix_agentd.conf
Use % as a sed separator, so that you don't have to espace all slashes. Will make things a lot more readable.
package/zabbix/zabbix.mk line 44
Quoted 4 lines
package/zabbix/zabbix.mk new file +4
-0+endef + +define ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION + sed -i 's/\#\ PidFile=\/tmp\/zabbix_server.pid/PidFile=\/run\/zabbix\/zabbix_server.pid/g' $(TARGET_DIR)/etc/zabbix_server.conf
Ditto.
package/zabbix/zabbix.mk line 47
Quoted 3 lines
package/zabbix/zabbix.mk new file +3
-0+endef + +ifeq ($(BR2_PACKAGE_ZABBIX_CLIENT),y)
This option will no longer exist, so you can make the code below unconditional.
Quoted 14 lines
package/zabbix/zabbix.mk new file +14
-0+ZABBIX_CONF_OPTS += --enable-agent +ZABBIX_SYSTEMD_UNITS += zabbix-agent.service +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_CLIENT_CHANGE_PIDFILE_LOCATION +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER),y) +ZABBIX_SYSTEMD_UNITS += zabbix-server.service +ZABBIX_CONF_OPTS += --enable-server +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_CHANGE_PIDFILE_LOCATION + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) +ZABBIX_DEPENDENCIES += mysql +ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
package/zabbix/zabbix.mk line 71
Quoted 10 lines
package/zabbix/zabbix.mk new file +10
-0+ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_MYSQL +endif + +ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) +ZABBIX_DEPENDENCIES += postgresql +ZABBIX_CONF_OPTS += --with-postgresql=$(STAGING_DIR)/usr/bin/pg_config +ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_PREPARE_POSTGRESQL +endif + +endif
Could you fix the above issues and send an updated version of your patch ?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com