Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: FIX: remove refresh button from dashboard.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f3b4aed4d728f01a8608fe4effb836516011c483 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f3b4aed4d728f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 07:30:57 2012 +0200 FIX: remove refresh button from dashboard. --- ChangeLog | 4 ++++ web/htdocs/views.py | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f9a89f..589bbb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.2.0b5: + Multisite: + * FIX: remove refresh button from dashboard. + 1.2.0b4: Core: * New configuration variable snmp_timing, allowing to diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 4785f85..9fbec92 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1616,9 +1616,11 @@ def show_context_links(thisview, active_filters, show_filters, display_options, else: empty_toggle_button() - if 'R' in display_options and config.may("view_option_refresh"): - choices = [ [x, {0:_("off")}.get(x,str(x)) + (x and "" or "")] for x in config.view_option_refreshes ] - view_option_switcher(thisview, "refresh", choices) + if 'R' in display_options and config.may("view_option_refresh"): + choices = [ [x, {0:_("off")}.get(x,str(x)) + (x and "" or "")] for x in config.view_option_refreshes ] + view_option_switcher(thisview, "refresh", choices) + else: + empty_toggle_button() # WATO: If we have a host context, then show button to WATO, if permissions allow this

12 years, 3 months

Check_MK Git: check_mk: Switch version to 1.2.0b5

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea7fed08bf0f52c4b3679c71f5204d829c990303 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea7fed08bf0f52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 07:31:30 2012 +0200 Switch version to 1.2.0b5 --- 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 102912 -> 102912 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 124978 -> 124978 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 384913f..c51bafe 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0b4 +VERSION = 1.2.0b5 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 cd5184c..fb11ac6 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.2.0b4 +echo Version: 1.2.0b5 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 30c5b2e..9f7722a 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.2.0b4 +echo Version: 1.2.0b5 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 96c4e5b..0a2bba6 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.2.0b4 +echo Version: 1.2.0b5 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e7bb171..c851aad 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.2.0b4 +echo Version: 1.2.0b5 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 5d985c2..0ae2553 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.2.0b4 +echo Version: 1.2.0b5 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c1d4e8a..72f770c 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -73,7 +73,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.0b4" +#define CHECK_MK_VERSION "1.2.0b5" #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 40451bd..a2dcb57 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 ba3a16e..57bb721 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index a602cef..87a13dc 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 39e3d93..3873053 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.0b4" +!define CHECK_MK_VERSION "1.2.0b5" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 5421d91..a19f46d 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0b4-1_all.deb net optional +check-mk_1.2.0b5-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 19b52bf..5054283 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.2.0b4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0b5], [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 ed6cf4d..c908336 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0b4 +VERSION=1.2.0b5 NAME=check_mk LANG= LC_ALL=

12 years, 3 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: 228f07a1fa54f492a0bcdd4739ce6aa16061dfc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=228f07a1fa54f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 21 16:39:18 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Clearing refresh timers during scheduling new timers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03bae2e0abb9a457f0d2db44f295321e6c86f8b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03bae2e0abb9a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 21 16:39:14 2012 +0200 Clearing refresh timers during scheduling new timers --- web/htdocs/js/checkmk.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 7267e72..36392b8 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -659,6 +659,8 @@ function setReload(secs, url) { } function startReloadTimer(url) { + if(gReloadTimer) + clearTimeout(gReloadTimer); gReloadTimer = setTimeout("handleReload('" + url + "')", Math.ceil(parseFloat(gReloadTime) * 1000)); }

12 years, 4 months

Check_MK Git: check_mk: Better handling of invalid parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ad09188c671126765b7741200dddef20188539ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad09188c671126… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 14:18:20 2012 +0200 Better handling of invalid parameters --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 45ee2e2..28e9325 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -584,7 +584,7 @@ class ListOf(ValueSpec): html.write('</td><td class=vlof_content>') self._valuespec.render_input( varprefix + "_" + self._magic, - self._valuespec.canonical_value()) + self._valuespec.default_value()) html.write('</td></tr></table>') # Actual table of currently existing entries @@ -1578,7 +1578,7 @@ class Tuple(ValueSpec): def validate_datatype(self, value, varprefix): if type(value) != tuple: raise MKUserError(varprefix, - _("The datatype must be a tuple, but is %s") % type(value)) + _("The datatype must be a tuple, but is %r") % type(value)) if len(value) != len(self._elements): raise MKUserError(varprefix, _("The number of elements in the tuple must be exactly %d.") % len(self._elements)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 87016d1..713f4f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9431,7 +9431,18 @@ def mode_edit_ruleset(phase): img = 'nmatch' html.write('<img align=absmiddle title="%s" class=icon src="images/icon_rule%s.png"> ' % (title, img)) if rulespec["valuespec"]: - value_html = rulespec["valuespec"].value_to_text(value) + try: + value_html = rulespec["valuespec"].value_to_text(value) + except: + try: + reason = "" + rulespec["valuespec"].validate_datatype(None, value) + except Exception, e: + reason = str(e) + + value_html = '<img src="images/icon_alert.png" class=icon>' \ + + _("The value of this rule is not valid. ") \ + + reason else: img = value and "yes" or "no" title = value and _("This rule results in a positive outcome.") \ @@ -9809,7 +9820,12 @@ def mode_edit_rule(phase): if valuespec: value = rule[0] forms.section() - valuespec.render_input("ve", value) + try: + valuespec.validate_datatype("ve", value) + valuespec.render_input("ve", value) + except: + valuespec.render_input("ve", valuespec.default_value()) + valuespec.set_focus("ve") else: forms.section("")

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: 92fce2c7121d0e3d0cfdb77486a785f9c79877cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92fce2c7121d0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 15:01:10 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fix two bugs in ValueSpec:validate_datatype

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 615ebcd9c87a5428edeb0105e00d47f59463c032 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615ebcd9c87a54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 14:53:53 2012 +0200 Fix two bugs in ValueSpec:validate_datatype --- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 28e9325..3898041 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -634,8 +634,8 @@ class ListOf(ValueSpec): return value def validate_datatype(self, value, varprefix): - if type(self) != list: - raise MKUserError(varprefx, _("The type must be list, but is %s") % type(value)) + if type(value) != list: + raise MKUserError(varprefix, _("The type must be list, but is %r") % type(value)) for n, v in enumerate(value): self._valuespec.validate_datatype(v, varprefix + "_%d" % (n+1)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 713f4f4..a0a2eb0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9436,7 +9436,7 @@ def mode_edit_ruleset(phase): except: try: reason = "" - rulespec["valuespec"].validate_datatype(None, value) + rulespec["valuespec"].validate_datatype(value, "") except Exception, e: reason = str(e) @@ -9821,9 +9821,11 @@ def mode_edit_rule(phase): value = rule[0] forms.section() try: - valuespec.validate_datatype("ve", value) + valuespec.validate_datatype(value, "ve") valuespec.render_input("ve", value) except: + if config.debug: + raise valuespec.render_input("ve", valuespec.default_value()) valuespec.set_focus("ve")

12 years, 4 months

Check_MK Git: check_mk: services: introduce parameters, including WATO rule

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5000f0dad31880562ad50e3d801767f6669c18f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5000f0dad31880… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 21 15:01:06 2012 +0200 services: introduce parameters, including WATO rule --- ChangeLog | 2 + checkman/services | 25 ++++++++- checks/services | 94 ++++++++++++++++++++++++--------- web/plugins/wato/check_parameters.py | 58 ++++++++++++++++++++- 4 files changed, 148 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5000f0dad3…

12 years, 4 months

Check_MK Git: check_mk: Add heading and rename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c33d21e4a3cfdb76d87d40a0900b0b73e869d08b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c33d21e4a3cfdb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:54:22 2012 +0200 Add heading and rename --- agents/plugins/lnx_lvmstat | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lnx_lvmstat b/agents/plugins/lnx_lvmstat index 7e6f5ef..7539353 100755 --- a/agents/plugins/lnx_lvmstat +++ b/agents/plugins/lnx_lvmstat @@ -23,6 +23,8 @@ lvlist = subprocess.Popen(["lvs", "--nosuffix", "-o", "vg_name,lv_name" ], stdout=subprocess.PIPE) +print "<<<lnx_lvmstat>>>" + # with this list from lvm we can now find the dm nodes of the volumes for line in lvlist.stdout.readlines():

12 years, 4 months

Check_MK Git: check_mk: Add heading and rename

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d54dcfb612a0313f01f0991b9922a4f7c972f97c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d54dcfb612a031… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon May 21 12:54:05 2012 +0200 Add heading and rename --- agents/plugins/{lvmstat => lnx_lvmstat} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/lvmstat b/agents/plugins/lnx_lvmstat similarity index 100% rename from agents/plugins/lvmstat rename to agents/plugins/lnx_lvmstat

12 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012