bashclub/check-opnsense
1
0
Fork 0
mirror of https://github.com/bashclub/check-opnsense.git synced 2024-11-07 16:31:58 +01:00
Code Issues Projects Releases Wiki Activity

Update v0.99

Browse Source
This commit is contained in:
Thorsten Spille 2022-09-29 09:47:59 +02:00 committed by GitHub
parent 78a9ec63bc
commit 5532ebb3d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
opnsense_checkmk_agent.py
View File

@ -22,7 +22,7 @@
## copy to /usr/local/etc/rc.syshook.d/start/99-checkmk_agent and chmod +x ## copy to /usr/local/etc/rc.syshook.d/start/99-checkmk_agent and chmod +x
## ##
__VERSION__ = "0.98" __VERSION__ = "0.99"
import sys import sys
import os import os
@ -794,7 +794,7 @@ class checkmk_checker(object):
_client = { _client = {
"server" : _server.get("name"), "server" : _server.get("name"),
"common_name" : _client_raw[0], "common_name" : _client_raw[0],
"remote_ip" : _client_raw[1].split(":")[0], "remote_ip" : _client_raw[1].rsplit(":",1)[0], ## ipv6
"vpn_ip" : _client_raw[2], "vpn_ip" : _client_raw[2],
"vpn_ipv6" : _client_raw[3], "vpn_ipv6" : _client_raw[3],
"bytes_received" : int(_client_raw[4]), "bytes_received" : int(_client_raw[4]),
@ -934,7 +934,7 @@ class checkmk_checker(object):
if not _client: if not _client:
continue continue
_client["interface"] = _values[0].strip() _client["interface"] = _values[0].strip()
_client["endpoint"] = _values[3].strip().split(":")[0] _client["endpoint"] = _values[3].strip().rsplit(":",1)[0]
_client["last_handshake"] = int(_values[5].strip()) _client["last_handshake"] = int(_values[5].strip())
_client["bytes_received"], _client["bytes_sent"] = self._get_traffic("wireguard","",int(_values[6].strip()),int(_values[7].strip())) _client["bytes_received"], _client["bytes_sent"] = self._get_traffic("wireguard","",int(_values[6].strip()),int(_values[7].strip()))
_client["status"] = 2 if _now - _client["last_handshake"] > 300 else 0 ## 5min timeout _client["status"] = 2 if _now - _client["last_handshake"] > 300 else 0 ## 5min timeout
@ -1119,15 +1119,18 @@ class checkmk_checker(object):
if _cpu_temperatures: if _cpu_temperatures:
_cpu_temperature = int(max(_cpu_temperatures) * 1000) _cpu_temperature = int(max(_cpu_temperatures) * 1000)
_ret.append(f"CPU|enabled|unknown|{_cpu_temperature}") _ret.append(f"CPU|enabled|unknown|{_cpu_temperature}")
_out = self._run_prog("sysctl -n hw.acpi.thermal.tz0.temperature",timeout=2) _count = 0
if _out: for _tempsensor in self._available_sysctl_temperature_list:
try: _out = self._run_prog(f"sysctl -n {_tempsensor}",timeout=2) #dev.pchtherm.0.temperature
_zone_temp = int(float(_out.replace("C","")) * 1000) if _out:
except ValueError: try:
_zone_temp = None _zone_temp = int(float(_out.replace("C","")) * 1000)
if _zone_temp: except ValueError:
_ret.append(f"thermal_zone0|enabled|unknown|{_zone_temp}") _zone_temp = None
if _zone_temp:
_ret.append(f"thermal_zone{_count}|enabled|unknown|{_zone_temp}")
_count += 1
if len(_ret) < 2: if len(_ret) < 2:
return [] return []
return _ret return _ret
@ -1306,6 +1309,8 @@ class checkmk_server(TCPServer,checkmk_checker):
self.pidfile = pidfile self.pidfile = pidfile
self.onlyfrom = onlyfrom.split(",") if onlyfrom else None self.onlyfrom = onlyfrom.split(",") if onlyfrom else None
self.skipcheck = skipcheck.split(",") if skipcheck else [] self.skipcheck = skipcheck.split(",") if skipcheck else []
self._available_sysctl_list = self._run_prog("sysctl -aN").split()
self._available_sysctl_temperature_list = filter(lambda x: x.lower().find("temperature") > -1 and x.lower().find("cpu") == -1,self._available_sysctl_list)
self.encryptionkey = encryptionkey self.encryptionkey = encryptionkey
self._mutex = threading.Lock() self._mutex = threading.Lock()
self.user = pwd.getpwnam(user) self.user = pwd.getpwnam(user)