epylog January 2012

epylog@lists.fedorahosted.org

3 participants
307 discussions

[epylog: 290/297] add rsyncd module
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit ac1d87a876ae1fc1b87e2935c594a8f2d765becb Author: Seth Vidal <skvidal(a)fedoraproject.org> Date: Wed Aug 24 17:04:39 2011 -0400 add rsyncd module etc/modules.d/rsyncd.conf.in | 15 +++ modules/rsyncd_mod.py | 219 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+), 0 deletions(-) --- diff --git a/etc/modules.d/rsyncd.conf.in b/etc/modules.d/rsyncd.conf.in new file mode 100644 index 0000000..a271f13 --- /dev/null +++ b/etc/modules.d/rsyncd.conf.in @@ -0,0 +1,15 @@ +[module] +desc = Rsyncd +exec = %%MODULES_DIR%%/rsyncd_mod.py +files = /var/log/messages[.#] +enabled = no +internal = yes +outhtml = yes +priority = 7 + +[conf] +## +# Report this many "top ranking hosts" +# +report_top = 10 +# ignore_hosts = list of dns-resolved host names you want to ignore rsyncs on diff --git a/modules/rsyncd_mod.py b/modules/rsyncd_mod.py new file mode 100644 index 0000000..5ec899c --- /dev/null +++ b/modules/rsyncd_mod.py @@ -0,0 +1,219 @@ +#!/usr/bin/python -tt +""" +Rsyncd log parsing module for Epylog +""" + +## +# Copyright (C) 2003 by Duke University +# Written by Seth Vidal <skvidal at phy.duke.edu> +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# + + +import sys +import re + +## +# This is for testing purposes, so you can invoke this from the +# modules directory. See also the testing notes at the end of the +# file. +# +sys.path.insert(0, '../py/') +from epylog import Result, InternalModule + +class rsyncd_mod(InternalModule): + ## + # opts: is a map with extra options set in + # [conf] section of the module config, or on the + # command line using -o flag to the module. + # logger: A logging object. API: + # logger.put(loglvl, 'Message') + # Only critical stuff needs to go onto lvl 0. + # Common output goes to lvl 1. + # Others are debug levels. + # + def __init__(self, opts, logger): + ## + # Do a "super-init" so the class we are subclassing gets + # instantiated. + # + InternalModule.__init__(self) + self.logger = logger + ## + # Convenience + # + rc = re.compile + + self.regex_map = { + rc('rsyncd\[\d+\]: rsync on'): self.rsync_hosts, + rc('rsyncd\[\d+\]: (?:sent|wrote)\s\S*\sbytes'): self.rsync_results + } + self.topcount = int(opts.get('report_top', 5)) #get report_top, default to 5 if not set + ig_s = opts.get('ignore_hosts', '') + ig_s.replace(',',' ') + self.ignore_hosts = ig_s.split(' ') + # dict to store all of our data + self.rsync_pid_bytes = {} + self.rsync_pid_host = {} + self.rsync_host_loc = rc('rsyncd\[(\d+)\]: rsync\son\s(\S*)\sfrom\s.*$(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$') + self.rsync_bytes = rc('rsyncd\[(\d+)\]: (?:sent|wrote)\s(\d+) bytes (?:read|received)\s(\d+) bytes total size (\d+)') + + def rsync_hosts(self, linemap): + (sys, msg, multi) = self.get_smm(linemap) + pid, loc, ip = self.rsync_host_loc.search(msg).groups() + host = self.gethost(ip) + if host not in self.ignore_hosts: + self.rsync_pid_host[pid] = (host, loc) + return {(loc, host): 1} + + def rsync_results(self, linemap): + (sys, msg, multi) = self.get_smm(linemap) + pid, wbytes, rbytes, tbytes = self.rsync_bytes.search(msg).groups() + self.rsync_pid_bytes[pid] = (wbytes, rbytes, tbytes) + return {(pid, wbytes): 1} + + def _uniq(self, s): + """Return a list of the elements in s, but without duplicates. + + For example, unique([1,2,3,1,2,3]) is some permutation of [1,2,3], + unique("abcabc") some permutation of ["a", "b", "c"], and + unique(([1, 2], [2, 3], [1, 2])) some permutation of + [[2, 3], [1, 2]]. + + For best speed, all sequence elements should be hashable. Then + unique() will usually work in linear time. + + If not possible, the sequence elements should enjoy a total + ordering, and if list(s).sort() doesn't raise TypeError it's + assumed that they do enjoy a total ordering. Then unique() will + usually work in O(N*log2(N)) time. + + If that's not possible either, the sequence elements must support + equality-testing. Then unique() will usually work in quadratic + time. + """ + + n = len(s) + if n == 0: + return [] + + # Try using a dict first, as that's the fastest and will usually + # work. If it doesn't work, it will usually fail quickly, so it + # usually doesn't cost much to *try* it. It requires that all the + # sequence elements be hashable, and support equality comparison. + u = {} + try: + for x in s: + u[x] = 1 + except TypeError: + del u # move on to the next method + else: + return u.keys() + + # We can't hash all the elements. Second fastest is to sort, + # which brings the equal elements together; then duplicates are + # easy to weed out in a single pass. + # NOTE: Python's list.sort() was designed to be efficient in the + # presence of many duplicate elements. This isn't true of all + # sort functions in all languages or libraries, so this approach + # is more effective in Python than it may be elsewhere. + try: + t = list(s) + t.sort() + except TypeError: + del t # move on to the next method + else: + assert n > 0 + last = t[0] + lasti = i = 1 + while i < n: + if t[i] != last: + t[lasti] = last = t[i] + lasti += 1 + i += 1 + return t[:lasti] + + # Brute force is all that's left. + u = [] + for x in s: + if x not in u: + u.append(x) + return u + + def _sortByVal(self, dict, reverse=0): + if type(dict) is not type({}): return [] + keys = dict.keys() + s = map(lambda k: (dict[k], k), keys) + s.sort() + if reverse: s.reverse() + return s + + def finalize(self, resultset): + ## + # A resultset is a dictionary of all values returned by your + # handler functions -- except they are unique and show how many + # times each tuple occurs. + # See epylog.Result for some convenience methods to use when + # processing and analyzing the results. + # + + hostloc = {} # key = host, val = [loc, loc, loc] + hosttotal = {} # key = host val = totalwbytes + + foo = "<table border=0>\n\t<tr>\n" + + for pid in self.rsync_pid_host.keys(): + (host, loc) = self.rsync_pid_host[pid] + if self.rsync_pid_bytes.has_key(pid): + if not hostloc.has_key(host): + hostloc[host] = [] + if not hosttotal.has_key(host): + hosttotal[host] = 0L + hostloc[host].append(loc) + bytes = long(self.rsync_pid_bytes[pid][0]) + hosttotal[host] += bytes + + for host in hostloc.keys(): + hostloc[host] = self._uniq(hostloc[host]) + + hosts = self._sortByVal(hosttotal, 1) + count = 0L + for (tot,host) in hosts[:self.topcount]: + if count % 2: + bgcolor = "#dddddd" + else: + bgcolor = "#ffffff" + count+=1 + line = '\t\t<td bgcolor=%s valign=\"top\">%s</td>\n' % (bgcolor, host) + line = line + '\t\t<td bgcolor=%s valign="top">\n' % bgcolor + for loc in hostloc[host]: + line = line + '\t\t\t%s<br>\n' % loc + line = line + '\t\t</td>\n' + size, marker = self.mk_size_unit(hosttotal[host]) + line = line + '\t\t<td bgcolor=%s valign="top">%s%s</td>\n' % (bgcolor, size, marker) + line = line + '\t</tr>\n' + foo = foo + line + foo = foo + '</table>\n' + return foo + +## +# This is useful when testing your module out. +# Invoke without command-line parameters to learn about the proper +# invocation. +# +if __name__ == '__main__': + from epylog.helpers import ModuleTest + ModuleTest(rsyncd_mod, sys.argv)

1 0

[epylog: 289/297] Fixed mixed tab and whitespace-errors
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 817a144712ecb112298079262d79b15f9c68e60d Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Fri Jan 29 13:49:06 2010 +0000 Fixed mixed tab and whitespace-errors modules/selinux_mod.py | 30 +++++++++++++++------------- modules/sudo_mod.py | 49 ++++++++++++++++++++++++----------------------- modules/yum_mod.py | 28 +++++++++++++------------- 3 files changed, 55 insertions(+), 52 deletions(-) --- diff --git a/modules/selinux_mod.py b/modules/selinux_mod.py index d603877..0e40b20 100644 --- a/modules/selinux_mod.py +++ b/modules/selinux_mod.py @@ -23,8 +23,8 @@ class selinux_mod(InternalModule): self.logger.put(3, 'initializing selinux') rc = re.compile - self.ignore = 0 - self.preventing = 1 + self.ignore = 0 + self.preventing = 1 selinux_map = { rc('.*setroubleshoot\: SELinux is preventing'): self.selinux @@ -52,30 +52,32 @@ class selinux_mod(InternalModule): # Line-matching routines # def selinux(self, linemap): - action = self.preventing - self.logger.put(3, 'selinux invoked') + action = self.preventing + self.logger.put(3, 'selinux invoked') sys, msg, mult = self.get_smm(linemap) - self.logger.put(3, 'test selinux %d' % mult) + self.logger.put(3, 'test selinux %d' % mult) message = self._get_selinux_message(msg) - self.logger.put(3, 'selinux message: %s' % message) + self.logger.put(3, 'selinux message: %s' % message) restuple = self._mk_restuple(sys, action, message) - self.logger.put(3, 'selinux finished') + self.logger.put(3, 'selinux finished') return {restuple: mult} + ## # Helpers # def _mk_restuple(self, sys, action, message): - return (action, message, sys) + return (action, message, sys) def _get_selinux_message(self, str): - message = 'unknown' + message = 'unknown' mo = self.selinux_message_re.search(str) if mo: message = mo.group(1) return message + #### # Finalize the report def finalize(self, rs): @@ -95,15 +97,15 @@ class selinux_mod(InternalModule): else: flipper = self.flip service_rep = [] - for system in rs.get_distinct((action, message,)): - service_rep.append(system) + for system in rs.get_distinct((action, message,)): + service_rep.append(system) - system_list = ', '.join(service_rep) - rep[action] += self.line_rep % (flipper, message, system_list) + system_list = ', '.join(service_rep) + rep[action] += self.line_rep % (flipper, message, system_list) if rep[self.preventing]: report += self.subreport_wrap % (self.selinux_preventing_title, rep[self.preventing]) - logger.put(3, 'selinux report: self.preventing added') + logger.put(3, 'selinux report: self.preventing added') report = self.report_wrap % report return report diff --git a/modules/sudo_mod.py b/modules/sudo_mod.py index 786e3bf..d411b9f 100644 --- a/modules/sudo_mod.py +++ b/modules/sudo_mod.py @@ -23,9 +23,9 @@ class sudo_mod(InternalModule): self.logger.put(2, 'initializing sudo') rc = re.compile - self.ignore = 0 - self.open = 1 - self.not_allowed = 2 + self.ignore = 0 + self.open = 1 + self.not_allowed = 2 sudo_map = { rc('.*sudo\:\s+\S+\s\:\sTTY'): self.sudo, @@ -61,20 +61,20 @@ class sudo_mod(InternalModule): # Line-matching routines # def sudo(self, linemap): - action = self.open - self.logger.put(2, 'sudo invoked') + action = self.open + self.logger.put(2, 'sudo invoked') sys, msg, mult = self.get_smm(linemap) - self.logger.put(3, 'test sudo %d' % mult) + self.logger.put(3, 'test sudo %d' % mult) user = self._get_sudo_user(msg) - self.logger.put(3, 'sudo user: %s' % user) - asuser = self._get_sudo_as_user(msg) - self.logger.put(3, 'sudo asuser: %s' % asuser) - command_name = self._get_sudo_command_name(msg) - self.logger.put(3, 'sudo command: %s' % command_name) + self.logger.put(3, 'sudo user: %s' % user) + asuser = self._get_sudo_as_user(msg) + self.logger.put(3, 'sudo asuser: %s' % asuser) + command_name = self._get_sudo_command_name(msg) + self.logger.put(3, 'sudo command: %s' % command_name) restuple = self._mk_restuple(sys, action, user, asuser, command_name, None) - self.logger.put(2, 'sudo finished') + self.logger.put(2, 'sudo finished') return {restuple: mult} def sudo_na(self, linemap): @@ -89,7 +89,7 @@ class sudo_mod(InternalModule): self.logger.put(3, 'sudo asuser: %s' % asuser) command_name = self._get_sudo_command_name(msg) self.logger.put(3, 'sudo command: %s' % command_name) - error_message = self._get_sudo_error_message(msg) + error_message = self._get_sudo_error_message(msg) self.logger.put(3, 'sudo error_message: %s' % error_message) restuple = self._mk_restuple(sys, action, user, asuser, command_name, error_message) @@ -97,30 +97,30 @@ class sudo_mod(InternalModule): return {restuple: mult} def sudo_ignore(self, linemap): - restuple = self._mk_restuple(None, self.ignore, None, None, None, None) - return {restuple: 1} + restuple = self._mk_restuple(None, self.ignore, None, None, None, None) + return {restuple: 1} ## - # HElpers + # Helpers # def _mk_restuple(self, sys, action, user=None, asuser=None, command_name=None, error_message=None): - return (action, user, command_name, asuser, error_message, sys) + return (action, user, command_name, asuser, error_message, sys) #return (sys, action, user, asuser, command_name) def _get_sudo_user(self, str): - user = 'unknown' + user = 'unknown' mo = self.sudo_user_name_re.search(str) if mo: user = mo.group(1) return user def _get_sudo_as_user(self, str): - asuser = 'unknown' + asuser = 'unknown' mo = self.sudo_as_user_re.search(str) if mo: asuser = mo.group(1) return asuser def _get_sudo_error_message(self, str): - pass_attempts = 0 + pass_attempts = 0 mo = self.sudo_error_message_re.search(str) if mo: pass_attempts = mo.group(1) return pass_attempts @@ -131,6 +131,7 @@ class sudo_mod(InternalModule): if mo: command_name = mo.group(1) return command_name + #### # Finalize the report def finalize(self, rs): @@ -167,19 +168,19 @@ class sudo_mod(InternalModule): #logger.put(2, 'sudo svcrep: %s' % svcrep) if blank: user = ' ' else: blank = 1 - if (action == self.open): + if (action == self.open): rep[action] += self.line_rep % (flipper, user, svcrep[0], svcrep[1], svcrep[2]) - else: + else: rep[action] += self.line_rep_na % (flipper, user, svcrep[0], svcrep[3], svcrep[1], svcrep[2]) if rep[self.open]: report += self.subreport_wrap % (self.sudo_open_title, rep[self.open]) - logger.put(2, 'sudo report: self.open added') + logger.put(2, 'sudo report: self.open added') if rep[self.not_allowed]: report += self.subreport_na_wrap % (self.sudo_not_allowed_title, rep[self.not_allowed]) - logger.put(2, 'sudo report: self.not_allowed added') + logger.put(2, 'sudo report: self.not_allowed added') report = self.report_wrap % report return report diff --git a/modules/yum_mod.py b/modules/yum_mod.py index 0ab5e9d..c6409fc 100644 --- a/modules/yum_mod.py +++ b/modules/yum_mod.py @@ -25,10 +25,10 @@ class yum_mod(InternalModule): self.logger = logger rc = re.compile - self.ignore = 0 - self.installed = 1 - self.updated = 2 - self.erased = 3 + self.ignore = 0 + self.installed = 1 + self.updated = 2 + self.erased = 3 yum_map = { rc('yum\: Installed\:'): self.pkg_installed, @@ -64,12 +64,12 @@ class yum_mod(InternalModule): # def pkg_updated(self, linemap): self.logger.put(3, 'entered pkg_updated...') - action = self.updated + action = self.updated sys, msg, mult = self.get_smm(linemap) - self.logger.put(3, 'test yum %d' % mult) - name = self._get_updated_name(msg) - self.logger.put(3, 'name: %s' % name) + self.logger.put(3, 'test yum %d' % mult) + name = self._get_updated_name(msg) + self.logger.put(3, 'name: %s' % name) restuple = self._mk_restuple(action, sys, name) return {restuple: mult} @@ -103,10 +103,10 @@ class yum_mod(InternalModule): # Helpers # def _mk_restuple(self, action, sys, name=None): - return (action, sys, name) + return (action, sys, name) def _get_name(self, str): - name = 'unknown' + name = 'unknown' mo = self.name_re.search(str) if mo: name = mo.group(1) return name @@ -136,7 +136,7 @@ class yum_mod(InternalModule): # report = '' rep = {} - # (action, sys, name) + # (action, sys, name) for action in [self.updated, self.installed, self.erased]: rep[action] = '' flipper = '' @@ -146,10 +146,10 @@ class yum_mod(InternalModule): else: flipper = self.flip service_rep = [] - for name in rs.get_distinct((action, system,)): - service_rep.append(name) + for name in rs.get_distinct((action, system,)): + service_rep.append(name) - user_list = ', '.join(service_rep) + user_list = ', '.join(service_rep) rep[action] += self.line_rep % (flipper, system, user_list) if rep[self.installed]:

1 0

[epylog: 288/297] adding yum, sudo, selinux modules and configuration files
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 2ce7241c750e85a881e3b811f8c9805709cca8a3 Author: Jeremy Kindy <kindyjd(a)wfu.edu> Date: Wed Jan 27 15:42:52 2010 +0000 adding yum, sudo, selinux modules and configuration files etc/modules.d/selinux.conf.in | 11 +++ etc/modules.d/sudo.conf.in | 11 +++ etc/modules.d/yum.conf.in | 11 +++ modules/selinux_mod.py | 114 ++++++++++++++++++++++++ modules/sudo_mod.py | 190 +++++++++++++++++++++++++++++++++++++++++ modules/yum_mod.py | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 507 insertions(+), 0 deletions(-) --- diff --git a/etc/modules.d/selinux.conf.in b/etc/modules.d/selinux.conf.in new file mode 100644 index 0000000..9659438 --- /dev/null +++ b/etc/modules.d/selinux.conf.in @@ -0,0 +1,11 @@ +[module] +desc = SELinux Report +exec = %%MODULES_DIR%%/selinux_mod.py +files = /var/log/messages[.#] +enabled = yes +internal = yes +outhtml = yes +priority = 5 + +[conf] +enable_selinux = 1 diff --git a/etc/modules.d/sudo.conf.in b/etc/modules.d/sudo.conf.in new file mode 100644 index 0000000..4f01be1 --- /dev/null +++ b/etc/modules.d/sudo.conf.in @@ -0,0 +1,11 @@ +[module] +desc = Sudo Report +exec = %%MODULES_DIR%%/sudo_mod.py +files = /var/log/secure[.#] +enabled = yes +internal = yes +outhtml = yes +priority = 5 + +[conf] +enable_sudo = 1 diff --git a/etc/modules.d/yum.conf.in b/etc/modules.d/yum.conf.in new file mode 100644 index 0000000..13eeedb --- /dev/null +++ b/etc/modules.d/yum.conf.in @@ -0,0 +1,11 @@ +[module] +desc = Yum Report +exec = %%MODULES_DIR%%/yum_mod.py +files = /var/log/messages[.#] +enabled = yes +internal = yes +outhtml = yes +priority = 5 + +[conf] +enable_yum = 1 diff --git a/modules/selinux_mod.py b/modules/selinux_mod.py new file mode 100644 index 0000000..d603877 --- /dev/null +++ b/modules/selinux_mod.py @@ -0,0 +1,114 @@ +#!/usr/bin/python -tt +""" +Reports on selinux messages + +Jeremy Kindy (kindyjd at wfu.edu), Wake Forest University +""" + +import sys +import re + +## +# This is for testing purposes, so you can invoke this from the +# modules directory. See also the testing notes at the end of the +# file. +# +sys.path.insert(0, '../py/') +from epylog import Result, InternalModule + +class selinux_mod(InternalModule): + def __init__(self, opts, logger): + InternalModule.__init__(self) + self.logger = logger + self.logger.put(3, 'initializing selinux') + rc = re.compile + + self.ignore = 0 + self.preventing = 1 + + selinux_map = { + rc('.*setroubleshoot\: SELinux is preventing'): self.selinux + } + + do_selinux = int(opts.get('enable_selinux', '1')) + + self.regex_map = {} + if do_selinux: self.regex_map.update(selinux_map) + + self.selinux_message_re = rc('setroubleshoot: (.*). For complete SELinux') + + self.selinux_title = '<font color="blue">SELinux Report</font>' + self.selinux_preventing_title = '<font color="blue">SELinux Prevention Report</font>' + + self.report_wrap = '<table border="0" width="100%%" rules="cols" cellpadding="2">%s</table>' + self.subreport_wrap = '<tr><th colspan="2" align="left"><h3>%s</h3></th></tr>\n%s' + + self.line_rep = '<tr%s><td valign="top" width="25%%">%s</td><td valign="top" width="75%%">%s</td></tr>\n' + + self.flip = ' bgcolor="#dddddd"' + + + ## + # Line-matching routines + # + def selinux(self, linemap): + action = self.preventing + self.logger.put(3, 'selinux invoked') + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test selinux %d' % mult) + message = self._get_selinux_message(msg) + self.logger.put(3, 'selinux message: %s' % message) + + restuple = self._mk_restuple(sys, action, message) + self.logger.put(3, 'selinux finished') + return {restuple: mult} + + ## + # Helpers + # + def _mk_restuple(self, sys, action, message): + return (action, message, sys) + + def _get_selinux_message(self, str): + message = 'unknown' + mo = self.selinux_message_re.search(str) + if mo: message = mo.group(1) + return message + + #### + # Finalize the report + def finalize(self, rs): + logger = self.logger + ## + # Prepare report + # + report = '' + rep = {} + + # (action, message) + for action in [self.preventing]: + rep[action] = '' + flipper = '' + for message in rs.get_distinct((action,)): + if flipper: flipper = '' + else: flipper = self.flip + service_rep = [] + + for system in rs.get_distinct((action, message,)): + service_rep.append(system) + + system_list = ', '.join(service_rep) + rep[action] += self.line_rep % (flipper, message, system_list) + + if rep[self.preventing]: + report += self.subreport_wrap % (self.selinux_preventing_title, rep[self.preventing]) + logger.put(3, 'selinux report: self.preventing added') + + report = self.report_wrap % report + return report + + +if __name__ == '__main__': + from epylog.helpers import ModuleTest + ModuleTest(selinux_mod, sys.argv) diff --git a/modules/sudo_mod.py b/modules/sudo_mod.py new file mode 100644 index 0000000..786e3bf --- /dev/null +++ b/modules/sudo_mod.py @@ -0,0 +1,190 @@ +#!/usr/bin/python -tt +""" +Reports on sudo usage by users. + +Jeremy Kindy (kindyjd at wfu.edu), Wake Forest University +""" + +import sys +import re + +## +# This is for testing purposes, so you can invoke this from the +# modules directory. See also the testing notes at the end of the +# file. +# +sys.path.insert(0, '../py/') +from epylog import Result, InternalModule + +class sudo_mod(InternalModule): + def __init__(self, opts, logger): + InternalModule.__init__(self) + self.logger = logger + self.logger.put(2, 'initializing sudo') + rc = re.compile + + self.ignore = 0 + self.open = 1 + self.not_allowed = 2 + + sudo_map = { + rc('.*sudo\:\s+\S+\s\:\sTTY'): self.sudo, + rc('.*sudo:'): self.sudo_na + } + + do_sudo = int(opts.get('enable_sudo', '1')) + + self.regex_map = {} + if do_sudo: self.regex_map.update(sudo_map) + + self.sudo_user_name_re = rc('sudo:\s*(\S*)') + self.sudo_as_user_re = rc('.*USER=(\S*)\s\;\sCOMMAND') + self.sudo_command_name_re = rc('.*COMMAND=(.*)') + self.sudo_error_message_re = rc('sudo:\s*\S*\s+:\s+(.*)\s+;\s+TTY') + + + self.sudo_title = '<font color="blue">User Sudo Report</font>' + self.sudo_open_title = '<font color="blue">User Sudo Report</font>' + self.sudo_not_allowed_title = '<font color="red">Disallowed Sudo Commands</font>' + + self.report_wrap = '<table border="0" width="100%%" rules="cols" cellpadding="2">%s</table>' + self.subreport_wrap = '<tr><th colspan="5" align="left"><h3>%s</h3></th></tr>\n%s' + self.subreport_na_wrap = '<tr><th colspan="5" align="left"><h3>%s</h3></th></tr>\n%s' + + self.line_rep = '<tr%s><td valign="top" width="15%%">%s</td><td valign="top" width="45%%" colspan="2">%s</td><td width="25%%">%s</td><td width="15%%">%s</td></tr>\n' + self.line_rep_na = '<tr%s><td valign="top" width="15%%">%s</td><td valign="top" width="30%%">%s</td><td valign="top" width="15%%">%s</td><td width="25%%">%s</td><td width="15%%">%s</td></tr>\n' + + self.flip = ' bgcolor="#dddddd"' + + + ## + # Line-matching routines + # + def sudo(self, linemap): + action = self.open + self.logger.put(2, 'sudo invoked') + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test sudo %d' % mult) + user = self._get_sudo_user(msg) + self.logger.put(3, 'sudo user: %s' % user) + asuser = self._get_sudo_as_user(msg) + self.logger.put(3, 'sudo asuser: %s' % asuser) + command_name = self._get_sudo_command_name(msg) + self.logger.put(3, 'sudo command: %s' % command_name) + + restuple = self._mk_restuple(sys, action, user, asuser, command_name, None) + self.logger.put(2, 'sudo finished') + return {restuple: mult} + + def sudo_na(self, linemap): + action = self.not_allowed + self.logger.put(2, 'sudo_na invoked') + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test sudo %d' % mult) + user = self._get_sudo_user(msg) + self.logger.put(3, 'sudo user: %s' % user) + asuser = self._get_sudo_as_user(msg) + self.logger.put(3, 'sudo asuser: %s' % asuser) + command_name = self._get_sudo_command_name(msg) + self.logger.put(3, 'sudo command: %s' % command_name) + error_message = self._get_sudo_error_message(msg) + self.logger.put(3, 'sudo error_message: %s' % error_message) + + restuple = self._mk_restuple(sys, action, user, asuser, command_name, error_message) + self.logger.put(2, 'sudo finished') + return {restuple: mult} + + def sudo_ignore(self, linemap): + restuple = self._mk_restuple(None, self.ignore, None, None, None, None) + return {restuple: 1} + + ## + # HElpers + # + def _mk_restuple(self, sys, action, user=None, asuser=None, command_name=None, error_message=None): + return (action, user, command_name, asuser, error_message, sys) + #return (sys, action, user, asuser, command_name) + + def _get_sudo_user(self, str): + user = 'unknown' + mo = self.sudo_user_name_re.search(str) + if mo: user = mo.group(1) + return user + + def _get_sudo_as_user(self, str): + asuser = 'unknown' + mo = self.sudo_as_user_re.search(str) + if mo: asuser = mo.group(1) + return asuser + + def _get_sudo_error_message(self, str): + pass_attempts = 0 + mo = self.sudo_error_message_re.search(str) + if mo: pass_attempts = mo.group(1) + return pass_attempts + + def _get_sudo_command_name(self, str): + command_name = 'unknown' + mo = self.sudo_command_name_re.search(str) + if mo: command_name = mo.group(1) + return command_name + + #### + # Finalize the report + def finalize(self, rs): + logger = self.logger + ## + # Prepare report + # + report = '' + rep = {} + + # (action, user, command_name, system, error_message) + for action in [self.open, self.not_allowed]: + rep[action] = '' + flipper = '' + for user in rs.get_distinct((action,)): + #logger.put(2, 'sudo user: %s' % user) + if flipper: flipper = '' + else: flipper = self.flip + service_rep = [] + blank = 0 + for command_name in rs.get_distinct((action, user)): + for asuser in rs.get_distinct((action, user, command_name)): + for error_message in rs.get_distinct((action, user, command_name, asuser)): + mymap = rs.get_submap((action, user, command_name, asuser, error_message)) + #logger.put(2, 'sudo command_name: %s' % command_name) + key2s = [] + for key2 in mymap.keys(): + hostname = key2[0] + key2s.append('%s(%d)' % (hostname, mymap[key2])) + hostnames = ', '.join(key2s) + #logger.put(2, 'sudo hostnames: %s' % hostnames) + service_rep.append([command_name, hostnames, asuser, error_message]) + for svcrep in service_rep: + #logger.put(2, 'sudo svcrep: %s' % svcrep) + if blank: user = ' ' + else: blank = 1 + if (action == self.open): + rep[action] += self.line_rep % (flipper, user, svcrep[0], svcrep[1], svcrep[2]) + else: + rep[action] += self.line_rep_na % (flipper, user, svcrep[0], svcrep[3], svcrep[1], svcrep[2]) + + + if rep[self.open]: + report += self.subreport_wrap % (self.sudo_open_title, rep[self.open]) + logger.put(2, 'sudo report: self.open added') + + if rep[self.not_allowed]: + report += self.subreport_na_wrap % (self.sudo_not_allowed_title, rep[self.not_allowed]) + logger.put(2, 'sudo report: self.not_allowed added') + + report = self.report_wrap % report + return report + + +if __name__ == '__main__': + from epylog.helpers import ModuleTest + ModuleTest(sudo_mod, sys.argv) diff --git a/modules/yum_mod.py b/modules/yum_mod.py new file mode 100644 index 0000000..0ab5e9d --- /dev/null +++ b/modules/yum_mod.py @@ -0,0 +1,170 @@ +#!/usr/bin/python -tt +""" +Creates report of packages added via the RedHat yum command. + +Will not catch creations or deletions resulting from direct use of +the rpm command. + +Jeremy Kindy (kindyjd at wfu.edu), Wake Forest University +""" + +import sys +import re + +## +# This is for testing purposes, so you can invoke this from the +# modules directory. See also the testing notes at the end of the +# file. +# +sys.path.insert(0, '../py/') +from epylog import Result, InternalModule + +class yum_mod(InternalModule): + def __init__(self, opts, logger): + InternalModule.__init__(self) + self.logger = logger + rc = re.compile + + self.ignore = 0 + self.installed = 1 + self.updated = 2 + self.erased = 3 + + yum_map = { + rc('yum\: Installed\:'): self.pkg_installed, + rc('yum\: Updated\:'): self.pkg_updated, + rc('yum\: Erased\:'): self.pkg_erased + } + + do_yum = int(opts.get('enable_yum', '1')) + + self.regex_map = {} + if do_yum: self.regex_map.update(yum_map) + + self.name_re = rc('profile\: \[(.*)\]') + self.installed_name_re = rc('Installed\: (.*)') + self.updated_name_re = rc('Updated\: (.*)') + self.erased_name_re = rc('Erased\: (.*)') + + self.yum_title = '<font color="blue">Yum Changes Report</font>' + self.yum_installed_title = '<font color="blue">Packages Installed</font>' + self.yum_updated_title = '<font color="blue">Packages Updated</font>' + self.yum_erased_title = '<font color="blue">Packages Erased</font>' + + self.report_wrap = '<table border="0" width="100%%" rules="cols" cellpadding="2">%s</table>' + self.subreport_wrap = '<tr><th colspan="2" align="left"><h3>%s</h3></th></tr>\n%s' + + self.line_rep = '<tr%s><td valign="top" width="25%%">%s</td><td valign="top" width="75%%">%s</td></tr>\n' + + self.flip = ' bgcolor="#dddddd"' + + + ## + # Line-matching routines + # + def pkg_updated(self, linemap): + self.logger.put(3, 'entered pkg_updated...') + action = self.updated + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test yum %d' % mult) + name = self._get_updated_name(msg) + self.logger.put(3, 'name: %s' % name) + + restuple = self._mk_restuple(action, sys, name) + return {restuple: mult} + + def pkg_installed(self, linemap): + self.logger.put(3, 'entered pkg_installed...') + action = self.installed + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test yum %d' % mult) + name = self._get_installed_name(msg) + self.logger.put(3, 'name: %s' % name) + + restuple = self._mk_restuple(action, sys, name) + return {restuple: mult} + + def pkg_erased(self, linemap): + self.logger.put(3, 'entered pkg_erased...') + action = self.erased + sys, msg, mult = self.get_smm(linemap) + + self.logger.put(3, 'test yum %d' % mult) + name = self._get_erased_name(msg) + self.logger.put(3, 'name: %s' % name) + + restuple = self._mk_restuple(action, sys, name) + return {restuple: mult} + + + ## + # Helpers + # + def _mk_restuple(self, action, sys, name=None): + return (action, sys, name) + + def _get_name(self, str): + name = 'unknown' + mo = self.name_re.search(str) + if mo: name = mo.group(1) + return name + + def _get_installed_name(self, str): + name = 'unknown' + mo = self.installed_name_re.search(str) + if mo: name = mo.group(1) + return name + + def _get_updated_name(self, str): + name = 'unknown' + mo = self.updated_name_re.search(str) + if mo: name = mo.group(1) + return name + + def _get_erased_name(self, str): + name = 'unknown' + mo = self.erased_name_re.search(str) + if mo: name = mo.group(1) + return name + + def finalize(self, rs): + logger = self.logger + ## + # Prepare report + # + report = '' + rep = {} + # (action, sys, name) + for action in [self.updated, self.installed, self.erased]: + rep[action] = '' + flipper = '' + for system in rs.get_distinct((action,)): + self.logger.put(3, 'system: %s' % system) + if flipper: flipper = '' + else: flipper = self.flip + service_rep = [] + + for name in rs.get_distinct((action, system,)): + service_rep.append(name) + + user_list = ', '.join(service_rep) + rep[action] += self.line_rep % (flipper, system, user_list) + + if rep[self.installed]: + report += self.subreport_wrap % (self.yum_installed_title, rep[self.installed]) + + if rep[self.updated]: + report += self.subreport_wrap % (self.yum_updated_title, rep[self.updated]) + + if rep[self.erased]: + report += self.subreport_wrap % (self.yum_erased_title, rep[self.erased]) + + report = self.report_wrap % report + return report + + +if __name__ == '__main__': + from epylog.helpers import ModuleTest + ModuleTest(users_mod, sys.argv)

1 0

[epylog: 287/297] Added support for ssmtp to mail_mod and changed module priorities in config files.
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 9c29b9222d81fb8b5ec84853bd8b0888bca23254 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Wed Jan 27 13:42:22 2010 +0000 Added support for ssmtp to mail_mod and changed module priorities in config files. Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> etc/modules.d/mail.conf.in | 5 +++-- etc/modules.d/notices.conf.in | 2 +- etc/modules.d/spamd.conf.in | 2 +- modules/mail_mod.py | 37 ++++++++++++++++++++++++++++++++----- 4 files changed, 37 insertions(+), 9 deletions(-) --- diff --git a/etc/modules.d/mail.conf.in b/etc/modules.d/mail.conf.in index 04e107e..fc98745 100644 --- a/etc/modules.d/mail.conf.in +++ b/etc/modules.d/mail.conf.in @@ -5,15 +5,16 @@ files = /var/log/maillog[.#] enabled = yes internal = yes outhtml = yes -priority = 5 +priority = 3 [conf] ## -# Enable sendmail, postfix, or both +# Enable sendmail, postfix, qmail, ssmtp or all of them # enable_sendmail = 1 enable_postfix = 1 enable_qmail = 0 +enable_ssmtp = 0 ## # Report at most this many "top things" # diff --git a/etc/modules.d/notices.conf.in b/etc/modules.d/notices.conf.in index 3043156..93fccd3 100644 --- a/etc/modules.d/notices.conf.in +++ b/etc/modules.d/notices.conf.in @@ -5,7 +5,7 @@ files = /var/log/messages[.#], /var/log/secure[.#], /var/log/maillog[.#] enabled = yes internal = yes outhtml = yes -priority = 7 +priority = 9 [conf] ## diff --git a/etc/modules.d/spamd.conf.in b/etc/modules.d/spamd.conf.in index 7ebd7f4..107d87a 100644 --- a/etc/modules.d/spamd.conf.in +++ b/etc/modules.d/spamd.conf.in @@ -5,7 +5,7 @@ files = /var/log/maillog[.#] enabled = no internal = yes outhtml = yes -priority = 7 +priority = 4 [conf] ## diff --git a/modules/mail_mod.py b/modules/mail_mod.py index 1dfd772..9af9552 100644 --- a/modules/mail_mod.py +++ b/modules/mail_mod.py @@ -1,6 +1,8 @@ #!/usr/bin/python -tt """ -Description will eventually go here. +This is an epylog module that looks for mail relevant outputs. +Output is a general mail report (overview) and the top x systems +and recipients. """ ## # Copyright (C) 2003 by Duke University @@ -44,7 +46,7 @@ class mail_mod(InternalModule): rc = re.compile postfix_map = { rc('postfix/smtpd\[\d+\]:\s\S*:'): self.postfix_smtpd, - rc('postfix/n*qmgr\[\d+\]:\s\S*:'): self.postfix_qmgr, + rc('postfix/.*qmgr\[\d+\]:\s\S*:'): self.postfix_qmgr, rc('postfix/local\[\d+\]:\s\S*:'): self.postfix_local, rc('postfix/smtp\[\d+\]:\s\S*:\sto='): self.postfix_smtp } @@ -59,21 +61,27 @@ class mail_mod(InternalModule): rc('qmail:\s\d+.\d+\sdelivery'): self.qmail_delivery, rc('qmail:\s\d+.\d+\sbounce\smsg\s\d+'): self.qmail_bounce } + + ssmtp_map = { + rc('sSMTP\[\d+\]:\sSent\smail'): self.ssmtp_sent + } do_postfix = int(opts.get('enable_postfix', '0')) do_sendmail = int(opts.get('enable_sendmail', '1')) do_qmail = int(opts.get('enable_qmail', '0')) + do_ssmtp = int(opts.get('enable_ssmtp', '1')) self.regex_map = {} if do_postfix: self.regex_map.update(postfix_map) if do_sendmail: self.regex_map.update(sendmail_map) if do_qmail: self.regex_map.update(qmail_map) + if do_ssmtp: self.regex_map.update(ssmtp_map) self.toplim = int(opts.get('top_report_limit', '5')) self.postfix_ident_re = rc('\[\d+\]:\s*([A-Z0-9]*):') self.postfix_smtpd_re = rc('client=\S*\[(\S*)\]') - self.postfix_qmgr_re = rc('from=(\S*),.*size=(\d*)') + self.postfix_qmgr_re = rc('from=(\S*),.*size=(\d*),.*nrcpt=(\d*)') self.postfix_local_re = rc('to=(\S*),.*status=(\S*)\s$(.*)$') self.postfix_smtp_re = rc('to=(\S*),.*status=(\S*)') @@ -90,6 +98,8 @@ class mail_mod(InternalModule): self.qmail_startdev_re = rc('to\s\S+\s(\S+)') self.qmail_delivery_re = rc('delivery\s\d+:\s(\S+):') + self.ssmtp_sent_re = rc('sSMTP\[\d+\]:\sSent\smail\sfor\s(\S+)\s$(\d+).*$\suid=(\d+)\susername=(\S+)\soutbytes=(\d+)') + self.procmail_re = rc('/procmail') self.bounce = 0 @@ -104,6 +114,7 @@ class mail_mod(InternalModule): self.report_line = '<tr><td valign="top" align="right">%s</td><td valign="top" width="90%%">%s</td></tr>\n' + ## # Line-matching routines # @@ -123,8 +134,8 @@ class mail_mod(InternalModule): sys, msg, mult = self.get_smm(linemap) id = self._get_postfix_id(msg) self.logger.put(5, 'id=%s' % id) - try: sender, size = self.postfix_qmgr_re.search(msg).groups() - except: sender, size = (None, 0) + try: sender, size, recipients = self.postfix_qmgr_re.search(msg).groups() + except: sender, size, recipients = (None, 0, 0) size = int(size) self.logger.put(5, 'sender=%s, size=%d' % (sender, size)) restuple = self._mk_restuple(sys, id, sender=sender, size=size) @@ -235,6 +246,22 @@ class mail_mod(InternalModule): restuple = self._mk_restuple(sys, id, status=self.bounce) return {restuple: mult} + def ssmtp_sent(self, linemap): + sys, msg, mult = self.get_smm(linemap) + try: to, status, uid, user, size = self.ssmtp_sent_re.search(msg).groups() + except: + self.logger.put(3, 'Odd ssmtp_sent line: %s' % msg) + return None + size = int (size) + status = int (status) + self.logger.put(5, 'to=%s, status=%i, uid=%s, user=%s, size=%i' % (to, status, uid, user, size)) + if (status >= 100) and (status <= 199): status = self.warning + elif (status >= 200) and (status <= 299): status = self.success + elif (status >= 300) and (status <= 499): status = self.bounce + elif (status >= 500) and (status <= 599): status = self.warning + restuple = self._mk_restuple(sys, id, to=to, status=status, size=size) + return {restuple: mult} + ## # HElpers #

1 0

[epylog: 286/297] Added missing config file for the new ntpd module
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 81a29eb21be6fe80066cbe3379c64e5d0d251787 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Wed Jan 27 12:22:41 2010 +0000 Added missing config file for the new ntpd module Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> etc/modules.d/ntp.conf.in | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) --- diff --git a/etc/modules.d/ntp.conf.in b/etc/modules.d/ntp.conf.in new file mode 100644 index 0000000..4a90bac --- /dev/null +++ b/etc/modules.d/ntp.conf.in @@ -0,0 +1,8 @@ +[module] +desc = NTP +exec = %%MODULES_DIR%%/sntp_mod.py +files = /var/log/syslog[.#] +enabled = yes +internal = yes +outhtml = yes +priority = 8

1 0

[epylog: 285/297] Added a new module (and a testcase) for ntpd-messages
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit f0ef3afd32add54e4c9a2f9ba42a7f8a3421ed1c Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Wed Jan 27 12:19:37 2010 +0000 Added a new module (and a testcase) for ntpd-messages Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> doc/testcase/ntp.testcase | 16 ++++++ modules/ntp_mod.py | 129 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) --- diff --git a/doc/testcase/ntp.testcase b/doc/testcase/ntp.testcase new file mode 100644 index 0000000..7507e89 --- /dev/null +++ b/doc/testcase/ntp.testcase @@ -0,0 +1,16 @@ +Jul 27 00:55:18 trixi ntpd[2852]: synchronized to 213.239.202.209, stratum 2 +Jul 27 02:20:42 trixi ntpd[2852]: synchronized to 78.47.89.89, stratum 2 +Jul 27 03:11:30 trixi ntpd[2852]: synchronized to 213.239.202.209, stratum 2 +Jul 27 00:55:18 foo ntpd[2852]: synchronized to 213.239.202.209, stratum 2 +Jul 27 02:20:42 foo ntpd[2852]: synchronized to 78.47.89.89, stratum 2 +Jul 27 03:11:30 foo ntpd[2852]: synchronized to 213.239.202.209, stratum 2 +Jul 27 02:20:42 trixi ntpd[2852]: synchronized to 78.47.89.89, stratum 1 +Jul 27 03:11:30 trixi ntpd[2852]: synchronized to 213.239.202.209, stratum 1 +Jul 27 00:55:18 foo ntpd[2852]: synchronized to 213.239.202.209, stratum 1 +Jul 27 02:20:42 foo ntpd[2852]: synchronized to 78.47.89.89, stratum 1 +Jan 24 02:25:25 trixi ntpd[3326]: kernel time sync status change 0001 +Jan 24 02:59:35 trixi ntpd[3326]: kernel time sync status change 4001 +Jan 24 03:33:42 trixi ntpd[3326]: kernel time sync status change 0001 +Jan 24 04:07:51 trixi ntpd[3326]: kernel time sync status change 4001 +Jan 24 03:33:42 bar ntpd[3326]: kernel time sync status change 0001 +Jan 24 04:07:51 bar ntpd[3326]: kernel time sync status change 4001 diff --git a/modules/ntp_mod.py b/modules/ntp_mod.py new file mode 100644 index 0000000..fdf94b0 --- /dev/null +++ b/modules/ntp_mod.py @@ -0,0 +1,129 @@ +#!/usr/bin/python -tt +""" +This is an epylog module to monitor output from ntpd. +It considers outputs which look like "status change to ..." +and "synchronized to stratum ..." +""" +## +# Copyright (C) 2009-2010 Micha vor dem Berge +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# +# $Id: ntp_mod.py 383 2010-01-16 12:45:24Z mvdb $ +# +# @Author Micha vor dem Berge <m(a)mcvdb.de> +# @version $Date: 2010-01-16 13:45:24 +0100 (Sa, 16. Jan 2010) $ +# + +import sys +import re + +sys.path.insert(0, '../py/') +from epylog import InternalModule + +class ntp_mod(InternalModule): + def __init__(self, opts, logger): + InternalModule.__init__(self) + self.logger = logger + + rc = re.compile + + self.msg = 1 + self.error = 2 + + self.regex_map = { + rc('ntpd.*:\ssynchronized\sto.*'): self.ntp_synchronized, + rc('kernel time sync status change'): self.ntp_status_change + } + + self.ntp_synchronized_re = rc('ntpd\[\d+\]:\ssynchronized\sto\s*(\S*),\s*(.*)') + self.ntp_status_change_re = rc('ntpd\[\d+\]:\skernel\stime\ssync\sstatus\schange\s(\d+)') + + self.ntp_message_title = '<font color="blue">Message</font>' + self.report_wrap = '<table width="100%%" rules="cols" cellpadding="2">%s</table>' + self.subreport_wrap = '<tr><th align="left" colspan="3"><h3>%s</h3></th></tr>\n%s\n' + self.line_rep = '<tr%s><td valign="top" width="15%%">%s</td><td valign="top" width="15%%">%s</td><td width="70%%">%s</td></tr>\n' + self.flip = ' bgcolor="#dddddd"' + + + ## + # Line-matching routines + # + def ntp_synchronized (self, linemap): + action = self.msg + system, message, mult = self.get_smm(linemap) + mo = self.ntp_synchronized_re.search(message) + if not mo: + self.logger.put(3, 'Odd ntp synchronized string: %s' % message) + return None + rhost, stratum = mo.groups() + stratum = "synchronized to " + stratum + restuple = (action, system, stratum, rhost) + return {restuple: linemap['multiplier']} + + + def ntp_status_change (self, linemap): + action = self.msg + system, message, mult = self.get_smm(linemap) + ntp_status = self.ntp_status_change_re.search(message).group(1) + if not ntp_status: + self.logger.put(3, 'Odd ntp status change string: %s' % message) + return None + ntp_status = ntp_status + restuple = (action, system, "status change to", ntp_status) + return {restuple: linemap['multiplier']} + + + def finalize(self, resultset): + logger = self.logger + + report = '' + rep = {} + for action in [self.msg]: + rep[action] = '' + flipper = '' + for key in resultset.get_distinct((action,)): + if flipper: flipper = '' + else: flipper = self.flip + ntp_msg_rep = [] + for ntp_msg in resultset.get_distinct((action, key)): + mymap = resultset.get_submap((action, key, ntp_msg)) + key2s = [] + for key2 in mymap.keys(): + loghost = key2[0] + key2s.append('%s (%d)' % (loghost, mymap[key2])) + loghosts = ', '.join(key2s) + ntp_msg_rep.append([ntp_msg, loghosts]) + #if len(key2s) > self.systems_collapse: + # loghosts = self.collapsed_rep % (key2s[0],len(key2s)-1) + #else: + blank = 0 + for msgrep in ntp_msg_rep: + if blank: key = ' ' + else: blank = 1 + rep[action] += self.line_rep % (flipper, + key, msgrep[0], msgrep[1]) + if rep[self.msg]: + report += self.subreport_wrap % (self.ntp_message_title, + rep[self.msg]) + + report = self.report_wrap % report + return report + + +if __name__ == '__main__': + from epylog.helpers import ModuleTest + ModuleTest(ntp_mod, sys.argv)

1 0

[epylog: 284/297] If we got an empty log line just go on parsing with nothing instead of dying, now it works
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 0b7e39969f1ed6c381296abed0cb87b52aa2e966 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Wed Jan 27 08:27:48 2010 +0000 If we got an empty log line just go on parsing with nothing instead of dying, now it works Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> py/epylog/helpers.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) --- diff --git a/py/epylog/helpers.py b/py/epylog/helpers.py index 83c2882..32550e6 100644 --- a/py/epylog/helpers.py +++ b/py/epylog/helpers.py @@ -120,14 +120,21 @@ class ModuleTest: """ Create a linemap out of a line entry. """ - # If we got an empty log line just go on parsing with nothing - # instead of dying - if line == "": return "" try: stamp, sys, msg = epylog.log.get_stamp_sys_msg(line, monthmap) except ValueError: - msg = 'Invalid syslog line: %s' % line - self._die(msg) + # If we got an empty log line just go on parsing with nothing + # instead of dying + if line == "": + linemap = {'line': "", + 'stamp': "", + 'system': "", + 'message': "", + 'multiplier': 1} + return linemap + else: + msg = 'Invalid syslog line: %s' % line + self._die(msg) linemap = {'line': line, 'stamp': stamp, 'system': sys,

1 0

[epylog: 283/297] If we got an empty log line just go on parsing with nothing instead of dying
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit 85b405527109401956bd145a29ce22ecf77e3e04 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Wed Jan 27 08:18:55 2010 +0000 If we got an empty log line just go on parsing with nothing instead of dying Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> py/epylog/helpers.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) --- diff --git a/py/epylog/helpers.py b/py/epylog/helpers.py index d00435a..83c2882 100644 --- a/py/epylog/helpers.py +++ b/py/epylog/helpers.py @@ -120,6 +120,9 @@ class ModuleTest: """ Create a linemap out of a line entry. """ + # If we got an empty log line just go on parsing with nothing + # instead of dying + if line == "": return "" try: stamp, sys, msg = epylog.log.get_stamp_sys_msg(line, monthmap) except ValueError:

1 0

[epylog: 282/297] extended smart_mod.py for multisystem usage
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit bbea2146fd187bb98dd944f6adbed2c9b6de4307 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Sat Jan 16 12:45:24 2010 +0000 extended smart_mod.py for multisystem usage Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> modules/smart_mod.py | 58 ++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) --- diff --git a/modules/smart_mod.py b/modules/smart_mod.py index bef7196..8dd3de4 100644 --- a/modules/smart_mod.py +++ b/modules/smart_mod.py @@ -83,39 +83,43 @@ class smart_mod(InternalModule): restuple = (action, system, drive, smart_message) return {restuple: linemap['multiplier']} - - ## - # FINALIZE! - # def finalize(self, resultset): - logger = self.logger - report = '' - reports = {} - for action in [self.prefailure, self.usage]: - reports[action] = '' - for system in resultset.get_distinct((action,)): - messages = [] - for drive in resultset.get_distinct((action, system)): - mymap = resultset.get_submap((action, system, drive)) - - for message in mymap.keys(): - messages.append('%s (%d)' % (message[0], mymap[message])) - reports[action] += self.report_line % (drive, - '<br>'.join(messages)) - - if reports[self.prefailure]: - report += self.subreport_wrap % self.smart_prefailure_title - report += reports[self.prefailure] - - if reports[self.usage]: - report += self.subreport_wrap % self.smart_usage_title - report += reports[self.usage] + rep = {} + for action in [self.usage, self.prefailure]: + rep[action] = '' + flipper = '' + for key in resultset.get_distinct((action,)): + if flipper: flipper = '' + else: flipper = self.flip + drive_rep = [] + for drive in resultset.get_distinct((action, key)): + mymap = resultset.get_submap((action, key, drive)) + key2s = [] + for key2 in mymap.keys(): + loghost = key2[0] + key2s.append('%s (%d)' % (loghost, mymap[key2])) + if len(key2s) > self.systems_collapse: + loghosts = self.collapsed_rep % (key2s[0],len(key2s)-1) + else: + loghosts = ', '.join(key2s) + drive_rep.append([drive, loghosts]) + blank = 0 + for drvrep in drive_rep: + if blank: key = ' ' + else: blank = 1 + rep[action] += self.line_rep % (flipper, key, + drvrep[0], drvrep[1]) + if rep[self.usage]: + report += self.subreport_wrap % (self.smart_usage_title, + rep[self.usage]) + if rep[self.prefailure]: + report += self.subreport_wrap % (self.smart_prefailure_title, + rep[self.prefailure]) report = self.report_wrap % report return report - if __name__ == '__main__': from epylog.helpers import ModuleTest ModuleTest(smart_mod, sys.argv)

1 0

[epylog: 281/297] extended smart.testcase for multisystem usage
by Konstantin Ryabitsev 23 Jan '12

23 Jan '12

commit a38ae899eba498b183b1749b5b13a0a2c01e3ff6 Author: Micha vor dem Berge <m(a)mcvdb.de> Date: Mon Dec 21 10:29:32 2009 +0000 extended smart.testcase for multisystem usage Signed-off-by: Konstantin Ryabitsev <mricon(a)kernel.org> doc/testcase/smart.testcase | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) --- diff --git a/doc/testcase/smart.testcase b/doc/testcase/smart.testcase index 152b481..0b6b9fd 100644 --- a/doc/testcase/smart.testcase +++ b/doc/testcase/smart.testcase @@ -2,3 +2,8 @@ Jul 26 17:48:11 trixi smartd[1502]: Device: /dev/hda, SMART Prefailure Attribute Jul 26 17:48:11 trixi smartd[1502]: Device: /dev/hda, SMART Usage Attribute: 195 Hardware_ECC_Recovered changed from 54 to 52 Jul 27 06:46:35 trixi smartd[6412]: Device: /dev/hda, SMART Usage Attribute: 190 Airflow_Temperature_Cel changed from 75 to 76 Jul 27 06:46:35 trixi smartd[6412]: Device: /dev/hda, SMART Usage Attribute: 194 Temperature_Celsius changed from 25 to 24 +Jul 16 17:48:11 bar smartd[1502]: Device: /dev/hda, SMART Prefailure Attribute: 1 Raw_Read_Error_Rate changed from 109 to 110 +Jul 16 17:48:11 bar smartd[1502]: Device: /dev/hda, SMART Usage Attribute: 195 Hardware_ECC_Recovered changed from 54 to 52 +Jul 17 06:46:35 bar smartd[6412]: Device: /dev/hda, SMART Usage Attribute: 190 Airflow_Temperature_Cel changed from 75 to 76 +Jul 17 08:46:35 bar smartd[6412]: Device: /dev/hda, SMART Usage Attribute: 190 Airflow_Temperature_Cel changed from 75 to 76 +Jul 17 06:46:35 bar smartd[6412]: Device: /dev/hda, SMART Usage Attribute: 194 Temperature_Celsius changed from 25 to 24

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

epylog January 2012