Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: validator: added -c/ --checks to limit the checks to validate

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fcdb0a850041355407e2d6de8bddd7143ebd27f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcdb0a85004135… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 15:31:44 2011 +0100 validator: added -c/--checks to limit the checks to validate --- doc/helpers/validate_checks | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index e66dd21..e48ac3c 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -122,11 +122,11 @@ def grep_manpage(check, match, section = None): def usage(msg = ''): if msg: - print msg - print + sys.stderr.write("%s\n" % msg) + sys.stderr.write("\n") for s, l, t in _args: - print ' %3s, %-15s %s' % (s, l, t) - print + sys.stderr.write(' %3s, --%-15s %s\n' % ('-'+s.rstrip(':'), l, t)) + sys.stderr.write("\n") sys.exit(0) ignored_variables = [ @@ -322,6 +322,7 @@ def verify_perfometer(check): # ############################################################################# _args = [ + ('c:', 'checks=', 'Put one or more checks (comma separated) to limit the checks to validate'), ('l:', 'score-limit=', 'Set an upper score limit. Only checks with a lower score will be shown'), ('v', 'verbose', 'Enable verbose output'), ('h', 'help', 'Show help message'), @@ -329,6 +330,7 @@ _args = [ _verbose = 0 _score_limit = None +_checks = [] try: opts, args = getopt.getopt(sys.argv[1:], ''.join([ x[0] for x in _args ]), [ x[1] for x in _args ]) except getopt.error, msg: @@ -338,13 +340,20 @@ for o, a in opts: _verbose += 1 elif o in ('-l', '--score-limit'): _score_limit = int(a) + elif o in ('-c', '--checks'): + _checks = a.split(',') elif o in ('-h', '--help'): usage() + else: + usage('Unhandled parameter: %s' % str(o)) # 1) Perform checks # results = {} for check in get_all_checks(): + if _checks and not check in _checks: + continue + score = SCORE_START check_results = TESTS.copy()

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c928cb9f354eb16880416440f8866a39cb3844f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c928cb9f354eb1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 1 14:53:47 2011 +0100 Updated bug entries --- .bugs/163 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/.bugs/163 b/.bugs/163 new file mode 100644 index 0000000..247510f --- /dev/null +++ b/.bugs/163 @@ -0,0 +1,77 @@ +Title: backgrounds in downtime view not shown for host downtimes +Component: multisite +Benefit: 2 +State: open +Cost: 4 +Date: 2011-03-01 14:42:34 +Class: nastiness + +The problem is that the host_state is not fetched via livestatus. These code parts were written by sir hack-a-lot ;-). +This would workaround the problem and bring the color to the host columns . And the host_state and host_has_been_checked columns are fetched from much more views (maybe useless in most cases). + +Patch: + +diff --git a/web/htdocs/views.py b/web/htdocs/views.py +index e8c9498..9baddb6 100644 +--- a/web/htdocs/views.py ++++ b/web/htdocs/views.py +@@ -1049,6 +1049,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru + if (not view["mustsearch"]) or html.var("search"): + # names for additional columns (through Stats: headers) + add_columns = datasource.get("add_columns", []) ++ + columns, rows = query_data(datasource, columns, add_columns, query, only_sites, get_limit()) + sort_data(rows, sorters) + else: +@@ -1356,7 +1357,7 @@ def query_data(datasource, columns, add_columns, add_headers, only_sites = [], l + state_columns = [] + if "service" in datasource["infos"]: + state_columns += [ "service_has_been_checked", "service_state" ] +- elif "host" in datasource["infos"]: ++ if "host" in datasource["infos"]: + state_columns += [ "host_has_been_checked", "host_state" ] + for c in state_columns: + if c not in columns: +diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py +index 135b1ed..6a870d1 100644 +--- a/web/plugins/views/layouts.py ++++ b/web/plugins/views/layouts.py +@@ -141,14 +141,17 @@ def render_grouped_boxes(data, view, group_painters, painters, num_columns): + + for row in rows: + register_events(row) # needed for playing sounds ++ + if trclass == "odd": + trclass = "even" + else: + trclass = "odd" ++ + state = row.get("service_state", None) + if state == None: + state = row.get("host_state", 0) + if state > 0: state +=1 # 1 is critical for hosts ++ + html.write('<tr class="data %s%d">' % (trclass, state)) + for p in painters: + paint(p, row) +@@ -368,13 +371,19 @@ def render_grouped_list(data, view, group_painters, painters, num_columns): + # or host - if available - to color the complete line + if num_columns == 1: + # render state, if available through whole tr +- state = row.get("service_state", 0) ++ if row.get('service_description', '') == '': ++ state = row.get("host_state", 0) ++ if state > 0: state +=1 # 1 is critical for hosts ++ else: ++ state = row.get("service_state", None) + else: + state = 0 ++ + if trclass == "odd": + trclass = "even" + else: + trclass = "odd" ++ + html.write('<tr class="data %s%d">' % (trclass, state)) + + for p in painters:

13 years, 6 months

Check_MK Git: check_mk: fix json/python Webservice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eaa7c7037170a6ce554ebb7cfaa8cfa8ed013ccc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaa7c7037170a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 19:59:14 2011 +0100 fix json/python Webservice --- ChangeLog | 3 +++ web/plugins/views/webservice.py | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4067e36..06a904e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,9 @@ * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) * FIX: repair PNP template for df when using trends + Multisite: + * FIX: fix json/python Webservice + 1.1.9i9: Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index 431ef04..3646dcd 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -34,8 +34,7 @@ multisite_layouts["python-raw"] = { "hide" : True, } -def render_python(data, view, group_painters, painters, num_columns): - columns, rows = data +def render_python(rows, view, group_painters, painters, num_columns): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) html.write(",\n") @@ -64,8 +63,7 @@ def encode_string_json(s): return '"' + json_escape.sub(lambda m: json_encoding_table[m.group(0)], s) + '"' -def render_json(data, view, group_painters, painters, num_columns): - columns, rows = data +def render_json(rows, view, group_painters, painters, num_columns): html.write("[\n") html.write(repr([p[0]["name"] for p in painters])) for row in rows:

13 years, 6 months

Check_MK Git: check_mk: setup.sh: local installation honors livestatus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1078c633e221392bc2f196a3918d32dfe4ba262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1078c633e2213… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 12:32:04 2011 +0100 setup.sh: local installation honors livestatus --- scripts/setup.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 3539b3a..c6fa6c3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -601,10 +601,14 @@ do if [ "${PIPESTATUS[0]}" = 0 ] then - if [ "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] + if [ -z "$OMD_ROOT" -a "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] then echo -e "# Load Livestatus Module\nbroker_module=$libdir/livestatus.o $livesock\nevent_broker_options=-1" \ >> $DESTDIR$nagios_config_file + elif [ "$OMD_ROOT" ] ; then + echo -e "# Load Livestatus Module\nbroker_module=$OMD_ROOT/local/lib/mk-livestatus/livestatus.o pnp_path=$OMD_ROOT/var/pnp4nagios/perfdata $livesock\nevent_broker_options=-1" \ + >> $OMD_ROOT/etc/mk-livestatus/nagios-local.cfg + ln -sfn ../../mk-livestatus/nagios-local.cfg $OMD_ROOT/etc/nagios/nagios.d/mk-livestatus.cfg fi else echo -e "\E[1;31;40m ERROR compiling livestatus! \E[0m.\nLogfile is in $SRCDIR/livestatus.log" @@ -664,6 +668,7 @@ do if [ ! -e $DESTDIR$confdir/multisite.mk ] ; then cp $DESTDIR$confdir/multisite.mk-$VERSION $DESTDIR$confdir/multisite.mk fi && + mkdir -p $DESTDIR$confdir/multisite.d && mkdir -p $DESTDIR$confdir/conf.d && echo 'All files in this directory that end with .mk will be read in after main.mk' > $DESTDIR$confdir/conf.d/README && if [ ! -d $DESTDIR$rrddir ] ; then

13 years, 6 months

Check_MK Git: check_mk: setup.sh: allow installation into OMD site ( experimental)

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89bf6e555e467eea4e4388d951951d5d82d24e55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89bf6e555e467e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 11:48:29 2011 +0100 setup.sh: allow installation into OMD site (experimental) --- ChangeLog | 2 + scripts/autodetect.py | 379 +++++++++++++++++++++++++++---------------------- scripts/setup.sh | 125 ++++++++++++----- 3 files changed, 302 insertions(+), 204 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=89bf6e555e…

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c2d39e9646538ff547dc1c097101e7260bc001fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2d39e9646538f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 16:55:18 2011 +0100 Updated bug entries --- .bugs/129 | 10 +++++++--- .bugs/157 | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.bugs/129 b/.bugs/129 index 8c7d68a..0333eb6 100644 --- a/.bugs/129 +++ b/.bugs/129 @@ -1,11 +1,15 @@ Title: check include files must be loaded first Component: core +State: done +Class: bug +Date: 2011-02-11 09:13:34 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-11 09:13:34 -Class: bug +Fun: 0 When loading all check files, the files with the extension ".include" must be loaded first. Otherwise unresolved functions might occur (see df_netapp32). + +2011-02-27 16:54:27: changed state open -> done +Fixed in 1.1.10b1 diff --git a/.bugs/157 b/.bugs/157 index ab0e75e..380e058 100644 --- a/.bugs/157 +++ b/.bugs/157 @@ -1,10 +1,14 @@ Title: df magic broken Component: checks +State: done +Class: bug +Date: 2011-02-26 13:15:33 Benefit: 1 -State: open Cost: 1 -Date: 2011-02-26 13:15:33 -Class: bug +Fun: 0 filesystem_default_levels["magic"] = 0.8 seems to break the df check in 1.1.9i9 + +2011-02-27 16:53:38: changed state open -> done +Is fixed in 1.1.10b1

13 years, 6 months

Check_MK Git: check_mk: FIX: repair PNP template for df when using trends

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d176fe148755cad6b7dbd39f754c34efa05a372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d176fe148755c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 15:53:43 2011 +0100 FIX: repair PNP template for df when using trends --- ChangeLog | 1 + pnp-templates/check_mk-df.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4086bd..b6151d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ now df-parameter "trend_perfdata" (see new man page of df) * hp_proliant_*: improve scan function (now just looks for "proliant") * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) + * FIX: repair PNP template for df when using trends 1.1.9i9: Core, Setup, etc.: diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index c28e4ac..7c0bdd3 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -71,6 +71,8 @@ if (isset($DS[2])) { $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; + $def[2] .= "CDEF:growth_minabs=0,growth_min,- "; + $def[2] .= "CDEF:growth=growth_minabs,growth_max,MAX "; $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" ";

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 13a5bb2bfb5f2d34144433f0a4fa79e942ded110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13a5bb2bfb5f2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:25:32 2011 +0100 Updated bug entries --- .bugs/162 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/162 b/.bugs/162 new file mode 100644 index 0000000..8fd6afe --- /dev/null +++ b/.bugs/162 @@ -0,0 +1,10 @@ +Title: Drop direct RRD updates +Component: core +Benefit: 1 +State: open +Cost: 2 +Date: 2011-02-27 14:24:50 +Class: cleanup + +That feature should be completely removed from the code and +documentation as soon as we open the 1.1.11 series.

13 years, 6 months

Check_MK Git: check_mk: cisco_temp_perf: fix return state in case of WARNING

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5be034f34ff60ae99a8dee853f3633494dd6d479 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5be034f34ff60a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:19:57 2011 +0100 cisco_temp_perf: fix return state in case of WARNING --- ChangeLog | 1 + checks/cisco_temp_perf | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5023ab0..a4086bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * FIX: removed filesystem_trend_perfdata. It didn't work. Use now df-parameter "trend_perfdata" (see new man page of df) * hp_proliant_*: improve scan function (now just looks for "proliant") + * FIX: cisco_temp_perf: fix return state in case of WARNING (was 0 = OK) 1.1.9i9: Core, Setup, etc.: diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index a76ebec..f6f30aa 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -74,7 +74,7 @@ def check_cisco_temp_perf(item, params, info): if state == 1: return (0, "OK - state is normal%s" % temptext, perfdata) elif state == 2: - return (0, "WARN - state is %s%s" % (statename, temptext), perfdata) + return (1, "WARN - state is %s%s" % (statename, temptext), perfdata) elif state in [ 5, 6 ]: return (3, "UNKNOWN - state is %s" % statename) else:

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97a6e06fea257f668ebe089e74ba498ae3e977dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97a6e06fea257f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 14:09:38 2011 +0100 Updated bug entries --- .bugs/161 | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/.bugs/161 b/.bugs/161 new file mode 100644 index 0000000..4a16a46 --- /dev/null +++ b/.bugs/161 @@ -0,0 +1,18 @@ +Title: Add -Cc to snmpwalk options +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-27 14:08:10 +Class: feature + +This avoids problem on some devices. Might other introduce new ones. +So I'm not sure what to do here. From the manpage of snmpwalk: + +-Cc Do not check whether the returned OIDs are increasing. Some agents +(LaserJets are an example) return OIDs out of order, but can complete the walk +anyway. Other agents return OIDs that are out of order and can cause +snmpwalk to loop indefinitely. By default, snmpwalk tries to detect +this behavior and warns you when it hits an agent acting illegally. +Use -Cc to turn off this check. +

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits