Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64407 discussions

Check_MK Git: check_mk: Small parameter handling improvements when params are missing, better error messages

by Lars Michelsen

Module: check_mk Branch: master Commit: d29602dbfd6a25a21d77e7dbd4a62428d568d245 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29602dbfd6a25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 11:17:44 2013 +0100 Small parameter handling improvements when params are missing, better error messages --- web/htdocs/wato.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c77cba2..420c978 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7509,6 +7509,8 @@ def automation_push_snapshot(): raise MKGeneralException(message) tarcontent = html.var('snapshot') + if not tarcontent: + raise MKGeneralException(_('Invalid call: The snapshot is missing.')) multitar.extract_from_buffer(tarcontent, replication_paths) log_commit_pending() # pending changes are lost @@ -7939,8 +7941,8 @@ def mode_edit_user(phase): increase_serial = True # password changed, reflect in auth serial else: - password = html.var("password").strip() - password2 = html.var("password2").strip() + password = html.var("password", '').strip() + password2 = html.var("password2", '').strip() # Detect switch back from automation to password if "automation_secret" in new_user: @@ -7962,14 +7964,14 @@ def mode_edit_user(phase): new_user['serial'] = new_user.get('serial', 0) + 1 # Email address - email = html.var("email").strip() + email = html.var("email", '').strip() regex_email = '^[-a-zäöüÄÖÜA-Z0-9_.+%]+(a)xn--[-a-za-z0-9]+(\-4kba73ab2jc.xn--[-a-za-z0-9]+)*$-znba55ab8jc' if email and not re.match(regex_email, email): raise MKUserError("email", _("'%s' is not a valid email address." % email)) new_user["email"] = email # Pager - pager = html.var("pager").strip() + pager = html.var("pager", '').strip() new_user["pager"] = pager # Roles

11 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0913

by Lars Michelsen

Module: check_mk Branch: master Commit: 02007939e5b3021756d0c5da21866b2c920adf88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02007939e5b302… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 14:34:52 2013 +0100 Updated bug entries #0913 --- .bugs/913 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/913 b/.bugs/913 new file mode 100644 index 0000000..0c9d843 --- /dev/null +++ b/.bugs/913 @@ -0,0 +1,13 @@ +Title: Painter contents should be aligned vertically top when one painter is higher than others +Component: multisite +State: open +Date: 2013-02-04 11:33:52 +Targetversion: 1.2.2 +Class: cleanup + +The default vertical alignment is middle. This is ok and should be kept for regular +layouts where every painter fits in one row (text should be aligned middle to the +images and perfometers). + +But in case there is very long status output which wraps to several lines, the other +painter contents should be aligned to top.

11 years, 7 months

Check_MK Git: check_mk: FIX: Fixed missing general.* permissions in auth. php on slave sites in case of distributed WATO setups

by Lars Michelsen

Module: check_mk Branch: master Commit: 58fea1806555328c799e047b0d6010aa3b938334 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58fea180655532… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 4 11:19:26 2013 +0100 FIX: Fixed missing general.* permissions in auth.php on slave sites in case of distributed WATO setups --- ChangeLog | 2 ++ web/htdocs/index.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 680c565..4a2a144 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,8 @@ * FIX: fix title of foldable areas contained in list valuespecs * FIX: Fixed bug where pending log was not removed in multisite setup * FIX: Fixed generation of auth.php (Needed for NagVis Multisite Authorisation) + * FIX: Fixed missing general.* permissions in auth.php on slave sites in + case of distributed WATO setups Event Console: * Added UNIX socket for sending events to the EC diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 1022055..518ff6b 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -257,6 +257,12 @@ def handler(req, profiling = True): # Get page handler handler = pagehandlers.get(req.myfile, page_not_found) + # First initialization of the default permissions. Needs to be done before the auth_file + # (auth.php) ist written (it's done during showing the login page for the first time). + # Must be loaded before the "automation" call to have the general.* permissions available + # during automation action processing (e.g. hooks triggered by restart) + default_permissions.load() + # Special handling for automation.py. Sorry, this must be hardcoded # here. Automation calls bybass the normal authentication stuff if req.myfile == "automation": @@ -270,10 +276,6 @@ def handler(req, profiling = True): output_format = html.var("output_format", "html") html.set_output_format(output_format) - # First initialization of the default permissions. Needs to be done before the auth_file - # (auth.php) ist written (it's done during showing the login page for the first time). - default_permissions.load() - # Is the user set by the webserver? otherwise use the cookie based auth if not req.user or type(req.user) != str: config.auth_type = 'cookie'

11 years, 7 months

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, 8 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, 8 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 24ec92006da1bbbd5f6e2e8205c06ca8be30cf94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24ec92006da1bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jan 31 17:15:59 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits