Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64280 discussions

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 484e705c1cc30630c496afbe0629fb4fe066a9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=484e705c1cc306… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 09:19:45 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Reimplemented correct behaviour of the logwatch pattern "ignore"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c17ecdf242f026c49f6da14bd08d68465c0e984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c17ecdf242f02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 16 09:15:59 2012 +0200 FIX: Reimplemented correct behaviour of the logwatch pattern "ignore" state which is used to drop the matching log lines --- ChangeLog | 2 + checks/logwatch | 52 ++++++++++++++++++++------------- web/plugins/wato/check_parameters.py | 7 +++- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26286c1..eddc74a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,8 @@ to their defaults (didn't work for start_url, etc. * FIX: Fixed editing of ListOf in valuespec editors (e.g. used in logwatch pattern editor) + * FIX: Reimplemented correct behaviour of the logwatch pattern "ignore" + state which is used to drop the matching log lines Multisite: * FIX: fixed filter of recent event views (4 hours didn't catch) diff --git a/checks/logwatch b/checks/logwatch index 4154102..c98b65d 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -84,10 +84,12 @@ def logwatch_state(state): def logwatch_level_name(level): if level == 'W': return 'WARN' elif level == 'C': return 'CRIT' - else: return 'OK' + elif level == 'O': return 'OK' + else: return 'IGN' def logwatch_level_worst(worst, level): - if level == 'W': return max(worst, 1) + if level == 'O': return max(worst, 0) + elif level == 'W': return max(worst, 1) elif level == 'C': return max(worst, 2) else: return worst @@ -223,18 +225,20 @@ def check_logwatch(item, params, info): # Write out new log lines (no reclassify here. It is done later in general for all logs) # if len(loglines) > 0: - worst = 0 + worst = -1 for line in loglines: worst = logwatch_level_worst(worst, logwatch_parse_line(line)[0]) - try: - logarch = file(logfile, "a+") - logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) - logarch.write("\n".join(loglines) + "\n") - logarch.close() - except Exception, e: - raise MKGeneralException("User %s cannot create logfile: %s" % \ - (username(), e)) + # Ignore log lines which result in an "I" -> "Ignore" state + if worst > -1: + try: + logarch = file(logfile, "a+") + logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) + logarch.write("\n".join(loglines) + "\n") + logarch.close() + except Exception, e: + raise MKGeneralException("User %s cannot create logfile: %s" % \ + (username(), e)) # Get the patterns (either compile or reuse the precompiled ones) # Check_MK creates an empty string if the precompile function has @@ -263,7 +267,7 @@ def check_logwatch(item, params, info): counts = {} # for counting number of matches of a certain pattern state_counts = {} # for counting number of blocks with a certain state block_header = None - block_worst = 0 + block_worst = -1 block_lines = [] block_last_worst_line = '' @@ -279,15 +283,17 @@ def check_logwatch(item, params, info): continue if line.startswith('<<<') and line.endswith('>>>'): if block_header: - # The section is finished here. Add it to the list of reclassified lines - reclassified_lines += finish_block(block_header, block_worst, block_lines) + # The section is finished here. Add it to the list of reclassified lines if the + # state of the block is not "I" -> "ignore" + if block_worst > -1: + reclassified_lines += finish_block(block_header, block_worst, block_lines) - if block_worst >= worst: - worst = block_worst - last_worst_line = block_last_worst_line + if block_worst >= worst: + worst = block_worst + last_worst_line = block_last_worst_line block_lines = [] - block_worst = 0 + block_worst = -1 block_header = line counts = {} else: @@ -313,8 +319,9 @@ def check_logwatch(item, params, info): block_lines.append(level + ' ' + text) - if block_header: - # The last section is finished here. + # The last section is finished here. Add it to the list of reclassified lines if the + # state of the block is not "I" -> "ignore" + if block_header and block_worst > -1: reclassified_lines += finish_block(block_header, block_worst, block_lines) if block_worst >= worst: @@ -324,7 +331,10 @@ def check_logwatch(item, params, info): # Only rewrite the lines if at least one line has been reclassified if reclassified: - file(logfile, 'w').write('\n'.join(reclassified_lines) + '\n') + if reclassified_lines: + file(logfile, 'w').write('\n'.join(reclassified_lines) + '\n') + else: + os.unlink(logfile) # # Render output diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e280f1e..7ac2ef5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -105,6 +105,7 @@ register_rule(group + '/' + subgroup_applications, choices = [ ('C', _('CRITICAL')), ('W', _('WARNING')), + ('O', _('OK')), ('I', _('IGNORE')), ], ), @@ -117,12 +118,14 @@ register_rule(group + '/' + subgroup_applications, ), ] ), - help = _('You can define one or several patterns (regular expressions) in each logfile pattern rule. ' + help = _('You can define one or several patterns (regular expressions) in each logfile pattern rule. ' 'These patterns are applied to the selected logfiles to reclassify the ' 'matching log messages. The first pattern which matches a line will ' 'be used for reclassifying a message. You can use the ' '<a href="wato.py?mode=pattern_editor">Logfile Pattern Analyzer</a> ' - 'to test the rules you defined here.'), + 'to test the rules you defined here.' + 'Select "Ignore" as state to get the matching logs deleted. Other states will keep the ' + 'log entries but reclassify the state of them.'), add_label = _("Add pattern"), ), itemtype = 'item',

12 years, 4 months

Check_MK Git: check_mk: HP-UX Agent: Prepare kcusage monitoring

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ecc949643cd4415a524550bd94f1fd8ca7cb6d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc949643cd441… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 08:56:11 2012 +0200 HP-UX Agent: Prepare kcusage monitoring --- agents/check_mk_agent.hpux | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 570f2ea..96c4e5b 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -103,6 +103,11 @@ echo '<<<ntp>>>' ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' +echo '<<<hpux_tunables>>>' +if which kcusage > /dev/null ; then + kcusage -l +fi + # Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben if cd $PLUGINSDIR

12 years, 4 months

Check_MK Git: check_mk: HP-UX Agent: Add plugin for statgrab support

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ec90660efb92a479f4aa4ba54fe864cc1c154b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec90660efb92a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 08:26:16 2012 +0200 HP-UX Agent: Add plugin for statgrab support --- agents/hpux/statgrab | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/agents/hpux/statgrab b/agents/hpux/statgrab new file mode 100644 index 0000000..0306a92 --- /dev/null +++ b/agents/hpux/statgrab @@ -0,0 +1,25 @@ +#!/bin/sh + +# this is for users who compiled statgrab on hp-ux. +# note you'll need a 0.18 version, from their github page at +# https://github.com/i-scream/libstatgrab +# flags used for compiling - disable documentation, examples and set*id + + +if which statgrab > /dev/null ; then + # You need statgrab to be installed. You'll find it + # here: http://www.i-scream.org/libstatgrab/ + if statgrab const. cpu. disk. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null + then + for s in proc cpu net load disk page + do + echo "<<<statgrab_$s>>>" + cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' + done + + echo '<<<statgrab_mem>>>' + cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' + + fi + [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ +fi

12 years, 4 months

Check_MK Git: check_mk: AIX Agent: Add NTP check for AIX (

by git＠mathias-kettner.de

thanks to Florian Holeczek and Dale Stubblefield) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 277b535c1ded086bf8363029db6a784f7f1a60b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=277b535c1ded08… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 07:01:56 2012 +0200 AIX Agent: Add NTP check for AIX (thanks to Florian Holeczek and Dale Stubblefield) --- agents/check_mk_agent.aix | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 341d76a..51b7e2a 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -85,6 +85,14 @@ do done +echo '<<<ntp>>>' +if which ntpq > /dev/null 2>&1 ; then + if [ $(lssrc -s xntpd|grep -c active) -gt 0 ] ; then + # remote heading, make first column space separated + ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + fi +fi + if cd $PLUGINSDIR 2>/dev/null then

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 480ed0c9c8dc7e12d31d15424cf7a22c6cef8259 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=480ed0c9c8dc7e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 15 17:10:56 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Readme for Agent install

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c880c78b0d5479e26f888a7d2c96768c5ff5bd91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c880c78b0d5479… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 15 17:10:18 2012 +0200 Readme for Agent install --- doc/agents/README.AIX | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/doc/agents/README.AIX b/doc/agents/README.AIX new file mode 100644 index 0000000..c956598 --- /dev/null +++ b/doc/agents/README.AIX @@ -0,0 +1,54 @@ + + +# Install the Agent +cp /tmp/check_mk_agent.aix /usr/bin/check_mk_agent + +# Agent Config +Change the defaults from +export MK_LIBDIR="/to/be/changed" +export MK_CONFDIR="/to/be/changed" + +to +export MK_CONFDIR="/etc/check_mk" +export MK_LIBDIR="/usr/lib/check_mk_agent" + +And create the directories +mkdir /etc/check_mk /usr/lib/check_mk_agent /usr/lib/check_mk_agent/local /usr/lib/check_mk_agent/plugins + + +# INETD SETUP +/etc/services +check_mk 6556/tcp + +# WITHOUT TCPWRAPPERS +/etc/inetd.conf +check_mk stream tcp nowait root /usr/bin/check_mk_agent + +# WITH TCPWRAPPERS +or, if your system has TCPWrappers +check_mk stream tcp nowait root /path/to/tcpd /usr/bin/check_mk_agent +Note - in our testing, tcpwrappers only delivered correct example every 2nd call. +One might be able to use genfilt as an alternate firewall + +and add an allow entry in /etc/hosts.allow: +check_mk: nagioshost, ip_of_nagios_host, 127.0.0.1 + + + +# Extra FEATURES +If you wish to have more stats, +there's 3 ways: +a) +you need to get a hold of the utilities for perfstat from +http://www.ibm.com/developerworks/wikis/display/WikiPtype/ryo +Do not use the binaries since they do an eternal loop. Instead download +adapt.c, cpu.c, memory.c and net.c and remove the loops. + +This code seems to be not GPLed, so we cannot include it. + + +b) +enable SNMP and install the correct bundles for host stats + + +c) compile install libstatgrab (recommended!)

12 years, 4 months

Check_MK Git: check_mk: Snapin Custom Links allows to specify HTTP link target

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7e9928a32046f3e742333c30cd33c24abdba9ea7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e9928a32046f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 11:52:42 2012 +0200 Snapin Custom Links allows to specify HTTP link target --- ChangeLog | 1 + multisite.mk | 18 +++++++++--------- web/htdocs/sidebar.py | 14 +++++++------- web/plugins/sidebar/shipped.py | 5 +++-- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 193a0b1..26286c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * FIX: Logwatch handles logs with only OK lines in it correctly in logfile list views * FIX: Fixed syntax error in "Single-Host Problems" view definition * New help button at top right of each page now toggles help texts + * Snapin Custom Links allows to specify HTTP link target Mobile GUI: * FIX: commands can be executed again diff --git a/multisite.mk b/multisite.mk index 0222aed..dd2f289 100644 --- a/multisite.mk +++ b/multisite.mk @@ -53,13 +53,13 @@ custom_links['guest'] = [ # but some in addition custom_links['user'] = custom_links['guest'] + [ ( "Open Source Components", False, [ - ( "Multisite", "http://mathias-kettner.de/checkmk_multisite.html" ), - ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html" ), - ( "Check_MK", "http://mathias-kettner.de/check_mk.html" ), - ( "Nagios", "http://www.nagios.org/" ), - ( "PNP4Nagios", "http://pnp4nagios.org/" ), - ( "NagVis", "http://nagvis.org/" ), - ( "RRDTool", "http://oss.oetiker.ch/rrdtool/" ), + ( "Multisite", "http://mathias-kettner.de/checkmk_multisite.html", None, "_blank"), + ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html", None, "_blank"), + ( "Check_MK", "http://mathias-kettner.de/check_mk.html", None, "_blank"), + ( "Nagios", "http://www.nagios.org/", None, "_blank"), + ( "PNP4Nagios", "http://pnp4nagios.org/", None, "_blank"), + ( "NagVis", "http://nagvis.org/", None, "_blank"), + ( "RRDTool", "http://oss.oetiker.ch/rrdtool/", None, "_blank"), ]) ] @@ -68,8 +68,8 @@ custom_links['admin'] = custom_links['user'] + [ ( "Support", False, [ ( "Mathias Kettner", "http://mathias-kettner.de/" ), ( "Check_MK Mailinglists", "http://mathias-kettner.de/check_mk_lists.html" ), - ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/" ), - ( "Nagios Portal (German)", "http://nagios-portal.org"), + ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/", None, "_blank" ), + ( "Nagios Portal (German)", "http://nagios-portal.org", None, "_blank"), ]) ] diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 52015f3..3010413 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -55,7 +55,7 @@ def load_plugins(): snapin["allowed"]) # Helper functions to be used by snapins -def link(text, target): +def link(text, target, frame="main"): # Convert relative links into absolute links. We have three kinds # of possible links and we change only [3] # [1] protocol://hostname/url/link.py @@ -63,14 +63,14 @@ def link(text, target): # [3] relative.py if not (":" in target[:10]) and target[0] != '/': target = defaults.url_prefix + "check_mk/" + target - return '<a onfocus="if (this.blur) this.blur();" target="main" ' \ - 'class=link href="%s">%s</a>' % (target, htmllib.attrencode(text)) + return '<a onfocus="if (this.blur) this.blur();" target="%s" ' \ + 'class=link href="%s">%s</a>' % (frame, target, htmllib.attrencode(text)) -def simplelink(text, target): - html.write(link(text, target) + " \n") +def simplelink(text, target, frame="main"): + html.write(link(text, target, frame) + " \n") -def bulletlink(text, target): - html.write("<li class=sidebar>" + link(text, target) + "</li>\n") +def bulletlink(text, target, frame="main"): + html.write("<li class=sidebar>" + link(text, target, frame) + "</li>\n") def iconlink(text, target, icon): linktext = '<img class=iconlink src="images/icon_%s.png">%s' % \ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 96d577a..06ea8a9 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1171,11 +1171,12 @@ def render_custom_links(): render_list(idss, entry[2]) html.write('</div>\n') elif type(entry[1]) == str: - if len(entry) > 2: + frame = len(entry) > 3 and entry[3] or "main" + if len(entry) > 2 and entry[2]: html.write('<img src="images/%s">' % entry[2]) else: html.write('<img src="images/link_link.gif">') - simplelink(entry[0], entry[1]) + simplelink(entry[0], entry[1], frame) else: html.write(_("Second part of tuple must be list or string, not %s\n") % str(entry[1])) except Exception, e:

12 years, 4 months

Check_MK Git: check_mk: Fixed typo in english text

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9c5e7721490eb8fcc449307863375bff4372b5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9c5e7721490eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 10:40:23 2012 +0200 Fixed typo in english text --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bdaca6a..82894b0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2660,7 +2660,7 @@ def mode_bulk_cleanup(phase): html.write("" + _("You have selected %d hosts for bulk cleanup. This means removing " "explicit attribute values from hosts. The hosts will then inherit attributes " - "configured at the host list or folders or simply fall back to the builin " + "configured at the host list or folders or simply fall back to the builtin " "default values.") % len(hostnames)) html.write("")

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0750

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb63b1effad09e58469be032c377413de6574478 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb63b1effad09e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 09:17:31 2012 +0200 Updated bug entries #0750 --- .bugs/750 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/750 b/.bugs/750 new file mode 100644 index 0000000..c5cc8fe --- /dev/null +++ b/.bugs/750 @@ -0,0 +1,9 @@ +Title: IE8: Sidebarscrolling garbles layout +Component: multisite +State: open +Date: 2012-05-15 09:16:40 +Targetversion: 1.2.0 +Class: bug + +If you scroll the sidebar up and down on IE8 then some +things do not scroll but seem to be fixed to the screen.

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits