Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64329 discussions

Check_MK Git: check_mk: Fixed some css errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7cad2e0905fbf8b0b4a5d862b94985d8caaa910 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7cad2e0905fbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:38:27 2012 +0200 Fixed some css errors --- web/htdocs/check_mk.css | 2 +- web/htdocs/pages.css | 2 +- web/htdocs/views.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c9b4ca2..2b384e0 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -443,7 +443,7 @@ div.listofstrings.horizontal > div:last-child { } table.listchoice { - cell-spacing: 0px; + border-collapse: collapse; } table.listchoice td span.checkbox { height: 10px; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 5abaa0e..44d44a5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -554,7 +554,7 @@ table.nform { padding: 0; empty-cells: show; width: 100%; - border 1px solid green; + border: 1px solid green; border-radius: 5px; box-shadow: 0px 0px 2px #000; margin-bottom: 10px; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 921a8b4..8e29314 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -45,7 +45,7 @@ body.main.dashlet { '-------------------------------------------------------------------------*/ table.filterform { - cell-spacing: 0px; + border-collapse: collapse; padding: 0px; border-style: none; }

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed js error on hostlist page with search form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3fea6c88bb3b8cb86abc3aa0e098a903c77e759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3fea6c88bb3b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:29:43 2012 +0200 FIX: Fixed js error on hostlist page with search form --- ChangeLog | 1 + web/htdocs/wato.py | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85959b4..4197261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * Allow list of aux tags to be missing in host tag definitions. This makes migration from older version easier. * FIX: user management modules can now deal with empty lines in htpasswd + * FIX: Fixed js error on hostlist page with search form Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ebbd2cb..7bd373f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1181,12 +1181,9 @@ def show_hosts(folder): html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') html.write("</td><td class=bulksearch colspan=2>") - html.begin_form("search") html.text_input("search") html.button("_search", _("Search")) html.set_focus("search") - html.hidden_fields() - html.end_form() html.write('</td>') html.write("<td class=bulkactions colspan=%d>" % (colspan-3)) html.write(' ' + _("Selected hosts:\n"))

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: c7912000a0e851119dca7172dac1747dd74e09e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7912000a0e851… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:29:48 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0711

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 25a6724b6539a9d8c310a28779cfcf7b93ea3b91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a6724b6539a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 14:18:48 2012 +0200 Updated bug entries #0711 --- .bugs/711 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/711 b/.bugs/711 index 6ed603a..9986442 100644 --- a/.bugs/711 +++ b/.bugs/711 @@ -1,12 +1,17 @@ Title: don't replicate to hosts with problematic clock differences Component: wato -State: open +Class: nastiness +State: wontfix Date: 2012-05-11 17:55:33 Targetversion: future -Class: nastiness If you replicate to a host that has a clock that drifted into future something can break. We should not replicate to systems that have fundamental problems; the replication may still work, but there may be much larger issues be caused in the followup. + +2012-05-25 14:18:43: changed state open -> wontfix +In my opinion enforcing a correct time is not the task +of Check_MK. And detecting time differences is not easy +to implement in a clean way.

12 years, 4 months

Check_MK Git: check_mk: check_http, check_tcp: allow to omit -I

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cf1a996fabd50f99f2884ed654d36f5f6a2332f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cf1a996fabd50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 12:59:16 2012 +0200 check_http, check_tcp: allow to omit -I --- ChangeLog | 4 +--- checks/check_http | 10 +++++++++- checks/check_tcp | 6 +++++- web/plugins/wato/active_checks.py | 37 +++++++++++++++++++++++++++++-------- 4 files changed, 44 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35107d2..e4fde8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,11 +65,9 @@ * Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat * AIX: convert NIC check to lnx_if (now being compatible with if/if64) * AIX: new check for CPU utilization (using section lparstat_aix) -<<<<<<< HEAD * ntp checks: Changed default value of time offsets to be 200ms (WARN) / 500ms (CRIT) -======= * aironet_{errors,clients}: detect new kinds of devices (Thanks to Tiago Sousa) ->>>>>>> aa82b76e17247eb3d5af8167ae7153a232c4a9ee + * check_http, check_tcp: allow to omit -I and use dynamic DNS name instead 1.2.0b4: Core: diff --git a/checks/check_http b/checks/check_http index 4444a04..e96812c 100644 --- a/checks/check_http +++ b/checks/check_http @@ -31,6 +31,12 @@ def check_http_arguments(params): if "vhost" in settings: args += ' -H %s' % quote_shell_string(settings["vhost"]) + if "virthost" in settings: + vhost, omit_ip = settings["virthost"] + args += ' -H %s' % quote_shell_string(vhost) + else: + omit_ip = False + if "uri" in settings: args += ' -u %s' % quote_shell_string(settings["uri"]) @@ -95,11 +101,13 @@ def check_http_arguments(params): if "max_age" in settings: args += ' -M %d' % settings["max_age"] + if not omit_ip: + args = " -I $HOSTADDRESS$" + args return args active_check_info['http'] = { - "command_line" : '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$', + "command_line" : '$USER1$/check_http $ARG1$', "argument_function" : check_http_arguments, "service_description" : lambda params: "HTTP %s" % params[0], "has_perfdata" : True, diff --git a/checks/check_tcp b/checks/check_tcp index cde96a6..c716266 100644 --- a/checks/check_tcp +++ b/checks/check_tcp @@ -73,12 +73,16 @@ def check_tcp_arguments(params): if "quit_string" in settings: args += ' -q %s' % quote_shell_string(settings["quit_string"]) + if "hostname" in settings: + args += ' -H %s' % quote_shell_string(settings["hostname"]) + else: + args += ' -H $HOSTADDRESS$' return args active_check_info['tcp'] = { - "command_line" : '$USER1$/check_tcp -H $HOSTADDRESS$ $ARG1$', + "command_line" : '$USER1$/check_tcp $ARG1$', "argument_function" : check_tcp_arguments, "service_description" : lambda args: "TCP Port %d" % args[0], "has_perfdata" : True, diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 215578f..a231038 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -40,6 +40,13 @@ register_rule(group, Dictionary( title = _("Optional parameters"), elements = [ + ( "hostname", + TextAscii( + title = _("DNS Hostname"), + allow_empty = False, + help = _("If you specify a hostname here, then a dynamic DNS lookup " + "will be done instead of using the IP address of the host " + "as configured in your host properties."))), ( "response_time", Tuple( title = _("Expected response time"), @@ -177,14 +184,28 @@ register_rule(group, Dictionary( title = _("Optional settings"), elements = [ - ( "vhost", - TextAscii( - title = _("Name of the virtual host"), - help = _("Set this in order to specify the name of the " - "virtual host for the query (using HTTP/1.1). When you " - "leave this empty, then the IP address of the host " - "will be used instead."), - allow_empty = False) + ( "virthost", + Tuple( + title = _("Virtual host"), + elements = [ + TextAscii( + title = _("Name of the virtual host"), + help = _("Set this in order to specify the name of the " + "virtual host for the query (using HTTP/1.1). When you " + "leave this empty, then the IP address of the host " + "will be used instead."), + allow_empty = False), + Checkbox( + label = _("Omit specifying an IP address"), + help = _("Usually Check_MK will nail this check to the " + "IP address of the host it is attached to. With this " + "option you can have the check use the name of the " + "virtual host instead and do a dynamic DNS lookup."), + true_label = _("omit IP address"), + false_label = _("specify IP address"), + ), + ] + ) ), ( "uri", TextAscii(

12 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b47dd74c646b4fc59fc0083978b90f4f38768d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b47dd74c646b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 12:59:21 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Handling empty lines in htpasswd correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 976868a6753564279e59b9899faaf1b7a319fa9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=976868a6753564… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 12:48:39 2012 +0200 FIX: Handling empty lines in htpasswd correctly --- ChangeLog | 2 ++ web/htdocs/login.py | 5 +++-- web/htdocs/wato.py | 36 +++++++++++++++++++----------------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35107d2..d4bc0f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * FIX: Allowing german umlauts in users mail addresses * Allow list of aux tags to be missing in host tag definitions. This makes migration from older version easier. + * FIX: user management modules can now deal with empty lines in htpasswd Multisite: * New display type 'boxes-omit-root' for BI views @@ -51,6 +52,7 @@ * FIX: fix problem where filter settings (of checkboxes) are not effective when it comes to executing commands * FIX: Fixed styling issues of view filters with dropdown fields + * FIX: multisite login can now deal with empty lines in htpasswd Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/login.py b/web/htdocs/login.py index fb9eacb..88ebbc1 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -59,8 +59,9 @@ def load_htpasswd(): creds = {} for line in open(defaults.htpasswd_file, 'r'): - username, pwhash = line.split(':', 1) - creds[username] = pwhash.rstrip('\n') + if ':' in line: + username, pwhash = line.split(':', 1) + creds[username] = pwhash.rstrip('\n') return creds diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cdb87e3..ebbd2cb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7835,23 +7835,25 @@ def load_users(): filename = defaults.htpasswd_file if os.path.exists(filename): for line in file(filename): - id, password = line.strip().split(":")[:2] - if password.startswith("!"): - locked = True - password = password[1:] - else: - locked = False - if id in result: - result[id]["password"] = password - result[id]["locked"] = locked - else: - # Create entry if this is an admin user - new_user = { - "roles" : config.roles_of_user(id), - "password" : password, - "locked" : False - } - result[id] = new_user + line = line.strip() + if ':' in line: + id, password = line.strip().split(":")[:2] + if password.startswith("!"): + locked = True + password = password[1:] + else: + locked = False + if id in result: + result[id]["password"] = password + result[id]["locked"] = locked + else: + # Create entry if this is an admin user + new_user = { + "roles" : config.roles_of_user(id), + "password" : password, + "locked" : False + } + result[id] = new_user # Other unknown entries will silently be dropped. Sorry... # Now read the automation secrets and add them to existing

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: 9f2ff5cafc87056f3f844bfe5b741e8b3db2e6a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f2ff5cafc8705… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 12:42:02 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fixed js syntax error when using i18n

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2da2b047cc47120c97205613dd36eb485d1ad755 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2da2b047cc4712… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 12:41:24 2012 +0200 Fixed js syntax error when using i18n --- web/htdocs/views.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6647385..6cd06e4 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1536,6 +1536,8 @@ def view_optiondial(view, option, choices, help): value = vo.get(option, view.get(option, choices[0][0])) title = dict(choices).get(value, value) html.begin_context_buttons() # just to be sure + # Remove unicode strings + choices = [ [c[0], str(c[1])] for c in choices ] html.write('<div title="%s" id="optiondial_%s" class="optiondial %s val_%s"' 'onclick="view_dial_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( help, option, option, value, view["name"], option, choices, title))

12 years, 4 months

Check_MK Git: check_mk: FIX: fix cloning of users

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db5cc76311ef82717b429c80dce9cab57036546b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db5cc76311ef82… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 12:11:21 2012 +0200 FIX: fix cloning of users --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57d2ece..be09057 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * FIX: implement locking in order to prevent data corruption on concurrent changes * FIX: Fixed handling of validation errors in cascading dropdown fields + * FIX: fix cloning of users * Keep track of changes made by other users before activating changes, let user confirm this, new permission can be used to prevent a user from activating foreign changes. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 938f247..b6f9eec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7354,7 +7354,7 @@ def mode_users(phase): # Buttons edit_url = make_link([("mode", "edit_user"), ("edit", id)]) delete_url = html.makeactionuri([("_delete", id)]) - clone_url = make_link([("mode", "edit_user"), ("hlone", id)]) + clone_url = make_link([("mode", "edit_user"), ("clone", id)]) html.write("<td class=buttons>") html.icon_button(edit_url, _("Properties"), "edit") html.icon_button(clone_url, _("Create a copy of this user"), "clone")

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