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 opnsense_checkmk_agent.py

Browse Source
This commit is contained in:
Thorsten Spille 2022-06-28 21:38:28 +02:00 committed by GitHub
parent c3407e7e30
commit db62588d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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.95" __VERSION__ = "0.952"
import sys import sys
import os import os
@ -475,6 +475,8 @@ class checkmk_checker(object):
_cidr = _match.group("cidr") _cidr = _match.group("cidr")
_ipaddr = _match.group("ipaddr") _ipaddr = _match.group("ipaddr")
_vhid = _match.group("vhid") _vhid = _match.group("vhid")
if not _vhid:
_interface_dict["cidr"] = _cidr ## cidr wenn kein vhid
## fixme ipaddr dict / vhid dict ## fixme ipaddr dict / vhid dict
if _key == "inet6": if _key == "inet6":
_match = re.search("^(?P<ipaddr>[0-9a-f:]+)\/(?P<prefix>\d+).*?(?:vhid\s(?P<vhid>\d+)|$)",_val,re.M) _match = re.search("^(?P<ipaddr>[0-9a-f:]+)\/(?P<prefix>\d+).*?(?:vhid\s(?P<vhid>\d+)|$)",_val,re.M)
@ -482,6 +484,8 @@ class checkmk_checker(object):
_ipaddr = _match.group("ipaddr") _ipaddr = _match.group("ipaddr")
_prefix = _match.group("prefix") _prefix = _match.group("prefix")
_vhid = _match.group("vhid") _vhid = _match.group("vhid")
if not _vhid:
_interface_dict["prefix"] = _prefix
## fixme ipaddr dict / vhid dict ## fixme ipaddr dict / vhid dict
if _key == "carp": if _key == "carp":
_match = re.search("(?P<status>MASTER|BACKUP)\svhid\s(?P<vhid>\d+)\sadvbase\s(?P<base>\d+)\sadvskew\s(?P<skew>\d+)",_val,re.M) _match = re.search("(?P<status>MASTER|BACKUP)\svhid\s(?P<vhid>\d+)\sadvbase\s(?P<base>\d+)\sadvskew\s(?P<skew>\d+)",_val,re.M)
@ -541,7 +545,10 @@ class checkmk_checker(object):
def checklocal_carpstatus(self): def checklocal_carpstatus(self):
_ret = [] _ret = []
_virtual = self._config_reader().get("virtualip").get("vip") _virtual = self._config_reader().get("virtualip")
if not _virtual:
return []
_virtual = _virtual.get("vip")
if not _virtual: if not _virtual:
return [] return []
if type(_virtual) != list: if type(_virtual) != list:
@ -560,7 +567,7 @@ class checkmk_checker(object):
_status = 0 if _carpstatus == "BACKUP" else 1 _status = 0 if _carpstatus == "BACKUP" else 1
if not _interface: if not _interface:
continue continue
_ret.append(f"{_status} \"CARP: {_interface_name}@{_vhid}\" master={_carpstatus_num} {_carpstatus} {_ipaddr}") _ret.append(f"{_status} \"CARP: {_interface_name}@{_vhid}\" master={_carpstatus_num} {_carpstatus} {_ipaddr} ({_interface})")
return _ret return _ret
def check_dhcp(self): def check_dhcp(self):