Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Updated bug entries #0767

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 524f79158dd1fb4fa597df04834e73c77a15d706 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=524f79158dd1fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 16:03:45 2012 +0200 Updated bug entries #0767 --- .bugs/767 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/767 b/.bugs/767 new file mode 100644 index 0000000..5041025 --- /dev/null +++ b/.bugs/767 @@ -0,0 +1,11 @@ +Title: Remove all downtimes does not work +Component: multisite +State: open +Date: 2012-06-08 16:02:53 +Targetversion: 1.2.0 +Class: bug + +The button "Remove all downtimes" in the host/services +commands dialog is not yet implemented. One can remove +downtimes in the downtimes table - but nicer would be +to do it here - or remove the button.

12 years, 3 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41004fc56b69fa772f40ca93f998a68c91458ea2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41004fc56b69fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 16:02:01 2012 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 3efc617..e791c50 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -767 +787

12 years, 3 months

Check_MK Git: check_mk: Fix small layout issue in PNP inline graphs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d61bc97db7925ee2101f449a4900483596ed0c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d61bc97db7925… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 16:01:44 2012 +0200 Fix small layout issue in PNP inline graphs --- web/htdocs/status.css | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 6d7fc82..2b79b87 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -328,8 +328,6 @@ table.data div.objectlist div { table.data tr.data td.pnpgraph { padding: 0; - border-bottom: 1px solid #666; - border-right: 1px solid #666; } tr.data td.pnpgraph img {

12 years, 3 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: 28b3ffd73f20b23c630a27100ded302c6f972382 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28b3ffd73f20b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 16:00:42 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Switched version to 1.2.0p2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 04ab7f5308e5fee47ba347ad091c1fc42c241e53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04ab7f5308e5fe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 16:00:40 2012 +0200 Switched version to 1.2.0p2 --- 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.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 -> 124976 bytes agents/windows/installer.nsi | 2 +- debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 47eb0b5..f5990f5 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.0p1 +VERSION = 1.2.0p2 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 7a61677..8056005 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 14ae440..4353320 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index e6a81ca..4b0b9a3 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cb06a3f..871ca50 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 58dabdd..fb81d57 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 0402214..3a1a6d4 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.0p1 +echo Version: 1.2.0p2 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5ba203c..bbe261e 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.0p1" +#define CHECK_MK_VERSION "1.2.0p2" #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 e91f830..3a70cbb 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 ad729a3..64c211e 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 28bb720..181e62c 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 6d54162..151f440 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.0p1" +!define CHECK_MK_VERSION "1.2.0p2" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/debian/files b/debian/files index 702250b..8d156a4 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.0p1-1_all.deb net optional +check-mk_1.2.0p2-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index d13e8fc..17ed5e7 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.0p1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.0p2], [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 131b9d6..cc94c4f 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.0p1 +VERSION=1.2.0p2 NAME=check_mk LANG= LC_ALL=

12 years, 3 months

Check_MK Git: check_mk: Updated diskstat manual page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86f11603d0471cb1ec6a7da4a243de81baa8b35e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86f11603d0471c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 8 14:31:23 2012 +0200 Updated diskstat manual page --- checkman/diskstat | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/checkman/diskstat b/checkman/diskstat index 9bdac73..629411a 100644 --- a/checkman/diskstat +++ b/checkman/diskstat @@ -14,6 +14,9 @@ description: summarized but with a separate check for read and write (this is how this check worked up to version 1.1.10). + The check also gives info on the IO latency and IOPS (unmerged) aquired + from the kernels information in /proc. + You can apply separate warning and critical levels for the read and write throughput. Optionally you can have the check compute average values on a configurable time period and have the levels @@ -21,10 +24,20 @@ description: it possible to ignore short "peaks" and only trigger and longer phases of high disk activity. + Averaging is not applied to IO latency calculations. + + The check has to provide many ways of configuration for legacy reasons. + We strongly recommend you switch to the rule-based configuration, which + handles anything you want it to. + item: - Either {"SUMMARY"} for a summarized check of alls disks or the - name of the disk device, e.g. {"sda"}. In order to support configurations + Either {"SUMMARY"} for a summarized check of all disks or the + name of the disk device, e.g. {"sda"}. Additionally also one service + per logical volume defined in Linux LVM and Veritas VxVM on Linux. + + In order to support configurations up to version 1.1.10 also the items {"read"} and {"write"} are supported. + examples: # switch inventory behaviour to 1.1.10 mode @@ -51,11 +64,30 @@ examples: ( {"write" : (20, 50), "average" : 10 }, [ "oracle" ], ALL_HOSTS, [ "Disk IO" ]) ] + # New way: + + # Enable and configure the inventory behaviour based with rule-based settings + diskstat_inventory_mode = "rule" + diskstat_inventory += [ + ( ['summary', 'lvm', 'vxvm'], [], ALL_HOSTS ), + ] + + # Then configure levels for 50/90MB/s read IO over 10 Minutes and a bit less for + # writes. Next put levels on IO latency exceeding 80ms / 160ms. + checkgroup_parameters['disk_io'] += [ + ( {'read': (50.0, 90.0), 'write': (40.0, 60.0), 'average': 10, 'latency_perfdata': True, 'latency': (80.0, 160.0)}, [], ALL_HOSTS, ALL_SERVICES ), + ] + + + + perfdata: The disk throughput for read and write in bytes per second. If averaging is turned on, then two additional values are sent: the averaged read and write throughput. + The IO latency is returned if {"latency_perfdata"} is set to True + In the legacy mode only one variable: the throughput since the last check in in bytes(!) per second, either for read or for write. @@ -89,7 +121,22 @@ diskstat_defaul_levels(dict): The default parameter used for inventorized That means that no averaging is done and no levels are applied. -diskstat_inventory_mode(string): Either {"single"} for one service per disk +diskstat_inventory_mode(string): By default this is now set to {"rule"} for + fine-grained configuration of blockdevices to monitor. + The actual rule is defined in {"diststat_inventory"}. + + The following older style parameters are also still available and mapped + to rules internally. Either {"single"} for one service per disk or {"summary"} for the throughput of all disks summed up in one service. Also possible is {"legacy"} for the old style mode (see above). Default is {"single"}. + + +diskstat_inventory(list): This is a list of block device types to track. + Possible values are {"summary"}, which creates a summary item showing the IO + rate of all disks, but not other block devices. + If you want statistics for every single disk, you can use {"phyiscal"}. + Enabling {"lvm"} will generate one item for each LVM volume, including snapshot + volumes. + Enabling {"vxvm"} will generate one item for each volume managed by VxVM, + including layered volumes.

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: c786dc18b79616a198bcd1815d7a3058e34c70ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c786dc18b79616… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 8 14:31:56 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Minor code cleanup in Livestatus

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 981ee3f821dae85a3d0fd91c05e8640824785388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=981ee3f821dae8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 13:16:23 2012 +0200 Minor code cleanup in Livestatus --- livestatus/src/LogEntry.cc | 2 +- livestatus/src/Logfile.cc | 14 +++++++------- livestatus/src/TableHosts.cc | 4 ++-- livestatus/src/TableLog.cc | 25 ++++--------------------- 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 168f410..4fbc92c 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -257,7 +257,7 @@ int LogEntry::serviceStateToInt(char *s) if (*last == ')') last--; - // WARN, CRIT, OK, UNKNOWN, RECOVERY + // WARN, CRITICAL, OK, UNKNOWN, RECOVERY switch (*last) { case 'K': return 0; case 'Y': return 0; diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index b420e26..9d25212 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -34,13 +34,13 @@ extern int num_cached_log_messages; extern int g_debug_level; - Logfile::Logfile(const char *path, bool watch) - : _path(strdup(path)) - , _since(0) - , _watch(watch) - , _inode(0) - , _lineno(0) - , _logclasses_read(0) +Logfile::Logfile(const char *path, bool watch) + : _path(strdup(path)) + , _since(0) + , _watch(watch) + , _inode(0) + , _lineno(0) + , _logclasses_read(0) { int fd = open(path, O_RDONLY); if (fd < 0) { diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 525fd61..c10440a 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -63,8 +63,8 @@ bool TableHosts::isAuthorized(contact *ctc, void *data) } - TableHosts::TableHosts(bool by_group) -: _by_group(by_group) +TableHosts::TableHosts(bool by_group) + : _by_group(by_group) { struct hostbygroup ref; addColumns(this, "", -1); diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index 36851d6..b372bc0 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -68,10 +68,10 @@ void debug(const char *loginfo, ...) } - TableLog::TableLog(unsigned long max_cached_messages) - : _num_cached_messages(0) - , _max_cached_messages(max_cached_messages) - , _num_at_last_check(0) +TableLog::TableLog(unsigned long max_cached_messages) + : _num_cached_messages(0) + , _max_cached_messages(max_cached_messages) + , _num_at_last_check(0) { pthread_mutex_init(&_lock, 0); @@ -188,23 +188,6 @@ void TableLog::answerQuery(Query *query) to change this and start with the newest. That way, the Limit: header produces more reasonable results. */ - /* OLD CODE - OLDEST FIRST - _logfiles_t::iterator it; - if (since == 0) - it = _logfiles.begin(); - else { // find oldest relevant logfile - it = _logfiles.end(); - while (it != _logfiles.begin() && - (it == _logfiles.end() || it->first >= since)) - --it; - } - while (it != _logfiles.end()) { - Logfile *log = it->second; - if (!log->answerQuery(query, this, since, until, classmask)) - break; // end of time range in this logfile - ++it; - } */ - /* NEW CODE - NEWEST FIRST */ _logfiles_t::iterator it; it = _logfiles.end(); // it now points beyond last log file

12 years, 3 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: 7c827d3be3f7c83eb72afe067ae36aee5459119e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c827d3be3f7c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 10:48:16 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Add better default value for agent port

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bfa5569477ae4728f39afe8290e7228c17988c07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa5569477ae47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 10:48:12 2012 +0200 Add better default value for agent port --- web/plugins/wato/check_mk_configuration.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6fe5805..d81da35 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -981,11 +981,14 @@ group = "agent/Check_MK Agent" register_rule(group, "agent_ports", - Integer(title = _("TCP port for connection to Check_MK agent"), + Integer( help = _("This variable allows to specify the TCP port to " "be used to connect to the agent on a per-host-basis. "), minvalue = 1, - maxvalue = 65535)) + maxvalue = 65535, + default_value = 6556), + title = _("TCP port for connection to Check_MK agent") +)

12 years, 3 months

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012