vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-02 00:40:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Unify os (#2755)

Browse source 
* Unify OS information.

Now OS information is only stored into the Host. The lua uses numeric IDs to handle OS.

* Fix network discovery OS

* Show OS detail into the host details page
This commit is contained in:
Emanuele Faranda 2019-08-08 12:09:51 +00:00 • committed by GitHub
parent 81a9963e46
commit c829c4c3c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 273 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/lua/discover.lua
View file

@ -28,7 +28,7 @@ local title = {operating_system = '', manufacturer = '', device_type = ''}
if(not isEmptyString(os_filter)) then
page_params.operating_system = os_filter
title.operating_system = getOperatingSystemName(tonumber(os_filter))
title.operating_system = discover.getOsName(tonumber(os_filter))
end
if(not isEmptyString(manuf_filter)) then
page_params.manufacturer = manuf_filter
@ -178,12 +178,12 @@ elseif discovered["status"]["code"] == "OK" then -- everything is ok
print('<li><a href="' .. getPageUrl(base_url, os_params) .. '">' .. i18n("mac_stats.all_devices") .. '</a></li>')
for osid, count in pairsByKeys(operating_systems) do
local os_name = getOperatingSystemName(osid)
local os_name = discover.getOsName(osid)
if isEmptyString(os_name) then os_name = i18n("unknown") end
os_params.operating_system = osid
print('<li' .. ternary(os_filter == tostring(osid), ' class="active"', '') .. '><a href="' ..
getPageUrl(base_url, os_params) .. '">' .. --(getOperatingSystemIcon(osid):gsub("'",'"') or "") ..
getPageUrl(base_url, os_params) .. '">' .. --(discover.getOsIcon(osid):gsub("'",'"') or "") ..
os_name .." (" ..count.. ')</a></li>')
end
print('</ul></div>\'],')