vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated network discovery to vuejs (#7368)

Browse source
This commit is contained in:
Matteo Biscosi 2023-04-05 09:12:57 +00:00
parent 804a9a5c68
commit 95c585e2d0
11 changed files with 278 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

23
scripts/lua/rest/v2/get/network/discovery/discover.lua
View file

@ -10,7 +10,7 @@ local json = require "dkjson"
local discover = require "discover_utils"
local rest_utils = require "rest_utils"
local ifid = tonumber(_GET["ifid"]) or ""
local ifid = tostring(_GET["ifid"]) or ""
local os_filter = tonumber(_GET["operating_system"])
local devtype_filter = tonumber(_GET["device_type"])
local manuf_filter = _GET["manufacturer"]
@ -30,7 +30,7 @@ end
-- ################################################
if isEmptyString(ifid) then
ifid = ifname
ifid = interface.getId()
end
interface.select(ifid)
@ -119,16 +119,16 @@ for _, el in pairs(discovered["devices"]) do
local rec = {}
rec.column_ip = ip2detailshref(el["ip"], nil, nil, el["ip"])
rec.ip = ip2detailshref(el["ip"], nil, nil, el["ip"])
..ternary(el["icon"], " " ..(el["icon"] or "").. " ", "")
..ternary(el["ghost"], " <font color=red>" ..(discover.ghost_icon or "").. "</font>", "")
rec.column_mac = [[<a href="]] ..ntop.getHttpPrefix().. [[/lua/mac_details.lua?host=]] ..el["mac"].. [[">]] ..get_symbolic_mac(el["mac"], true).. [[</a>]]
rec.column_name = el.name
rec.column_info = el.info
rec.column_device = el["device_label"]
rec.column_manufacturer = el.manufacturer
rec.column_os = el.os
rec.mac = [[<a href="]] ..ntop.getHttpPrefix().. [[/lua/mac_details.lua?host=]] ..el["mac"].. [[">]] ..get_symbolic_mac(el["mac"], true).. [[</a>]]
rec.name = el.name
rec.info = el.info
rec.device = el["device_label"]
rec.manufacturer = el.manufacturer
rec.os = el.os
res[#res + 1] = rec
@ -141,7 +141,4 @@ end
-- ################################################
rest_utils.extended_answer(rest_utils.consts.success.ok, res, {
["recordsFiltered"] = #res,
["recordsTotal"] = #res
})
rest_utils.answer(rest_utils.consts.success.ok, res)

17
scripts/lua/rest/v2/get/network/discovery/run_discovery.lua Normal file
View file

@ -0,0 +1,17 @@
--
-- (C) 2021 - ntop.org
--
local dirs = ntop.getDirs()
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
require "lua_utils"
local discover = require "discover_utils"
local rest_utils = require "rest_utils"
local ifid = tostring(_GET["ifid"]) or interface.getId()
discover.requestNetworkDiscovery(ifid)
local discovery_requested = discover.networkDiscoveryRequested(ifid)
rest_utils.answer(rest_utils.consts.success.ok)