Add log parser to display logs correctly (#1706)

This commit is contained in:
nan0 2020-02-20 15:02:08 +01:00 committed by GitHub
parent 64e720af63
commit 144f3e041b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 1 deletions

View File

@ -1,5 +1,5 @@
PLUGIN_NAME= telegraf
PLUGIN_VERSION= 1.7.6
PLUGIN_VERSION= 1.7.7
PLUGIN_COMMENT= Agent for collecting metrics and data
PLUGIN_DEPENDS= telegraf
PLUGIN_MAINTAINER= m.muenz@gmail.com

View File

@ -11,6 +11,9 @@ Kafka, MQTT, NSQ, and many others.
Plugin Changelog
================
1.7.7
* Fix log not properly parsed
1.7.6
* Add 'Debug' and 'Quiet' setting

View File

@ -0,0 +1,49 @@
"""
Copyright (c) 2020 Ad Schellevis <ad@opnsense.org>
Copyright (c) 2020 devNan0 <nan0@nan0.dev>
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
telegraf_timeformat = r'^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z).*'
class TelegrafLogFormat(BaseLogFormat):
def __init__(self, filename):
super(TelegrafLogFormat, self).__init__(filename)
self._priority = 100
def match(self, line):
return self._filename.find('telegraf') > -1 and re.match(telegraf_timeformat, line) is not None
@staticmethod
def timestamp(line):
tmp = re.match(telegraf_timeformat, line)
grp = tmp.group(1)
return datetime.datetime.strptime(grp, "%Y-%m-%dT%H:%M:%SZ").isoformat()
@staticmethod
def line(line):
return line[20:].strip()