vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 15:39:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Separate bar with the pcap storage utilization (it a separate volume has been configured)

Browse source
This commit is contained in:
Alfredo Cardigliano 2019-06-26 18:31:46 +02:00
parent b29894d9bb
commit 9372eb8962
3 changed files with 100 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scripts/lua/modules/storage_utils.lua
View file

@ -20,7 +20,7 @@ local storage_utils = {}
-- #################################
function storage_utils.interfaceStorageInfo(ifid)
function storage_utils.interfaceStorageInfo(ifid, separate_pcap_volume)
local info = { total = 0 }
local key = "ntopng.cache."..ifid..".storage_info"
@ -47,7 +47,7 @@ function storage_utils.interfaceStorageInfo(ifid)
local pcap_storage_info = recording_utils.storageInfo(ifid)
local total_pcap_dump_used = (pcap_storage_info.if_used + pcap_storage_info.extraction_used)
info["pcap"] = total_pcap_dump_used
if dirs.pcapdir == dirs.workingdir then
if separate_pcap_volume then
info["total"] = info["total"] + total_pcap_dump_used
end
end
@ -64,10 +64,22 @@ end
function storage_utils.storageInfo()
local ifnames = interface.getIfNames()
local info = { total = 0, pcap_total = 0, interfaces = {} }
local volume_info
local pcap_volume_info
local separate_pcap_volume = false
local volume_info = recording_utils.volumeInfo(dirs.workingdir)
if dirs.pcapdir ~= dirs.workingdir then
pcap_volume_info = recording_utils.volumeInfo(dirs.pcapdir)
if pcap_volume_info.dev ~= volume_info.dev then
separate_pcap_volume = true
end
end
for id, name in pairs(ifnames) do
local ifid = tonumber(id)
local if_info = storage_utils.interfaceStorageInfo(ifid)
local if_info = storage_utils.interfaceStorageInfo(ifid, separate_pcap_volume)
info.interfaces[ifid] = if_info
info.total = info.total + if_info.total
if if_info.pcap ~= nil then
@ -75,12 +87,16 @@ function storage_utils.storageInfo()
end
end
local volume_info = recording_utils.volumeInfo(dirs.workingdir)
info.system = volume_info.used - info.total
info.avail = volume_info.avail
info.volume_size = volume_info.total
info.volume_mount = volume_info.mount
info.volume_dev = volume_info.dev
info.other = volume_info.used - info.total
info.volume_size = volume_info.total
info.volume_dev = volume_info.dev
if separate_pcap_volume then
pcap_volume_info = recording_utils.volumeInfo(dirs.pcapdir)
info.pcap_other = pcap_volume_info.used - info.pcap_total
info.pcap_volume_size = pcap_volume_info.total
info.pcap_volume_dev = pcap_volume_info.dev
end
return info
end