Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-25 18:38:30 +00:00
Code Issues Releases Wiki Activity

Raise ValueError in getCounters()

Browse source 
Only there are we able to determine if counters are present.
nft_cmd() only checks if there is any output at all.
This commit is contained in:
Sandro 2022-06-08 01:21:42 +02:00
parent 24e6888b68
commit dedc9683b6
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/network/nft_counters
View file

@ -124,7 +124,7 @@ def nft_cmd(nftlib, cmd):
if len(output) == 0: if len(output) == 0:
# more error control # more error control
raise ValueError("ERROR: no output from libnftables") raise RuntimeError("ERROR: no output from libnftables")
# transform the libnftables JSON output into generic python data structures # transform the libnftables JSON output into generic python data structures
ruleset = json.loads(output)["nftables"] ruleset = json.loads(output)["nftables"]
@ -144,8 +144,12 @@ def getCounters():
nft.set_handle_output(True) nft.set_handle_output(True)
ruleset = nft_cmd(nft, "list counters") ruleset = nft_cmd(nft, "list counters")
counters = _find_objects(ruleset, "counter")
return _find_objects(ruleset, "counter") if len(counters) > 0:
return counters
else:
raise ValueError("No counters in nftables")
class MuninNftCountersPlugin(MuninPlugin): class MuninNftCountersPlugin(MuninPlugin):
@ -179,7 +183,7 @@ class MuninNftCountersPlugin(MuninPlugin):
""" """
MuninPlugin.__init__(self, argv, env, debug) MuninPlugin.__init__(self, argv, env, debug=True)
# Munin graph parameters # Munin graph parameters
graph_category = "network" graph_category = "network"