Fixes the caddy_site_activity plugin to properly support Caddy configurations with multiple server blocks, adds checks to prevent errors from undefined values#2
Open
mgc8 wants to merge 1 commit intomattpep:mainfrom
Conversation
- Iterate through all servers instead of hardcoding srv0 - Build complete hostname mapping across all server blocks - Add hostname filtering to count_json_log_hits() to ensure accurate per-site metrics - Add defensive checks for undefined values in config and log data - Close log file handles explicitly after reading Signed-off-by: Mihnea-Costin Grigore <mihnea@mihnea.net>
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
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.
The plugin was hardcoded to only look at
srv0in the Caddy configuration:This caused the plugin to fail or provide incomplete data when:
Changes
$config->{apps}{http}{servers}to build a complete mapping of internal names to hostnamescount_json_log_hits(): Changed the function to accept$hostnameinstead of unused$statusesparameterTested and confirmed to work under Munin 2.0.73 with no errors nor warnings
Fixes #1