net-mgmt/zabbix-proxy: add logfile and logformat to WebUI (#1937)
This commit is contained in:
Starkstromkonsument
GitHub
parent
ee651b0dbc
commit
c865509407
|
|
@ -1,6 +1,5 @@
|
|||
PLUGIN_NAME= zabbix4-proxy
|
||||
PLUGIN_VERSION= 1.2
|
||||
PLUGIN_REVISION= 1
|
||||
PLUGIN_VERSION= 1.3
|
||||
PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring
|
||||
PLUGIN_DEPENDS= zabbix4-proxy
|
||||
PLUGIN_CONFLICTS= zabbix5-proxy
|
||||
|
|
|
|||
|
|
@ -12,6 +12,10 @@ WWW: http://www.zabbix.com/
|
|||
Plugin Changelog
|
||||
----------------
|
||||
|
||||
1.3
|
||||
|
||||
* Add logfile to WebUI (Starkstromkonsument <https://github.com/Starkstromkonsument>)
|
||||
|
||||
1.2
|
||||
|
||||
* Allow adding multiple listen addresses
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
<patterns>
|
||||
<pattern>ui/zabbixproxy/*</pattern>
|
||||
<pattern>api/zabbixproxy/*</pattern>
|
||||
<pattern>ui/diagnostics/log/core/zabbix_proxy/*</pattern>
|
||||
<pattern>api/diagnostics/log/core/zabbix_proxy/*</pattern>
|
||||
</patterns>
|
||||
</page-services-zabbixproxy>
|
||||
</acl>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<menu>
|
||||
<Services>
|
||||
<Zabbixproxy VisibleName="Zabbix Proxy" cssClass="fa fa-eye" url="/ui/zabbixproxy/general/index" />
|
||||
<Zabbixproxy VisibleName="Zabbix Proxy" cssClass="fa fa-eye">
|
||||
<Settings order="10" url="/ui/zabbixproxy/general/index"/>
|
||||
<Log VisibleName="Log File" order="50" url="/ui/diagnostics/log/core/zabbix_proxy"/>
|
||||
</Zabbixproxy>
|
||||
</Services>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
"""
|
||||
Copyright (c) 2020 Ad Schellevis <ad@opnsense.org>
|
||||
Copyright (C) 2020 Starkstromkonsument <https://github.com/Starkstromkonsument>
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
"""
|
||||
import re
|
||||
import datetime
|
||||
from . import BaseLogFormat
|
||||
zabbix_timeformat = r'(\d*):(\d{4}\d{2}\d{2}:\d{2}\d{2}\d{2})\.\d{3}\s(.*)'
|
||||
|
||||
|
||||
class ZabbixLogFormat(BaseLogFormat):
|
||||
def __init__(self, filename):
|
||||
super(ZabbixLogFormat, self).__init__(filename)
|
||||
self._priority = 100
|
||||
|
||||
def match(self, line):
|
||||
return self._filename.find('zabbix_proxy') > -1 and re.match(zabbix_timeformat, line) is not None
|
||||
|
||||
@staticmethod
|
||||
def timestamp(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
grp = tmp.group(2)
|
||||
return datetime.datetime.strptime(grp, "%Y%m%d:%H%M%S").isoformat()
|
||||
|
||||
@staticmethod
|
||||
def process_name(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
return tmp.group(1)
|
||||
|
||||
@staticmethod
|
||||
def line(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
return tmp.group(3)
|
||||
|
||||
|
|
@ -21,6 +21,7 @@ Plugin Changelog
|
|||
1.3
|
||||
|
||||
* Switch to zabbix5-proxy
|
||||
* Add logfile to WebUI (Starkstromkonsument <https://github.com/Starkstromkonsument>)
|
||||
|
||||
1.2
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
<patterns>
|
||||
<pattern>ui/zabbixproxy/*</pattern>
|
||||
<pattern>api/zabbixproxy/*</pattern>
|
||||
<pattern>ui/diagnostics/log/zabbix/zabbix_proxy/*</pattern>
|
||||
<pattern>api/diagnostics/log/zabbix/zabbix_proxy/*</pattern>
|
||||
</patterns>
|
||||
</page-services-zabbixproxy>
|
||||
</acl>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
<menu>
|
||||
<Services>
|
||||
<Zabbixproxy VisibleName="Zabbix Proxy" cssClass="fa fa-eye" url="/ui/zabbixproxy/general/index" />
|
||||
<Zabbixproxy VisibleName="Zabbix Proxy" cssClass="fa fa-eye">
|
||||
<Settings order="10" url="/ui/zabbixproxy/general/index"/>
|
||||
<Log VisibleName="Log File" order="50" url="/ui/diagnostics/log/zabbix/zabbix_proxy"/>
|
||||
</Zabbixproxy>
|
||||
</Services>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
"""
|
||||
Copyright (c) 2020 Ad Schellevis <ad@opnsense.org>
|
||||
Copyright (C) 2020 Starkstromkonsument <https://github.com/Starkstromkonsument>
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
"""
|
||||
import re
|
||||
import datetime
|
||||
from . import BaseLogFormat
|
||||
zabbix_timeformat = r'(\d*):(\d{4}\d{2}\d{2}:\d{2}\d{2}\d{2})\.\d{3}\s(.*)'
|
||||
|
||||
|
||||
class ZabbixLogFormat(BaseLogFormat):
|
||||
def __init__(self, filename):
|
||||
super(ZabbixLogFormat, self).__init__(filename)
|
||||
self._priority = 100
|
||||
|
||||
def match(self, line):
|
||||
return self._filename.find('zabbix_proxy') > -1 and re.match(zabbix_timeformat, line) is not None
|
||||
|
||||
@staticmethod
|
||||
def timestamp(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
grp = tmp.group(2)
|
||||
return datetime.datetime.strptime(grp, "%Y%m%d:%H%M%S").isoformat()
|
||||
|
||||
@staticmethod
|
||||
def process_name(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
return tmp.group(1)
|
||||
|
||||
@staticmethod
|
||||
def line(line):
|
||||
tmp = re.match(zabbix_timeformat, line)
|
||||
return tmp.group(3)
|
||||
|
||||
Loading…
Reference in New Issue