Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64200 discussions

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: 1b23c6655ce7bae5447401d2d3568560e88497e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b23c6655ce7ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 25 18:15:53 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Updated bug entries #0603

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f24c1869c90fa0f2c4ffd88ea042ba51554bd379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f24c1869c90fa0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 25 10:00:48 2012 +0100 Updated bug entries #0603 --- .bugs/603 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/603 b/.bugs/603 new file mode 100644 index 0000000..3c41bf2 --- /dev/null +++ b/.bugs/603 @@ -0,0 +1,13 @@ +Title: default_language not honored by login maski +Component: multisite +State: open +Date: 2012-01-25 09:58:35 +Targetversion: 1.2.0 +Class: bug + +I've translated "Username" and "Password" into 'de'. Then I've +set default_language = 'de' in multisite.mk. Texts are not +translated in the Cookie based login form, even after are restart +of Apache. The I login, set my user language to 'de' and logout. +Now the login screen is in German. After a logout the login screen +is in German. Restarting Apache now switches it back to english.

12 years, 8 months

Check_MK Git: check_mk: remove experimental warning from l10n

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 56133c14c45cfcf07bfc72fff66f52d130814624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56133c14c45cfc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 25 09:49:29 2012 +0100 remove experimental warning from l10n --- modules/localize.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/localize.py b/modules/localize.py index 669b41f..6769ee6 100755 --- a/modules/localize.py +++ b/modules/localize.py @@ -59,8 +59,6 @@ except: def localize_usage(err = ''): sys.stdout.write("""Usage: check_mk [-v] --localize COMMAND [ARGS] -BE AWARE: This is an experimental feature!!! - Available commands are: update LANG (ALIAS) ... Creates or updates a .po file for the given language. The alias is an optional attribute which will be used as

12 years, 8 months

Check_MK Git: check_mk: Updated Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ec8b2f56b3e61e6023955a7214ade824c4db6f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ec8b2f56b3e61… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 25 15:37:17 2012 +0100 Updated Changelog --- ChangeLog | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e36a50f..f1ccae0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,7 +53,12 @@ it exists after login when it is first needed Mobile: - * Improved sorting of views in main page + * Improved sorting of views in main page + * Fix: Use all the availiable space in header + * Fix: Navigation with Android Hardwarekeys now working + * Fix: Links to pnp4nagios now work better + * Fix: Host and Service Icons now finger friendly + * Fix: Corrected some buildin views WATO: * Removed IP-Address attribute from folders @@ -62,6 +67,7 @@ * Snapshot/Factory Reset is possible even with a broken config * Added error messages to user edit dialog to prevent notification problems caused by incomplete configuration + * Activate Changes: Wato can also reload instead of restarting nagios * Replication: Can now handle replication sites which use the form based auth * Replication: Added option to ignore problems with the ssl certificates used in ssl secured replications

12 years, 8 months

Check_MK Git: check_mk: Update of gettext strings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 254256d4cec081d89ef058d56649b6bd94c0dd8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=254256d4cec081… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 25 17:08:26 2012 +0100 Update of gettext strings --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/login.py | 3 +-- web/htdocs/mobile.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 46bdc00..204019a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -711,8 +711,8 @@ class html: else: login_text = _("not logged in") self.write("<table class=header><tr><td class=left>%s</td><td class=right>" - "%s     <b id=headertime>%s</b> <a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a></td></tr></table>" % - (title, login_text, time.strftime("%H:%M"))) + "%s     <b id=headertime>%s</b>%s</td></tr></table>" % + (title, login_text, time.strftime("%H:%M"),_("<a href=\"http://mathias-kettner.de\"><img src=\"images/mk_logo_small.gif\"/></a>"))) self.write("<hr class=header>\n") if config.debug: self.write("<div class=urldebug>%s</div>" % self.makeuri([])) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 0f74f53..439e441 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -221,8 +221,7 @@ def normal_login_page(): html.write("<div id=login>") html.write("<div id=logo></div>") - html.write("<h1>Check_MK Multisite</h2>") - + html.write("<h1>%s</h2>" % _("Check_MK Multisite")) html.write('<div id=form>') if html.has_user_errors(): diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 647e2de..e068943 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -147,7 +147,7 @@ def jqm_page(title, content, foot, id=None): jqm_page_footer(foot) def page_login(): - title = "Check_MK Mobile" + title = _("Check_MK Mobile") mobile_html_head(title) jqm_page_header(title, id="login") html.write('<div id="loginhead">%s</div>' %

12 years, 8 months

Check_MK Git: check_mk: Wato: Added function that wato can use reload instead of restart

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf2e71dd4c39ba132a002d9478cd6e445416d2b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf2e71dd4c39ba… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 25 15:27:59 2012 +0100 Wato: Added function that wato can use reload instead of restart --- modules/automation.py | 11 ++++++++--- web/htdocs/config.py | 2 +- web/htdocs/wato.py | 8 ++++---- web/plugins/wato/check_mk_configuration.py | 12 ++++++++++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index bfb1be5..f6e5213 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -51,8 +51,10 @@ def do_automation(cmd, args): result = automation_get_autochecks(args) elif cmd == "set-autochecks": result = automation_set_autochecks(args) + elif cmd == "reload": + result = automation_restart("reload") elif cmd == "restart": - result = automation_restart() + result = automation_restart("restart") else: raise MKAutomationError("Automation command '%s' is not implemented." % cmd) @@ -354,7 +356,7 @@ def automation_delete_host(args): "%s/%s.*" % (tcp_cache_dir, hostname)]: os.system("rm -rf '%s'" % path) -def automation_restart(): +def automation_restart(job="restart"): # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if # check_mk is called by WATO via Apache. Nagios inherits @@ -395,7 +397,10 @@ def automation_restart(): if backup_path: os.remove(backup_path) do_precompile_hostchecks() - do_restart_nagios(False) + if job == 'restart': + do_restart_nagios(False) + elif job == 'reload': + do_restart_nagios(True) else: if backup_path: os.rename(backup_path, nagios_objects_file) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index f0d1362..bbf57ee 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -592,7 +592,7 @@ wato_hide_filenames = True wato_max_snapshots = 50 wato_num_hostspecs = 12 wato_num_itemspecs = 15 - +wato_activation_method = 'restart' wato_write_nagvis_auth = False diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0bb819f..a3e81bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2718,7 +2718,7 @@ def mode_changelog(phase): sitestatus_do_async_replication = True else: try: - check_mk_local_automation("restart") + check_mk_local_automation(config.wato_activation_method) except Exception, e: if config.debug: raise @@ -6109,8 +6109,8 @@ def synchronize_site(site, restart): # Isolated restart without prior synchronization. Currently this # is only being called for the local site. def restart_site(site): - start = time.time() - check_mk_automation(site["id"], "restart") + start = time.time() + check_mk_automation(site["id"], config.wato_activation_method) duration = time.time() - start update_replication_status(site["id"], { "need_restart" : False }, { "restart" : duration }) @@ -6360,7 +6360,7 @@ def automation_push_snapshot(): create_distributed_wato_file(site_id, mode) log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) if html.var("restart", "no") == "yes": - check_mk_local_automation("restart") + check_mk_local_automation(config.wato_activation_method) return True except Exception, e: if config.debug: diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 0066e42..858d5cb 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -162,6 +162,18 @@ register_configvar(group, default_value = 50), domain = "multisite") +register_configvar(group, + "wato_activation_method", + DropdownChoice( + title = _("Wato restart mode for Nagios"), + help = _("Should Wato restart or reload Nagios when activating changes"), + choices = [ + ('restart', _("Restart")), + ('reload' , _("Reload") ), + ]), + domain = "multisite" + ) + group = _("Operation mode of Check_MK") register_configvar(group,

12 years, 8 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: b02b238270a28e15e779f6301f79487263002325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b02b238270a28e… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jan 25 15:28:10 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: fix alignment of icon button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 73687af80969c783e71a9d40be2daa883452148b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73687af80969c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 13:43:13 2012 +0100 fix alignment of icon button --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d045b1b..46bdc00 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -332,7 +332,7 @@ class html: def icon_button(self, url, help, icon): self.write('<a href="%s">' - '<img class=iconbutton title="%s" src="images/button_%s_lo.png" ' + '<img align=absmiddle class=iconbutton title="%s" src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' '</a>\n' % (url, help, icon))

12 years, 8 months

Check_MK Git: check_mk: FIX: honor extra_summary_host_conf (was ignored)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 303fd1be763773570ddb5846e9a82205da5190da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=303fd1be763773… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 13:45:00 2012 +0100 FIX: honor extra_summary_host_conf (was ignored) --- ChangeLog | 1 + modules/check_mk.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7bd8d8..0124209 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * cmk --localize update supports an optional ALIAS which is used as display string in the multisite GUI * FIX: Fixed encoding problems with umlauts in group aliases + * FIX: honor extra_summary_host_conf (was ignored) Checks & Agents: * Windows agent: output eventlog texts in UTF-8 encoding. This diff --git a/modules/check_mk.py b/modules/check_mk.py index 856325e..3df7ff9 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1575,6 +1575,7 @@ def create_nagios_hostdefs(outfile, hostname): if is_clust: outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) + outfile.write(extra_summary_host_conf_of(hostname)) outfile.write("}\n") outfile.write("\n")

12 years, 8 months

Check_MK Git: check_mk: FIX: ntp checks: output numeric data also if stratum too high

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b921974010e2e47881151a140a9a605a2f8a1a77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b921974010e2e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 24 16:40:08 2012 +0100 FIX: ntp checks: output numeric data also if stratum too high --- ChangeLog | 1 + checks/ntp | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0124209..e36a50f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * Linux agent: wrap freeipmi with lock in order to avoid cache corruption * New check: megaraid_bbu - check existance & status of LSI MegaRaid BBU module * HP-UX Agent: fix mrpe (remove echo -e and test -e, thanks to Philipp Lemke) + * FIX: ntp checks: output numeric data also if stratum too high Multisite: * Improve transaction handling and reload detection: user can have diff --git a/checks/ntp b/checks/ntp index e8a6594..0e988f5 100644 --- a/checks/ntp +++ b/checks/ntp @@ -109,7 +109,7 @@ def check_ntp_server_state(line, params): elif state in [ "falsetick" ]: return (2, infotext, offset, jitter) elif stratum >= maxstratum: - return (2, "stratum %d is too high (max allowed is %d)" % (stratum, maxstratum - 1)) + return (2, infotext + (", stratum is too high (max allowed is %d)" % (maxstratum - 1))) elif when > 2*poll and when > 128: # when can exceed poll for small polling values return (3, "response due since %d secs%s" % (when - poll, infotext), offset, jitter)

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits