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

Add sysobjectid and hardware fields into oxidized maps (#13221)

Browse Source 
* add sysobjectid and hostname field into oxidized maps

* add app.js
This commit is contained in:
Negatifff
2021-09-17 03:00:06 +03:00
committed by GitHub
parent 117036bf29
commit 962e05ea6b
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/js/app.js
View File

File diff suppressed because one or more lines are too long

14
html/mix-manifest.json
View File

@@ -1,15 +1,15 @@
{
"/js/app.js": "/js/app.js?id=d5975c3162d3b388db35",
"/js/app.js": "/js/app.js?id=5fb72abe404b2429231c",
"/js/manifest.js": "/js/manifest.js?id=8d61162bb0caf92f60ff",
"/css/vendor.css": "/css/vendor.css?id=8d7b2ecb46047fe813e4",
"/css/app.css": "/css/app.css?id=b21e1df1f5102369eabc",
"/js/vendor.js": "/js/vendor.js?id=294cef17a3cf43045d61",
"/js/lang/de.js": "/js/lang/de.js?id=cc551d5a4aa98a6d7453",
"/js/lang/en.js": "/js/lang/en.js?id=fea09c4ff709961f8275",
"/js/lang/fr.js": "/js/lang/fr.js?id=aeac40fc3bd66cdfa69e",
"/js/lang/it.js": "/js/lang/it.js?id=ae198ed0b94351e4d950",
"/js/lang/de.js": "/js/lang/de.js?id=8959e785f5790d6b6836",
"/js/lang/en.js": "/js/lang/en.js?id=cad37e39e9721bd08fdd",
"/js/lang/fr.js": "/js/lang/fr.js?id=707149152bde5b5e2b8d",
"/js/lang/it.js": "/js/lang/it.js?id=4e3b200da489000822dd",
"/js/lang/ru.js": "/js/lang/ru.js?id=f6b7c078755312a0907c",
"/js/lang/uk.js": "/js/lang/uk.js?id=c19a5dcee4724579cb41",
"/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=427acc5a5aed577c98e4",
"/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=f648dcc6f44e78951150"
"/js/lang/zh-CN.js": "/js/lang/zh-CN.js?id=acab91683e556299b62b",
"/js/lang/zh-TW.js": "/js/lang/zh-TW.js?id=4d48f47a17010848f963"
}

2
includes/html/api_functions.inc.php
View File

@@ -1395,7 +1395,7 @@ function list_oxidized(Illuminate\Http\Request $request)
->whereNotIn('type', Config::get('oxidized.ignore_types', []))
->whereNotIn('os', Config::get('oxidized.ignore_os', []))
->whereAttributeDisabled('override_Oxidized_disable')
->select(['hostname', 'sysName', 'sysDescr', 'hardware', 'os', 'ip', 'location_id'])
->select(['hostname', 'sysName', 'sysDescr', 'sysObjectID', 'hardware', 'os', 'ip', 'location_id'])
->get();
/** @var Device $device */

2
misc/config_definitions.json
View File

@@ -4250,7 +4250,7 @@
"type": "oxidized-maps",
"validate": {
"value": "array",
"value.*": "array|keys_in:hostname,sysName,sysDescr,hardware,os,location,ip",
"value.*": "array|keys_in:hostname,sysName,sysDescr,sysObjectID,hardware,os,location,ip",
"value.*.*": "array|min:1",
"value.*.*.*": "array|size:2|keys_in:match,regex,value",
"value.*.*.*.value": "required|string",

2
resources/js/components/SettingOxidizedMaps.vue
View File

@@ -57,6 +57,8 @@
<option value="hostname">hostname</option>
<option value="os">os</option>
<option value="type">type</option>
<option value="hostname">hostname</option>
<option value="sysObjectID">sysObjectID</option>
</select>
</div>
</div>