Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Added some missing i18n strings in general HTML functions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e38dc36e52e1470adc3cfe49f6ba7499638435f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e38dc36e52e147… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 14:59:59 2011 +0200 Added some missing i18n strings in general HTML functions --- web/htdocs/htmllib.py | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c9cbc4d..70601a0 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -457,19 +457,19 @@ class html: d = self.var(varname + "_date") if not t or not d: raise MKUserError([varname + "_date", varname + "_time"], - "Please specify a date and time") + _("Please specify a date and time")) try: br = time.strptime(d + " " + t, "%Y-%m-%d %H:%M") except: raise MKUserError([varname + "_date", varname + "_time"], - "Please enter the date/time in the format YYYY-MM-DD HH:MM") + _("Please enter the date/time in the format YYYY-MM-DD HH:MM")) return int(time.mktime(br)) def get_time_input(self, varname, what): t = self.var(varname) if not t: - raise MKUserError(varname, "Please specify %s" % what) + raise MKUserError(varname, _("Please specify %s") % what) try: h, m = t.split(":") @@ -478,7 +478,7 @@ class html: if m < 0 or m > 59 or h < 0: raise Exception() except: - raise MKUserError(varname, "Please enter the time in the format HH:MM") + raise MKUserError(varname, _("Please enter the time in the format HH:MM")) return m * 60 + h * 3600 def upload_file(self, varname): @@ -554,7 +554,7 @@ class html: if type(self.req.user) == str: login_text = "<b>%s</b> (%s)" % (config.user, config.role) else: - login_text = "not logged in" + 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"))) @@ -581,7 +581,7 @@ class html: self.bottom_focuscode() corner_text = "" if self.browser_reload: - corner_text += "refresh: %d secs" % self.browser_reload + corner_text += _("refresh: %d secs") % self.browser_reload si = self.render_status_icons() self.write("<table class=footer><tr>" "<td class=left>%s</td>" @@ -610,7 +610,7 @@ class html: if self.output_format == "html": self.write("<div class=error>%s</div>\n" % msg) else: - self.write("ERROR: ") + self.write(_("ERROR: ")) self.write(strip_tags(msg)) self.write("\n") @@ -618,7 +618,7 @@ class html: if self.output_format == "html": self.write("<div class=warning>%s</div>\n" % msg) else: - self.write("WARNING: ") + self.write(_("WARNING: ")) self.write(strip_tags(msg)) self.write("\n") @@ -626,18 +626,20 @@ class html: if self.output_format == "html": self.write("<div class=success>%s</div>\n" % msg) else: - self.write("MESSAGE: ") + self.write(_("MESSAGE: ")) self.write(strip_tags(msg)) self.write("\n") def check_limit(self, rows, limit): count = len(rows) if limit != None and count >= limit + 1: - text = "Your query produced more then %d results. " % limit + text = _("Your query produced more than %d results. ") % limit if self.var("limit", "soft") == "soft" and config.may("ignore_soft_limit"): - text += '<a href="%s">Repeat query and allow more results.</a>' % self.makeuri([("limit", "hard")]) + text += '<a href="%s">%s</a>' % \ + (self.makeuri([("limit", "hard")]), _('Repeat query and allow more results.')) elif self.var("limit") == "hard" and config.may("ignore_hard_limit"): - text += '<a href="%s">Repeat query without limit.</a>' % self.makeuri([("limit", "none")]) + text += '<a href="%s">%s</a>' % \ + (self.makeuri([("limit", "none")]), _('Repeat query without limit.')) self.show_warning(text) del rows[limit:] return False @@ -650,8 +652,8 @@ class html: self.write("<div class=really>%s" % msg) self.begin_form("confirm", None, "POST") self.hidden_fields(add_action_vars = True) - self.button("_do_confirm", "Yes!", "really") - self.button("_do_actions", "No", "") + self.button("_do_confirm", _("Yes!"), "really") + self.button("_do_actions", _("No"), "") self.end_form() self.write("</div>") return False

13 years

Check_MK Git: check_mk: FIX: fix rescheduling of host check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1345846392e78e868bec95b753cd3e44c5d280cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1345846392e78e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 14:37:28 2011 +0200 FIX: fix rescheduling of host check --- ChangeLog | 4 ++++ web/htdocs/actions.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed4d416..32af37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.12b1: + Multisite: + * FIX: fix rescheduling of host check + 1.1.11i4: Core, Setup, etc.: * FIX: use hostgroups instead of host_groups in Nagios configuration. diff --git a/web/htdocs/actions.py b/web/htdocs/actions.py index 781fcf5..bd34eb4 100644 --- a/web/htdocs/actions.py +++ b/web/htdocs/actions.py @@ -64,13 +64,13 @@ def action_reschedule(): html.live.set_only_sites([site]) row = html.live.query_row( "GET %ss\n" - "WaitObject: %s;%s\n" + "WaitObject: %s\n" "WaitCondition: last_check >= %d\n" "WaitTimeout: %d\n" "WaitTrigger: check\n" "Columns: last_check state plugin_output\n" "Filter: host_name = %s\n%s" - % (what, host, service, now, config.reschedule_timeout * 1000, host, add_filter)) + % (what, spec, now, config.reschedule_timeout * 1000, host, add_filter)) html.live.set_only_sites() last_check = row[0] if last_check < now:

13 years

Check_MK Git: check_mk: Switched version to 1.1.12b1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 114b6b5458e41536cf0ed23ed0f2488f6716ef94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=114b6b5458e415… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:43:12 2011 +0200 Switched version to 1.1.12b1 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 97280 -> 97280 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b54df2e..4f3f9b4 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.11i4 +VERSION = 1.1.12b1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 7eab7fb..5ed3bcc 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.11i4 +echo Version: 1.1.12b1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index ffd46c3..9c1c79b 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.11i4 +echo Version: 1.1.12b1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index df0bded..ca421d0 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.11i4 +echo Version: 1.1.12b1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4d3b39e..b08b1f8 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.11i4 +echo Version: 1.1.12b1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 93e7611..69ced44 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.11i4 +echo Version: 1.1.12b1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 643f97f..c80c73b 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.11i4" +#define CHECK_MK_VERSION "1.1.12b1" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 29b3b8a..d003fe4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 38e36d0..abde0a3 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 665e801..1767909 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.11i4-1_all.deb net optional +check-mk_1.1.12b1-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 8401003..442eeee 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.11i4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.12b1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index dbb0c59..fc22548 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.11i4 +VERSION=1.1.12b1 NAME=check_mk LANG= LC_ALL=

13 years

Check_MK Git: check_mk: Fixex syntax of ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6cba3d4a767cf3fcc47a416c2202673c78500cb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cba3d4a767cf3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:38:01 2011 +0200 Fixex syntax of ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46e674f..ed4d416 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.1.11i4 +1.1.11i4: Core, Setup, etc.: * FIX: use hostgroups instead of host_groups in Nagios configuration. This fixes a problem with Shinken

13 years

Check_MK Git: check_mk: WATO: All hosts in hostlists are preselected now

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f88deb59ca7ad8d63fc4e099a9265731f9a25c87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f88deb59ca7ad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:22:51 2011 +0200 WATO: All hosts in hostlists are preselected now --- web/htdocs/htmllib.py | 10 ---------- web/htdocs/wato.py | 4 +++- web/plugins/views/layouts.py | 10 +++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9de3262..c9cbc4d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -790,13 +790,3 @@ class html: def end_foldable_container(self): self.write("</ul>") - - def init_rowselect(self): - selected = [] - if self.has_var('selected_rows'): - selected_rows = self.var('selected_rows', '') - if selected_rows or ',' in selected_rows: - selected = selected_rows.split(',') - - self.javascript('g_selected_rows = %s;\n' - 'init_rowselect();' % repr(selected)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3eaee89..9815934 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -743,7 +743,9 @@ def mode_file(phase): html.hidden_fields() html.end_form() - html.init_rowselect() + + html.javascript('g_selected_rows = %s;\n' + 'init_rowselect();' % repr(hostnames)) # Create list of all hosts that are select with checkboxes in the current file def get_hostnames_from_checkboxes(): diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index aa3030c..8172b35 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -28,7 +28,15 @@ def init_rowselect(): # Don't make rows selectable when no commands can be fired if not 'C' in html.display_options or not config.may("act"): return - html.init_rowselect() + + selected = [] + if html.has_var('selected_rows'): + selected_rows = html.var('selected_rows', '') + if selected_rows or ',' in selected_rows: + selected = selected_rows.split(',') + + html.javascript('g_selected_rows = %s;\n' + 'init_rowselect();' % repr(selected)) def render_checkbox(view, row, num_tds): # value contains the number of columns of this datarow. This is

13 years

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dad363460df173b3446042b65ab5d4f842ab4b62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad363460df173… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:18:16 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Fixed problem with first log entry in wato changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc379ab5f1a6eb60ea6850ffe0ab9236df03ecb7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc379ab5f1a6eb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 12:18:14 2011 +0200 Fixed problem with first log entry in wato changelog --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a1bd72a..3eaee89 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1745,7 +1745,7 @@ def paged_log(log): break if last_log_index is None: - last_log_index = len(log) - 1 + last_log_index = len(log) return log[first_log_index:last_log_index], (start_time, end_time, previous_log_time, next_log_time)

13 years

Check_MK Git: check_mk: Minor code optimization for WATO titles in Multisite

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f90c0530c07cafc937e9b66086eaf8a26512ef4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f90c0530c07caf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:18:09 2011 +0200 Minor code optimization for WATO titles in Multisite --- web/plugins/views/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 827c13b..21da9bb 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -78,9 +78,9 @@ class FilterWatoFile(Filter): # file titles and so on. # The call below needs to use some sort of indicator wether the cache needs # to be renewed or not. - self.load_wato_data() current = html.var(self.name) if current and current != "/": + self.load_wato_data() return self.path_to_tree.get(current)

13 years

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: 424eb344a691259b478e9a435638d14c8d859863 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424eb344a69125… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 8 12:18:11 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: WATO Changelog paging showing only date

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08afa76d2322c4d87f186a902f4dc1eb52c05a63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08afa76d2322c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 8 11:55:19 2011 +0200 WATO Changelog paging showing only date --- web/htdocs/wato.py | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d44c016..1d9070d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1703,9 +1703,6 @@ def get_timerange(t): end = start + 86399 return start, end -def fmt_datetime(t): - return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) - def fmt_date(t): return time.strftime('%Y-%m-%d', time.localtime(t)) @@ -1751,12 +1748,12 @@ def paged_log(log): def display_paged((start_time, end_time, previous_log_time, next_log_time)): html.write('<div class=paged_controls>') - html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_datetime(start_time), - fmt_datetime(end_time)))) + html.write(' <b>%s</b> ' % (_('%s to %s') % (fmt_date(start_time), + fmt_date(end_time)))) if previous_log_time is not None: html.buttonlink(html.makeuri([('start', previous_log_time)]), _("<"), - title = '%s: %s' % (_("Older events"), fmt_datetime(previous_log_time))) + title = '%s: %s' % (_("Older events"), fmt_date(previous_log_time))) else: html.buttonlink(html.makeuri([]), _("<"), disabled = True) @@ -1765,7 +1762,7 @@ def display_paged((start_time, end_time, previous_log_time, next_log_time)): if next_log_time is not None: html.buttonlink(html.makeuri([('start', next_log_time)]), _(">"), - title = '%s: %s' % (_("Newer events"), fmt_datetime(next_log_time))) + title = '%s: %s' % (_("Newer events"), fmt_date(next_log_time))) else: html.buttonlink(html.makeuri([]), _(">"), disabled = True) html.write('</div>')

13 years

← Newer
1
2
3
4
5
6
7
8
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011