mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move storage module settings (#11206)

Browse Source 
Actually verify regex setting
This commit is contained in:
Tony Murray
2020-02-26 10:53:33 -06:00
committed by GitHub
parent f2346caef7
commit 79f2debbdb
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/mix-manifest.json
View File

@@ -4,7 +4,7 @@
"/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
"/js/vendor.js": "/js/vendor.js?id=58c8fc0774b5843ec004",
"/js/lang/de.js": "/js/lang/de.js?id=18b0b0e06813d1afed92",
"/js/lang/en.js": "/js/lang/en.js?id=620e86602d9e9bb10170",
"/js/lang/en.js": "/js/lang/en.js?id=537f7bed9b6e624e0e6e",
"/js/lang/fr.js": "/js/lang/fr.js?id=07da32f987ba907e1f7f",
"/js/lang/ru.js": "/js/lang/ru.js?id=e10e85f321f1395378b6",
"/js/lang/uk.js": "/js/lang/uk.js?id=c8d4937e3ca47b60b7ac",

29
misc/config_definitions.json
View File

@@ -3199,8 +3199,8 @@
"type": "boolean"
},
"ignore_mount": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 3,
"default": [
"/kern",
@@ -3213,22 +3213,22 @@
"type": "array"
},
"ignore_mount_network": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 0,
"default": true,
"type": "boolean"
},
"ignore_mount_optical": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 1,
"default": true,
"type": "boolean"
},
"ignore_mount_regexp": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 5,
"default": [
"/on: \\/packages/",
@@ -3243,18 +3243,21 @@
"/UMA/",
"/^\\/Volumes\\/OS X Base System/"
],
"type": "array"
"type": "array",
"validate": {
"value.*": "is_regex"
}
},
"ignore_mount_removable": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 2,
"default": true,
"type": "boolean"
},
"ignore_mount_string": {
"group": "system",
"section": "mountpoints_to_ignore",
"group": "discovery",
"section": "storage",
"order": 4,
"default": [
"packages",

2
resources/lang/en/settings.php
View File

@@ -32,6 +32,7 @@ return [
'general' => 'General Discovery Settings',
'route' => 'Routes Discovery Module',
'discovery_modules' => 'Discovery Modules',
'storage' => 'Storage Module'
],
'external' => [
'binaries' => 'Binary Locations',
@@ -54,7 +55,6 @@ return [
'proxy' => 'Proxy',
'updates' => 'Updates',
'server' => 'Server',
'mountpoints_to_ignore' => 'Mountpoints to be ignored',
],
'webui' => [
'availability-map' => 'Availability Map Settings',