Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 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: 2e655b6b30dd64413d333bca378dcdbd0b7439b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e655b6b30dd64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 18:07:14 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: WATO: convert timeperiod configuration to ValueSpec

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: af58098f868ceaa2eb124a4a8d441c4edf5260ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af58098f868cea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 18:07:12 2012 +0200 WATO: convert timeperiod configuration to ValueSpec --- web/htdocs/valuespec.py | 127 +++++++++++++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 116 +++++++++++++++++++++++++------------------ 2 files changed, 195 insertions(+), 48 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=af58098f86…

12 years, 2 months

Check_MK Git: check_mk: Increased version

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0ec23956a8701ac2005189c002a9871c3f1d558 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0ec23956a8701… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 15:50:37 2012 +0200 Increased version --- ChangeLog | 2 ++ 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 124977 -> 124978 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 15 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b55b74b..61d4db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.0b4: + 1.2.0b3: Core: * FIX: fixed SNMP info declaration in checks: could be garbled diff --git a/Makefile b/Makefile index b6a9903..384913f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0b3 +VERSION = 1.2.0b4 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 ba89399..341d76a 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.0b3 +echo Version: 1.2.0b4 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 0bfd8b2..30c5b2e 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.0b3 +echo Version: 1.2.0b4 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index f5850d8..570f2ea 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.0b3 +echo Version: 1.2.0b4 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 22d7ced..e7bb171 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.0b3 +echo Version: 1.2.0b4 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 8a6c9ba..78c0ba2 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.0b3 +echo Version: 1.2.0b4 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 43ca8c8..c1d4e8a 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.0b3" +#define CHECK_MK_VERSION "1.2.0b4" #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 b8981f7..40451bd 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 96628ba..ba3a16e 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 978c409..a602cef 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 3dab646..39e3d93 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.0b3" +!define CHECK_MK_VERSION "1.2.0b4" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 7614cfe..5421d91 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0b3-1_all.deb net optional +check-mk_1.2.0b4-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 5786253..19b52bf 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.0b3], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0b4], [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 093b061..ed6cf4d 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0b3 +VERSION=1.2.0b4 NAME=check_mk LANG= LC_ALL=

12 years, 2 months

Check_MK Git: check_mk: FIX: create sample config only if both rules. mk and hosttags.mk are missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86b55f02077d5dac842d7063a8e70e777e4af516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86b55f02077d5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:41:19 2012 +0200 FIX: create sample config only if both rules.mk and hosttags.mk are missing --- ChangeLog | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4f3e94..1104226 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO + * FIX: create sample config only if both rules.mk and hosttags.mk are missing 1.2.0b2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 56e48bf..9478f56 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10375,7 +10375,7 @@ def page_user_profile(): # or rules have been defined *ever*. def create_sample_config(): if os.path.exists(multisite_dir + "hosttags.mk") \ - or os.path.exists(multisite_dir + "rules.mk"): + or os.path.exists(root_dir + "rules.mk"): return # Example values for host tags

12 years, 2 months

Check_MK Git: check_mk: WATO: fix loading of host tags if hosttags. mk is missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01f24019b92bafce9e7fe8a8d914f54a99e5d3fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01f24019b92baf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:42:32 2012 +0200 WATO: fix loading of host tags if hosttags.mk is missing --- 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 9478f56..4d8676f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8718,7 +8718,7 @@ def mode_edit_hosttag(phase): def load_hosttags(): filename = multisite_dir + "hosttags.mk" if not os.path.exists(filename): - return [] + return [], [] try: vars = { "wato_host_tags" : [],

12 years, 2 months

Check_MK Git: check_mk: WATO: do not loose host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 69872191cbb10d71b91aac482571096c8e6a2cdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69872191cbb10d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:52:20 2012 +0200 WATO: do not loose host tags When both using manual and WATO defined tags --- ChangeLog | 2 ++ web/htdocs/wato.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1104226..b55b74b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO * FIX: create sample config only if both rules.mk and hosttags.mk are missing + * FIX: do not loose host tags when both using WATO-configured and + manual ones (via multisite.mk) 1.2.0b2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4d8676f..0c0ad5e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8608,7 +8608,8 @@ def mode_edit_hosttag(phase): taggroup = tag_id, title, new_choices hosttags.append(taggroup) save_hosttags(hosttags, auxtags) - config.wato_host_tags = hosttags + # Make sure, that all tags are active (also manual ones from main.mk) + config.load_config() declare_host_tag_attributes() rewrite_config_files_below(g_root_folder) # explicit host tags in all_hosts log_pending(SYNCRESTART, None, "edit-hosttags", _("Created new host tag group '%s'") % tag_id) @@ -8654,7 +8655,7 @@ def mode_edit_hosttag(phase): message = rename_host_tags_after_confirmation(tag_id, operations) if message: save_hosttags(new_hosttags, auxtags) - config.wato_host_tags = new_hosttags + config.load_config() declare_host_tag_attributes() rewrite_config_files_below(g_root_folder) # explicit host tags in all_hosts log_pending(SYNCRESTART, None, "edit-hosttags", _("Edited host tag group %s (%s)") % (message, tag_id))

12 years, 2 months

Check_MK Git: check_mk: Better styling of filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7951799352080deee9779d9465bc123d210719d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7951799352080… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:30:35 2012 +0200 Better styling of filters --- web/htdocs/views.css | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 1113250..3dcd248 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -158,8 +158,8 @@ table.navi div.whiteborder table.form { div.floatfilter { margin: 0px 3px 3px 0px; - width: 320px; - height: 51px; + width: 325px; + height: 53px; /* display: inline-block; */ float: left; border: 1px solid #458; @@ -167,29 +167,31 @@ div.floatfilter { background-image: url("images/form_background.png"); background-repeat: repeat; -moz-border-radius: 5px; + border-radius: 5px; } div.floatfilter.double { - height: 106px; + height: 111px; } div.floatfilter input[type=text] { - width: 307px; + width: 311px; } div.floatfilter .legend { color: white; margin-bottom: 1px; - width: 310px; + width: 315px; height: 20px; background-image: url("images/form_background.png"); background-repeat: repeat; padding: 3px 5px 0px 5px; -moz-border-radius: 5px 5px 0px 0px; + border-radius: 5px 5px 0px 0px; } div.floatfilter .content { - width: 316px; + width: 321px; height: 23px; margin-top: 0px; margin-left: 0px;

12 years, 2 months

Check_MK Git: check_mk: Cosmetic cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07bd1dd40303182f865f8fadbf0e9fdb7e9976c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07bd1dd4030318… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:30:24 2012 +0200 Cosmetic cleanup --- checks/check_http | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/check_http b/checks/check_http index 9a6a439..4444a04 100644 --- a/checks/check_http +++ b/checks/check_http @@ -63,6 +63,7 @@ def check_http_arguments(params): if "auth" in settings: auth = settings["auth"] args += ' -a %s:%s' % (quote_shell_string(auth[0]), quote_shell_string(auth[1])) + if "proxy_auth" in settings: auth = settings["auth"] args += ' -b %s:%s' % (quote_shell_string(auth[0]), quote_shell_string(auth[1])) @@ -100,7 +101,7 @@ def check_http_arguments(params): active_check_info['http'] = { "command_line" : '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$', "argument_function" : check_http_arguments, - "service_description" : lambda args: "HTTP %s" % args[0], + "service_description" : lambda params: "HTTP %s" % params[0], "has_perfdata" : True, }

12 years, 2 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: 347ada3b7007ae9e6b51c7528eb402d297d270d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=347ada3b7007ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 2 14:30:46 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 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: 868d84ba04f36b140a7ea632af3c6e698379a6d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=868d84ba04f36b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 2 12:25:36 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012