From b162eff5eea06d29abf3970d695260b00412da0a Mon Sep 17 00:00:00 2001
From: SourceDoctor <sourcehhdoctor@googlemail.com>
Date: Sat, 21 Nov 2020 18:08:46 +0100
Subject: [PATCH] Global Settings - Discovery Network (#12334)

Co-authored-by: Tony Murray <murraytony@gmail.com>
---
 html/mix-manifest.json         |  2 +-
 misc/config_definitions.json   |  8 +++++++-
 resources/lang/en/settings.php | 11 +++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/html/mix-manifest.json b/html/mix-manifest.json
index 33b77f767d..136345f587 100644
--- a/html/mix-manifest.json
+++ b/html/mix-manifest.json
@@ -4,7 +4,7 @@
     "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
     "/js/vendor.js": "/js/vendor.js?id=4935c8e779ce375acbf4",
     "/js/lang/de.js": "/js/lang/de.js?id=2c4ad02fa89b684d4f57",
-    "/js/lang/en.js": "/js/lang/en.js?id=a094c09a83b751d2aea3",
+    "/js/lang/en.js": "/js/lang/en.js?id=bd8b8dca7021ad041f0e",
     "/js/lang/fr.js": "/js/lang/fr.js?id=9552304f4fd7338af018",
     "/js/lang/it.js": "/js/lang/it.js?id=514765c5399ffaa111b9",
     "/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
diff --git a/misc/config_definitions.json b/misc/config_definitions.json
index 7e37d7aaf7..150660de3e 100644
--- a/misc/config_definitions.json
+++ b/misc/config_definitions.json
@@ -633,6 +633,9 @@
             ]
         },
         "autodiscovery.nets-exclude": {
+            "group": "discovery",
+            "section": "networks",
+            "order": 2,
             "type": "array",
             "default": [
                 "0.0.0.0/8",
@@ -3717,7 +3720,10 @@
             "type": "directory"
         },
         "nets": {
-            "type": "array"
+            "type": "array",
+            "group": "discovery",
+            "section": "networks",
+            "order": 1
         },
         "network_map_items": {
             "default": [
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 12a21ebf7c..9ca6963104 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -39,6 +39,7 @@ return [
             'route' => 'Routes Discovery Module',
             'discovery_modules' => 'Discovery Modules',
             'storage' => 'Storage Module',
+            'networks' => 'Networks',
         ],
         'external' => [
             'binaries' => 'Binary Locations',
@@ -1144,6 +1145,16 @@ return [
             'description' => 'Max number of routes allowed for discovery',
             'help' => 'No route will be discovered if the size of the routing table is bigger than this number',
         ],
+        'nets' => [
+            'description' => 'Autodiscovery Networks',
+            'help' => 'Networks from which devices will be discovered automatically.',
+        ],
+        'autodiscovery' => [
+            'nets-exclude' => [
+                'description' => 'Networks/IPs to be ignored',
+                'help' => 'Networks/IPs which will not be discovered automatically. Excludes also IPs from Autodiscovery Networks',
+            ],
+        ],
         'route_purge' => [
             'description' => 'Route entries older than (days)',
             'help' => 'Cleanup done by daily.sh',