Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: FIX: comments_with_info in service table was always empty

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7402e1c176c615075f6ec30e9bf63428ded5b50a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7402e1c176c615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 10:08:33 2012 +0200 FIX: comments_with_info in service table was always empty --- ChangeLog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2152120..ba688a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ * FIX: It is now possible to create clusters in empty folders * FIX: Fixed problem with complaining empty ListOf() valuespecs + Livestatus + * FIX: comments_with_info in service table was always empty + 1.2.1i1: Core: * Allow to add options to rules. Currently the options "disabled" and

12 years, 2 months

Check_MK Git: check_mk: Updated version number

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a833aa8fbfc2757291fd079e0a6a0c97a229710b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a833aa8fbfc275… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 27 10:08:39 2012 +0200 Updated version number --- .bugs/737 | 7 +++++-- 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.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 127803 -> 127803 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 20 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.bugs/737 b/.bugs/737 index 01c6a8c..e901b9e 100644 --- a/.bugs/737 +++ b/.bugs/737 @@ -1,11 +1,14 @@ Title: Get Services, comments with info always empty Component: livestatus -State: open +Class: bug +State: done Date: 2012-08-08 12:00:25 Targetversion: future -Class: bug GET servicesbyhostgroup\nColumns: host_name comments_with_info\n ony retruns hostname, the comments with info are always empty. Refernce in Ticket System: #608092 + +2012-09-27 10:07:41: changed state open -> done +Has been fixed by ab. diff --git a/Makefile b/Makefile index 3ba36cb..91c2871 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.1i1 +VERSION = 1.2.0p3 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 1856fde..4c1e96f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -40,7 +40,7 @@ LOCALDIR=$MK_LIBDIR/local export LC_NUMERIC="en_US" echo '<<<check_mk>>>' -echo Version: 1.2.1i1 +echo Version: 1.2.0p3 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 1b28acd..3dc4198 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.1i1 +echo Version: 1.2.0p3 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 863698f..2a3ca9b 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.1i1 +echo Version: 1.2.0p3 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 96578be..069680a 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.1i1 +echo Version: 1.2.0p3 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 1b9b8c0..a943469 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -34,7 +34,7 @@ export MK_LIBDIR="/to/be/changed" export MK_CONFDIR="/to/be/changed" echo '<<<check_mk>>>' -echo Version: 1.2.1i1 +echo Version: 1.2.0p3 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 25d6f4c..6512444 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i1 +echo Version: 1.2.0p3 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 8130284..3619bf6 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.1i1 +echo Version: 1.2.0p3 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index c61e175..8217395 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.1i1" +$say "Version: 1.2.0p3" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 2a0bce9..961e785 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -41,7 +41,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.2.1i1 +echo Version: 1.2.0p3 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 64d32da..7e20554 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.1i1" +#define CHECK_MK_VERSION "1.2.0p3" #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 983771b..32ecaa3 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 d563c00..dd048ae 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 f0deecf..de0ab57 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 91a654f..16d3021 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.1i1" +!define CHECK_MK_VERSION "1.2.0p3" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 6300f78..cd51974 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index 9cbf72f..96a7de8 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.1i1-1_all.deb net optional +check-mk_1.2.0p3-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index e78cd09..f560801 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.1i1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0p3], [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 4a530d1..58c1aca 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.1i1 +VERSION=1.2.0p3 NAME=check_mk LANG= LC_ALL=

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: 4db79ac7f9579160214207c75c3fe9783831251c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4db79ac7f95791… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 26 19:36:55 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fix typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f5ce1496be521312404e6814af711117dcb7885f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5ce1496be5213… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 26 18:10:09 2012 +0200 Fix typo --- 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 2fdc5f1..dba1728 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3319,7 +3319,7 @@ def mode_changelog(phase): table += '</table>' c = wato_confirm(_("Confirm activating foreign changes"), '<img class=foreignchanges src="images/icon_foreign_changes.png">' + - _("There are some changes made by you collegues that you will " + _("There are some changes made by your collegues that you will " "activate if you proceed:") + table + _("Do you really want to proceed?")) if c == False:

12 years, 2 months

Check_MK Git: check_mk: reformatted code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9f4ce16e3b7353701561e66203fd2389f86c677c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f4ce16e3b7353… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 26 16:47:39 2012 +0200 reformatted code --- livestatus/src/DownCommColumn.cc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index c77189b..00557ce 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -33,9 +33,7 @@ void DownCommColumn::output(void *data, Query *query) { TableDownComm *table = _is_downtime ? g_table_downtimes : g_table_comments; query->outputBeginList(); - data = shiftPointer(data); // points to host or service - if (data) { bool first = true; @@ -51,11 +49,11 @@ void DownCommColumn::output(void *data, Query *query) found_match = false; if ( dt->_service == 0){ if (dt->_host->name == ((host_struct*)data)->name) - found_match = true; + found_match = true; } else if ( dt->_service->description == ((service_struct*)data)->description && dt->_service->host_name == ((service_struct*)data)->host_name ) - found_match = true; + found_match = true; if (found_match) {

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: 687b07f57dfc282dd37e42e016810e322afd1ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=687b07f57dfc28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 16:57:47 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: livestatus: Bugfix: do not omit first it_entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96dd31f8c093bd7dce54583f56170b7ffd0f3d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96dd31f8c093bd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 26 16:41:39 2012 +0200 livestatus: Bugfix: do not omit first it_entry --- livestatus/src/DownCommColumn.cc | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index 13fe68e..c77189b 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -33,10 +33,13 @@ void DownCommColumn::output(void *data, Query *query) { TableDownComm *table = _is_downtime ? g_table_downtimes : g_table_comments; query->outputBeginList(); + data = shiftPointer(data); // points to host or service + if (data) { bool first = true; + bool found_match = false; for (map<unsigned long, DowntimeOrComment *>::iterator it = table->entriesIteratorBegin(); it != table->entriesIteratorEnd(); @@ -44,8 +47,17 @@ void DownCommColumn::output(void *data, Query *query) { unsigned long id = it->first; DowntimeOrComment *dt = it->second; - if ((void *)dt->_service == data || - (dt->_service == 0 && dt->_host == data)) + + found_match = false; + if ( dt->_service == 0){ + if (dt->_host->name == ((host_struct*)data)->name) + found_match = true; + } + else + if ( dt->_service->description == ((service_struct*)data)->description && dt->_service->host_name == ((service_struct*)data)->host_name ) + found_match = true; + + if (found_match) { if (first) first = false;

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: 492fffa92122b25b0d4f05aed3eb13bd6d1d27e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=492fffa92122b2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 26 15:32:26 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Added new setting to logwatch to change service output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfccb0ecf035425fedd039f80692886858a54bef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfccb0ecf03542… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Sep 26 15:32:13 2012 +0200 Added new setting to logwatch to change service output --- checkman/logwatch | 4 ++++ checks/logwatch | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checkman/logwatch b/checkman/logwatch index 066da97..da4d90c 100644 --- a/checkman/logwatch +++ b/checkman/logwatch @@ -86,3 +86,7 @@ logwatch_dir (string): Directory where log messages are For each host a subdirectory is created. The name of the files therein are the names of the logfiles with slashes replaced by backslashes. + +logwatch_service_output (string): Change the output of the service to ony + print stats and not the last error message. Default is {default}, use {small} if + you only want to have the stats. diff --git a/checks/logwatch b/checks/logwatch index c98b65d..cf798b2 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -30,9 +30,10 @@ logwatch_dir = var_dir + '/logwatch' logwatch_patterns = { } logwatch_rules = [] logwatch_max_filesize = 500000 # do not save more than 500k of message (configurable) +logwatch_service_output = "default" # Variables embedded in precompiled checks -check_config_variables += [ "logwatch_dir", "logwatch_max_filesize" ] +check_config_variables += [ "logwatch_dir", "logwatch_max_filesize", "logwatch_service_output" ] def inventory_logwatch(info): inventory = [] @@ -348,9 +349,11 @@ def check_logwatch(item, params, info): count_txt = [] for level, num in state_counts.iteritems(): count_txt.append('%d %s' % (num, logwatch_level_name(level))) - - return (worst, state + " - %s messages (Last worst: \"%s\")" % + if logwatch_service_output == 'default': + return (worst, state + " - %s messages (Last worst: \"%s\")" % (', '.join(count_txt), last_worst_line)) + else: + return (worst, state + " - %s messages" % ', '.join(count_txt)) check_info['logwatch'] = {

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: 203b1d55c7fae146bb8a9283f2175970aa313e64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203b1d55c7fae1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 25 15:58:24 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012