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

3
scripts/lua/hosts_stats.lua
View file

@ -10,6 +10,7 @@ local host_pools_utils = require "host_pools_utils"
local ts_utils = require("ts_utils")
local page_utils = require("page_utils")
local custom_column_utils = require("custom_column_utils")
local discover = require("discover_utils")
active_page = "hosts"
local have_nedge = ntop.isnEdge()
@ -257,7 +258,7 @@ if (_GET["page"] ~= "historical") then
network = not isEmptyString(network_name) and i18n("hosts_stats.in_network", {network=network_name}) or "",
network_cidr = not isEmptyString(cidr) and i18n("hosts_stats.in_network", {network=cidr}) or "",
ip_version = ipver_title or "",
["os"] = os_ or "",
["os"] = discover.getOsName(os_),
country_asn_or_mac = country or asninfo or mac or pool_ or "",
vlan = vlan_title or "",
}) .. charts_icon