zabbix: do some cleanup#30027
Open
danielfdickinson wants to merge 4 commits into
Open
Conversation
3 tasks
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 18, 2026 12:30
f063119 to
496bd5f
Compare
danielfdickinson
marked this pull request as draft
July 18, 2026 16:18
danielfdickinson
marked this pull request as ready for review
July 18, 2026 17:14
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 18, 2026 17:21
496bd5f to
c899e02
Compare
openwrt-ai
reviewed
Jul 19, 2026
openwrt-ai
left a comment
openwrt-ai
left a comment
Collaborator
There was a problem hiding this comment.
Reviewed 4 new commits. Commit messages match their diffs. One inline question about the new unconditional Include= directory.
Generated by Claude Code
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 19, 2026 06:28
c899e02 to
0565a74
Compare
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
2 times, most recently
from
July 19, 2026 06:43
53a93b5 to
1690df4
Compare
BKPepe
reviewed
Jul 19, 2026
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
2 times, most recently
from
July 19, 2026 08:34
712e02e to
cf11f14
Compare
Contributor
Author
|
I think tonight is not my night - after some sleep, we'll see where things are at. |
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 19, 2026 09:01
cf11f14 to
7d9e16f
Compare
Contributor
Author
|
Oh well, it was worth a try. |
Add the user config file directories (/etc/zabbix_x.conf.d) to the list of directories and files to preserve across sysupgrade. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 19, 2026 19:41
7d9e16f to
a10fa13
Compare
openwrt-ai
reviewed
Jul 20, 2026
openwrt-ai
left a comment
openwrt-ai
left a comment
Collaborator
There was a problem hiding this comment.
Re-reviewed after the rebase/restructure. The two prior concerns are resolved: the base zabbix-agentd/zabbix-agentd-basic installs now create /usr/share/zabbix_agentd.openwrt-params.d so the new unconditional Include= target always exists, and the .conf.d/ conffiles entries now carry the trailing slash. All four commit messages match their diffs, and the 010-change-agentd-config.patch hunk header (@@ -547,5 +541,6 @@) is internally consistent. One minor INSTALL_BIN/INSTALL_DATA nit inline.
Generated by Claude Code
Reorganize the extra files under the 'files' dir so that it is more clear where they go and what they are for, and to avoid having a disorganized mass of files. Move the extra C source file out of files and into 'src-extra'. Avoid treating openwrt-supplied params files as configuration data. Instead have them in a separate directory under /usr/share which is included in the zabbix_agentd configuration by default. This also better follows the FHS. Hopefully these changes make sense on their own, as well as helping the CI accept the changes. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
The sysctl file increases max files to allow the default full complement of discovery workers, however this is probably not a hard requirement and such a conf not shipped elsewhere in tree, so leave that to the user to configure. (The syslog messages from zabbix-server and/or zabbix-proxy provided the needed information). Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
While the frontend can mostly operate without php8-mod-simplexml, when trying to import XML templates the user only gets unhelpful error messages and is unlikely to realize the module is required for that functionality. Therefore have the frontend depend on php8-mod-simplexml. Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
danielfdickinson
force-pushed
the
pr-zabbix-do-some-cleanup
branch
from
July 20, 2026 06:41
a10fa13 to
376c3c3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📦 Package Details
Maintainer: @danielfdickinson
Description:
Splitting out from #30010 as it makes for a better separation of concerns.
🧪 Run Testing Details
✅ Formalities
If your PR contains a patch:
git amN/A: OpenWrt-specific configuration tweaks