DOCKERDISC v2: optional device creation for LAN-visible containers #1800
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,7 +25,7 @@ | |
| "description": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "Enriches known Docker hosts with their running containers." | ||
| } | ||
| ], | ||
| "params": [ | ||
|
|
@@ -37,6 +37,7 @@ | |
| "timeoutMultiplier": true | ||
| } | ||
| ], | ||
| "mapped_to_table": "CurrentScan", | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| "database_column_definitions": [ | ||
| { | ||
| "column": "index", | ||
|
|
@@ -74,6 +75,7 @@ | |
| }, | ||
| { | ||
| "column": "objectPrimaryId", | ||
| "mapped_to_column": "scanParentMAC", | ||
| "css_classes": "col-sm-2", | ||
| "show": true, | ||
| "type": "device_mac", | ||
|
|
@@ -210,6 +212,7 @@ | |
| }, | ||
| { | ||
| "column": "extra", | ||
| "mapped_to_column": "scanLastIP", | ||
| "css_classes": "col-sm-3", | ||
| "show": true, | ||
| "type": "label", | ||
|
|
@@ -225,6 +228,63 @@ | |
| } | ||
| ] | ||
| }, | ||
| { | ||
|
Collaborator
There was a problem hiding this comment. Also map scanSourcePlugin, unlike every other CurrentScan-mapped plugin, - currently every row it inserts gets scanSourcePlugin = NULL.
Contributor
Author
There was a problem hiding this comment. Added - same Dummy-column static-value pattern arp_scan already uses, in b175a3b. |
||
| "column": "helpVal1", | ||
| "mapped_to_column": "scanMac", | ||
| "css_classes": "col-sm-2", | ||
| "show": false, | ||
| "type": "none", | ||
| "default_value": "", | ||
| "options": [], | ||
| "localized": [ | ||
| "name" | ||
| ], | ||
| "name": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "N/A" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "column": "helpVal2", | ||
| "mapped_to_column": "scanCreatesDevice", | ||
| "css_classes": "col-sm-2", | ||
| "show": false, | ||
| "type": "none", | ||
| "default_value": "", | ||
| "options": [], | ||
| "localized": [ | ||
| "name" | ||
| ], | ||
| "name": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "N/A" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "column": "Dummy", | ||
| "mapped_to_column": "scanSourcePlugin", | ||
| "mapped_to_column_data": { | ||
| "value": "DOCKERDISC" | ||
| }, | ||
| "css_classes": "col-sm-2", | ||
| "show": false, | ||
| "type": "none", | ||
| "default_value": "", | ||
| "options": [], | ||
| "localized": [ | ||
| "name" | ||
| ], | ||
| "name": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "N/A" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "column": "userData", | ||
| "css_classes": "col-sm-2", | ||
|
|
@@ -317,6 +377,41 @@ | |
| } | ||
| ] | ||
| }, | ||
| { | ||
| "function": "IMPORT_ON", | ||
| "type": { | ||
| "dataType": "boolean", | ||
| "elements": [ | ||
| { | ||
| "elementType": "input", | ||
| "elementOptions": [ | ||
| { | ||
| "type": "checkbox" | ||
| } | ||
| ], | ||
| "transformers": [] | ||
| } | ||
| ] | ||
| }, | ||
| "default_value": true, | ||
| "options": [], | ||
| "localized": [ | ||
| "name", | ||
| "description" | ||
| ], | ||
| "name": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "Allow updating existing devices from this plugin's data" | ||
| } | ||
| ], | ||
| "description": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "On by default. Turn off to make this run purely informational - no CurrentScan promotion at all, so a container's own already-existing device (found independently by ARP/Nmap) won't get its presence/IP/parent updated from this plugin either, regardless of <a href=\"#DOCKERDISC_CREATE_DEV\"><code>DOCKERDISC_CREATE_DEV</code></a>." | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "function": "CMD", | ||
| "type": { | ||
|
|
@@ -624,6 +719,41 @@ | |
| } | ||
| ] | ||
| }, | ||
| { | ||
| "function": "CREATE_DEV", | ||
| "type": { | ||
| "dataType": "boolean", | ||
| "elements": [ | ||
| { | ||
| "elementType": "input", | ||
| "elementOptions": [ | ||
| { | ||
| "type": "checkbox" | ||
| } | ||
| ], | ||
| "transformers": [] | ||
| } | ||
| ] | ||
| }, | ||
| "default_value": false, | ||
| "options": [], | ||
| "localized": [ | ||
| "name", | ||
| "description" | ||
| ], | ||
| "name": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "Create/confirm devices for containers with a real MAC" | ||
| } | ||
| ], | ||
| "description": [ | ||
| { | ||
| "language_code": "en_us", | ||
| "string": "When on, a container on a macvlan/ipvlan network (its own LAN-visible MAC) can create or confirm its own device entry, parented to its Docker host. Containers without their own MAC (bridge/overlay/etc.) never create a device either way." | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "function": "WATCH", | ||
| "type": { | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shorten description - implementation and config details should be in readme - this string is shown in the UI
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shortened to one line in b175a3b - moved the implementation detail to README.