Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 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: 955dd01a85a28efafa072b82834544c26e602cb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=955dd01a85a28e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:08:21 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d295f6f3b7e2c111d5ac1da7c69402a471f2dbf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d295f6f3b7e2c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:08:19 2011 +0100 Updated bug entries --- .bugs/128 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/.bugs/128 b/.bugs/128 index c955f96..e093fa5 100644 --- a/.bugs/128 +++ b/.bugs/128 @@ -6,4 +6,6 @@ Cost: 4 Date: 2011-02-10 09:45:24 Class: bug -After changing the trend_range to a larger time the check reports a peak value which is wrong. It might be needed to detect such a change and reset the values. +After changing the trend_range to a larger time the check reports a peak +value which is wrong. It might be needed to detect such a change and reset +the values.

13 years, 4 months

Check_MK Git: check_mk: Minor code formating

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1fa0c7897ca022f2d24b37379807d396421d28b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fa0c7897ca022… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:57:37 2011 +0100 Minor code formating --- web/htdocs/js/hover.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/hover.js b/web/htdocs/js/hover.js index 609619d..6ae87ce 100644 --- a/web/htdocs/js/hover.js +++ b/web/htdocs/js/hover.js @@ -78,8 +78,8 @@ function hoverShow(x, y, code) { _hoverMenu = document.createElement('div'); _hoverMenu.style.position = 'absolute'; _hoverMenu.style.width = 'auto'; - document.body.appendChild(_hoverMenu); - } + document.body.appendChild(_hoverMenu); + } _hoverMenu.innerHTML = code; // Change cursor to "hand" when displaying hover menu

13 years, 4 months

Check_MK Git: check_mk: Fixed growth in df trend graphs

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c47068c656fa2e4b1ca5cfcdfe95bd1f88c0bcec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c47068c656fa2e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:32:27 2011 +0100 Fixed growth in df trend graphs --- pnp-rraconf/check_mk-df.rra.cfg | 2 +- pnp-templates/check_mk-df.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pnp-rraconf/check_mk-df.rra.cfg b/pnp-rraconf/check_mk-df.rra.cfg index f701388..74019b8 120000 --- a/pnp-rraconf/check_mk-df.rra.cfg +++ b/pnp-rraconf/check_mk-df.rra.cfg @@ -1 +1 @@ -avg-max.rra.cfg \ No newline at end of file +avg-max-min.rra.cfg \ No newline at end of file diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 4c44a97..c28e4ac 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -66,10 +66,11 @@ if (isset($DS[2])) { $range = sprintf("%.1fh", $hours); $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 --title '$hostname: Trend for $fstitle' "; - $def[2] = "DEF:growth=$RRDFILE[2]:$DS[2]:AVERAGE "; + $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; + $def[2] .= "DEF:growth_min=$RRDFILE[2]:$DS[2]:MIN "; $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; - $def[2] .= "CDEF:growth_pos=growth,0,MAX "; - $def[2] .= "CDEF:growth_neg=growth,0,MIN "; + $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; + $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" ";

13 years, 4 months

Check_MK Git: check_mk: Perfometer shows no bandwidth given when there is no bandwidth

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e903baa64a4e0e99ee27eb04cbaa78c953934273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e903baa64a4e0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:16:17 2011 +0100 Perfometer shows no bandwidth given when there is no bandwidth --- web/plugins/perfometer/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index c14877c..75dc7f2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -198,7 +198,7 @@ def performeter_check_mk_if(row, check_command, perf_data): if bw > 0.0: rrate = bytes / bw else: - rrate = 0 + return 'No bandwidth given', '<table></table>' drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate

13 years, 4 months

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: a5d6a7f4e15eeaed626e0cb713c512a7bdc74282 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5d6a7f4e15eea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:02:24 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Catching exceptions caused by unset bandwidth in interface perfometer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bbc542fa8c237a8558346d62457bee12ddbc143c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc542fa8c237a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:01:55 2011 +0100 Catching exceptions caused by unset bandwidth in interface perfometer --- ChangeLog | 1 + web/htdocs/lib.py | 6 ++++++ web/plugins/perfometer/check_mk.py | 9 ++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38a100e..6bfaee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * FIX: PNP timerange painter option field takes selected value as default now * FIX: Fixed perfometer styling in single dataset layouts * FIX: Tooltips work in group headers now + * FIX: Catching exceptions caused by unset bandwidth in interface perfometer WATO: * FIX: fix problem with vanishing services on Windows. Affected were services diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e50e883..a085a2d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -87,3 +87,9 @@ def create_user_file(path, mode): def write_settings_file(path, content): create_user_file(path, "w").write(pprint.pformat(content) + "\n") + +def savefloat(f): + try: + return float(f) + except: + return 0.0 diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 28deb9c..ee5b8a2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -193,9 +193,12 @@ def performeter_check_mk_if(row, check_command, perf_data): for name, perf, color in [ ("in", perf_data[0], "#0e6"), ("out", perf_data[5], "#2af") ]: - bytes = float(perf[1]) - bw = float(perf[6]) - rrate = bytes / bw + bytes = savefloat(perf[1]) + bw = savefloat(perf[6]) + if bw > 0.0: + rrate = bytes / bw + else: + rrate = 0 drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate

13 years, 4 months

Check_MK Git: check_mk: Set version to 1.1.10b1

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 63e4334d05a798d17e742661291c7cae65e9fd5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63e4334d05a798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:53:51 2011 +0100 Set version to 1.1.10b1 --- 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 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index db5b658..574c130 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i10 +VERSION = 1.1.10b1 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 68a39e7..3c99c4d 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b5a508e..934a123 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 6dd58a6..89905d9 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 9e252d7..e07c7e2 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.9i10 +echo Version: 1.1.10b1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 13cb99a..cf46bd3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i10 +echo Version: 1.1.10b1 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7e4c38e..b7a76a4 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.9i10" +#define CHECK_MK_VERSION "1.1.10b1" #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 a1d825d..81a3c6a 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 8f291c5..73382a1 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index e297c0c..eff7ca6 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.9i10], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.10b1], [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/install_nagios.sh b/scripts/install_nagios.sh index 73ecbb5..c6df59b 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.3 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.4 -CHECK_MK_VERSION=1.1.9i10 +CHECK_MK_VERSION=1.1.10b1 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 35b5379..e9b7b89 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i10 +VERSION=1.1.10b1 NAME=check_mk LANG= LC_ALL=

13 years, 4 months

Check_MK Git: check_mk: Added perf-o-meter for h3c_lanswitch_cpu

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d52c3ade2babf64c02b1c6115ac24a810e5cf901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d52c3ade2babf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:51:23 2011 +0100 Added perf-o-meter for h3c_lanswitch_cpu --- README.writing_checks | 4 +++- web/plugins/perfometer/check_mk.py | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 0e22d34..21771b0 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -134,7 +134,9 @@ Performance data: graph in its current (and maybe future) forms. Those are in pnp-rraconf. Use a symlink here. -* pnp rra configuration +* Each check that outputs performance data should have a perf-o-meter. + For checks part of Check_MK this must be done in web/plugins/perfometer/check_mk.py. + For third party checks this should be done in a separate file in web/plugins/perfometer. SNMP based checks: * Only use numeric OIDs in your checks. Name based OIDs rely on MIB files diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 28deb9c..8f6e0cd 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -241,3 +241,18 @@ def perfometer_oracle_sessions(row, check_command, perf_data): perfometers["check_mk-oracle_sessions"] = perfometer_oracle_sessions perfometers["check_mk-oracle_logswitches"] = perfometer_oracle_sessions +def perfometer_h3c_lanswitch_cpu(row, check_command, perf_data): + util = float(perf_data[0][1]) # is already percentage + warn = float(perf_data[0][3]) + crit = float(perf_data[0][4]) + if util < warn: + color = "#6f2" + elif util < crit: + color = "#9f2" + else: + color = "#cf2" + + return "%.0f%%" % util, perfometer_linear(util, color) + +#perfometer_linear(perc, color) +perfometers["check_mk-h3c_lanswitch_cpu"] = perfometer_h3c_lanswitch_cpu

13 years, 4 months

Check_MK Git: check_mk: Added perf-o-meter for h3c_lanswitch_cpu

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d83f6081d2676961c4c004f11e57693b2816758 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d83f6081d2676… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 15:51:51 2011 +0100 Added perf-o-meter for h3c_lanswitch_cpu --- README.writing_checks | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.writing_checks b/README.writing_checks index 21771b0..b473704 100644 --- a/README.writing_checks +++ b/README.writing_checks @@ -59,8 +59,9 @@ Coding style must return None as parameter and the check function must name the parameter argument _no_params. -* The name of the inventory and check function must be prefixed with the name of the check type, for example inventory_h3c_lanswitch_cpu - for 'h3c_lanswitch' +* The name of the inventory and check function must be + prefixed with the name of the check type, for example + inventory_h3c_lanswitch_cpu for 'h3c_lanswitch' * Order of implementation:

13 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011