sync - #1808
Merged
Merged
sync#1808
Conversation
Currently translated at 100.0% (838 of 838 strings) Translation: NetAlertX/core Translate-URL: https://hosted.weblate.org/projects/pialert/core/ru/
Maps DOCKERDISC to CurrentScan (scanMac/scanCreatesDevice/scanParentMAC/ scanLastIP) so a container on a macvlan/ipvlan network can opt into creating or confirming its own device, parented to its Docker host. Gated by a new DOCKERDISC_CREATE_DEV setting (default off). A container without its own MAC (bridge/overlay/etc.) never creates a device either way - the framework's blank-scanMac guard blocks the whole group regardless of the setting. Reuses the existing objectPrimaryId/extra column definitions (already host MAC / container IP) to also feed scanParentMAC/scanLastIP, so every promoted container is auto-parented to its host with no extra plugin logic. Two new hidden columns (helpVal1/helpVal2) carry the per-container scanMac/scanCreatesDevice values. Tests: 33 -> 35, both DOCKERDISC_CREATE_DEV on/off paths asserted. Live-verified end to end against a real built image (docker-socket-proxy + isolated macvlan/bridge test containers), since IMPORT_ON isn't in any released NetAlertX image yet. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011meLPKCzVpdZyAUfv5U6mm
Declares DOCKERDISC_IMPORT_ON (default on) so an operator can fully opt this plugin out of CurrentScan promotion. Needed because DOCKERDISC_CREATE_DEV alone doesn't cover it: a macvlan/ipvlan container's row always carries a real scanMac, so even with CREATE_DEV off, an already-existing device for that MAC (found independently by ARP/Nmap) still gets its presence/devLastIP/ devParentMAC updated by this plugin on every run - only IMPORT_ON can turn that off. The two settings are independent, per jokob-sk's PR feedback - IMPORT_ON gates promotion for the whole run, CREATE_DEV gates device creation per row. Also adds missing docstrings to process_host()/main() (CodeRabbit docstring-coverage check), matching the style already used elsewhere in this file. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011meLPKCzVpdZyAUfv5U6mm
Settings-UI description trimmed to one short line - implementation detail (Socket Proxy, column mapping, CREATE_DEV behavior) already lives in README, doesn't belong in the Settings page string. scanSourcePlugin now maps to a static "DOCKERDISC" value (same Dummy-column pattern arp_scan already uses), so a container device created by this plugin gets devSourcePlugin set correctly instead of NULL - every other CurrentScan-mapped plugin already does this. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011meLPKCzVpdZyAUfv5U6mm
DOCKERDISC v2: optional device creation for LAN-visible containers
Next release
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: netalertx/NetAlertX/.coderabbit.yaml Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
No description provided.