vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +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

53
scripts/lua/modules/lua_utils.lua
View file

@ -1154,51 +1154,6 @@ end
-- #################################
function getOSIcon(name)
icon = ""
if(findString(name, "Linux") or findString(name, "Ubuntu")) then icon = '<i class=\'fa fa-linux fa-lg\'></i> '
elseif(findString(name, "Android")) then icon = '<i class=\'fa fa-android fa-lg\'></i> '
elseif(findString(name, "Windows") or findString(name, "Win32") or findString(name, "MSIE")) then icon = '<i class=\'fa fa-windows fa-lg\'></i> '
elseif(findString(name, "iPhone") or findString(name, "iPad") or findString(name, "OS X") ) then icon = '<i class=\'fa fa-apple fa-lg\'></i> '
end
return(icon)
end
-- #################################
function getOperatingSystemName(id)
if(id == 0) then return("Unknown")
elseif(id == 1) then return("Linux")
elseif(id == 2) then return("Windows")
elseif(id == 3) then return("MacOS")
elseif(id == 4) then return("iOS")
elseif(id == 5) then return("Android")
elseif(id == 6) then return("LaserJET")
elseif(id == 7) then return("AppleAirport")
else
return("") -- Unknown
end
end
-- #################################
function getOperatingSystemIcon(id)
if(id == 1) then return(' <i class=\'fa fa-linux fa-lg\'></i>')
elseif(id == 2) then return(' <i class=\'fa fa-windows fa-lg\'></i>')
elseif(id == 3) then return(' <i class=\'fa fa-apple fa-lg\'></i>')
elseif(id == 4) then return(' <i class=\'fa fa-apple fa-lg\'></i>')
elseif(id == 5) then return(' <i class=\'fa fa-android fa-lg\'></i>')
elseif(id == 6) then return(' LasetJET')
elseif(id == 7) then return(' Apple Airport')
else return("")
end
end
-- #################################
function getApplicationIcon(name)
local icon = ""
if(name == nil) then name = "" end
@ -1235,14 +1190,6 @@ function getCategoryLabel(cat_name)
return(cat_name)
end
function mapOS2Icon(name)
if(name == nil) then
return("")
else
return(getOSIcon(name) .. name)
end
end
function getItemsNumber(n)
tot = 0
for k,v in pairs(n) do