Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: WATO: small improvement to error handling

by Lars Michelsen

Module: check_mk Branch: master Commit: e714531a142474201f35f81c7dedfedea38134ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e714531a142474… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 14:35:45 2013 +0100 WATO: small improvement to error handling --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 420c978..f8dd222 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7751,6 +7751,9 @@ def mode_users(phase): if delid == config.user_id: raise MKUserError(None, _("You cannot delete your own account!")) + if delid not in users: + return None # The account does not exist (anymore), no deletion needed + c = wato_confirm(_("Confirm deletion of user %s" % delid), _("Do you really want to delete the user %s?" % delid)) if c:

11 years, 7 months

Check_MK Git: check_mk: if checks now with if_groups support

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c0f154e4a21c66d45049aefc41a468258a9e0fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c0f154e4a21c6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 4 17:38:56 2013 +0100 if checks now with if_groups support --- ChangeLog | 1 + checkman/if | 34 ++++++- checkman/if64 | 30 +++++ checkman/if_lancom | 30 +++++ checkman/lnx_if | 29 +++++ checkman/mcdata_fcport | 29 +++++ checks/if.include | 198 ++++++++++++++++++++++++++++++---- web/plugins/wato/check_parameters.py | 35 ++++++ 8 files changed, 364 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3c0f154e4a…

11 years, 7 months

Check_MK Git: check_mk: FIX: includes definition of bonding.include

by Andreas Boesl

Module: check_mk Branch: master Commit: 7a3cf9a1fa42948431d642f276630393e55d83c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a3cf9a1fa4294… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 4 15:42:21 2013 +0100 FIX: includes definition of bonding.include --- ChangeLog | 1 + checks/lnx_bonding | 2 +- checks/ovs_bonding | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c4e86c..3627be8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * lnx_bonding: new check for bonding interfaces on Linux * ovs_bonding: new check for bonding interfaces on Linux / Open vSwitch * if: Inventory settings can now be set host based + * FIX: lnx_bonding/ovs_bonding: correct definition of bonding.include Multisite: * Added comment painter to notification related views diff --git a/checks/lnx_bonding b/checks/lnx_bonding index c5ade7d..14106d2 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -120,5 +120,5 @@ check_info['lnx_bonding'] = { "inventory_function" : lambda info: inventory_bonding(parse_lnx_bonding(info)), "service_description" : "Bonding Interface %s", "group" : "bonding", - "includes" : "bonding.include", + "includes" : [ "bonding.include" ], } diff --git a/checks/ovs_bonding b/checks/ovs_bonding index 4835968..1902f59 100644 --- a/checks/ovs_bonding +++ b/checks/ovs_bonding @@ -82,5 +82,5 @@ check_info['ovs_bonding'] = { "inventory_function" : lambda info: inventory_bonding(parse_ovs_bonding(info)), "service_description" : "Bonding Interface %s", "group" : "bonding", - "includes" : "bonding.include", + "includes" : [ "bonding.include" ], }

11 years, 7 months

Check_MK Git: check_mk: precompiled checks: fixed sys.exit() on python2.4

by Andreas Boesl

Module: check_mk Branch: master Commit: a4629177bb096ec0b186c6a986acb279974aeb3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4629177bb096e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 4 14:38:24 2013 +0100 precompiled checks: fixed sys.exit() on python2.4 --- ChangeLog | 1 + modules/check_mk.py | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12da405..0c4e86c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ creation of the files (Thanks to Guido Günther) * FIX: Inventory for cluster nodes who are part of multiple clusters * cmk --notify: added plugin for sms notification + * FIX: precompiled checks: correct handling of sys.exit() call when using python2.4 Checks & Agents: * winperf_processor now outputs float usage instead of integer diff --git a/modules/check_mk.py b/modules/check_mk.py index d5561a2..86c0b82 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2796,6 +2796,8 @@ no_inventory_possible = None # perform actual check with a general exception handler output.write("try:\n") output.write(" do_check(%r, %r)\n" % (hostname, ipaddress)) + output.write("except SystemExit, e:\n") + output.write(" sys.exit(e.code)\n") output.write("except Exception, e:\n") output.write(" import traceback, pprint\n")

11 years, 7 months

Check_MK Git: check_mk: ovs_bonding: fixed agent part

by Mathias Kettner

Module: check_mk Branch: master Commit: 705eeca02822f97182c336f46faa54a147530b14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=705eeca02822f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 1 18:22:54 2013 +0100 ovs_bonding: fixed agent part --- agents/check_mk_agent.linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index f020745..10c9ba7 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -171,7 +171,7 @@ fi # Same for Open vSwitch bonding if type ovs-appctl > /dev/null ; then echo '<<<ovs_bonding:sep(58)>>>' - for bond in $(ovs-appctl bond/list | sed -r -e 1d -e 's/^[^ ]* ([^ ]*) .*/\1/g') ; do + for bond in $(ovs-appctl bond/list | sed -e 1d | cut -f2) ; do echo "[$bond]" ovs-appctl bond/show $bond done

11 years, 7 months

Check_MK Git: check_mk: livestatus_status: fix site detection in agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 7eff4ba6ebb4125f4416803cfc198142573fc63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7eff4ba6ebb412… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 1 11:27:01 2013 +0100 livestatus_status: fix site detection in agent --- agents/check_mk_agent.linux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9c4f56b..f020745 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -454,7 +454,7 @@ then echo '<<<livestatus_status:sep(59)>>>' for site in * do - if [ -d "$site" ] ; then + if [ -S "/omd/sites/$site/tmp/run/live" ] ; then echo "[$site]" echo -e "GET status" | /omd/sites/$site/bin/unixcat /omd/sites/$site/tmp/run/live fi

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013