Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Fix timeperiod definitions created by Check_MK

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cb2d14e65882bef3158c89411975901dcd6f09f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb2d14e65882be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 19 10:30:10 2011 +0100 Fix timeperiod definitions created by Check_MK --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2e3a451..1b8e426 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1840,7 +1840,7 @@ def create_nagios_config_timeperiods(outfile): outfile.write(" alias\t\t\t\t%s\n" % tp["alias"].encode("utf-8")) for key, value in tp.items(): if key != "alias": - times = ", ".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) + times = ",".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) if times: outfile.write(" %-20s\t\t%s\n" % (key, times)) outfile.write("}\n\n")

12 years, 9 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: c89079ba130bf3bb7dd5342fdcba04b1311cc59b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c89079ba130bf3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 17:42:26 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: ADD Wato: New varspec for age

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8cda2c3695b92a3d4fd4a7aa01f9fe73c0ccece URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8cda2c3695b92… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 16 17:41:16 2011 +0100 ADD Wato: New varspec for age --- web/htdocs/wato.py | 37 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 31 ++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8c50e3b..d86b6ac 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4263,8 +4263,45 @@ class FixedValue(ValueSpec): def validate_value(self, value, varprefix): self.validate_datatype(value, varprefix) + +# Time in seconds +class Age(ValueSpec): + def __init__(self, **kwargs): + ValueSpec.__init__(self, **kwargs) + self._label = kwargs.get("label") + + def canonical_value(self): + return 0 + + def render_input(self, varprefix, value): + days, rest = divmod(value, 60*60*24) + hours, rest = divmod(rest, 60*60) + minutes, seconds = divmod(rest, 60) + html.write("<div>") + html.number_input(varprefix+'_days', days, 2) + html.write(_("days")) + html.number_input(varprefix+'_hour', hours, 2) + html.write(_("hours")) + html.number_input(varprefix+'_minutes', minutes, 2) + html.write(_("min")) + html.number_input(varprefix+'_seconds', seconds, 2) + html.write(_("sec")) + html.write("</div>") + def from_html_vars(self, varprefix): + return (saveint(html.var(varprefix+'_hour'))*3600) + (saveint(html.var(varprefix+'_minutes'))*60) + saveint(html.var(varprefix+'_seconds')) + + def value_to_text(self, value): + days, rest = divmod(value, 60*60*24) + hours, rest = divmod(rest, 60*60) + minutes, seconds = divmod(rest, 60) + return "%sd %sh %sm %ss" % (days, hours, minutes, seconds) + + def validate_datatype(self, value, varprefix): + if type(value) != int: + raise MKUserError(varprefix, _("The value has type %s, but must be of type int") % (type(value))) + # Editor for a single integer class Integer(ValueSpec): def __init__(self, **kwargs): diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 69fe98d..4f6b6bb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -253,6 +253,37 @@ checkgroups.append(( "first" )) +checkgroups.append(( + "fileinfo", + _("Fileinfo"), + Dictionary( + elements = [ + ( "minage", + Tuple( + title = _("Minimal age"), + elements = [ + Age(title = _("Warning younger then")), + Age(title = _("Critical younger then")), + ] + ) + ), + ( "maxage", + Tuple( + title = _("Maximal age"), + elements = [ + Age(title = _("Warning older then")), + Age(title = _("Critical older then")), + ] + ) + ), + + + ] + ), + None, + "first" +)) + checkgroups.append(( "tcp_conn_stats", ("TCP connection stats"),

12 years, 9 months

Check_MK Git: check_mk: FIX: dell_poweredge_cpu: handle sporadic invalid output from agent

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 19a5a0d9ea52754af21b765c9784c98f9c942148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19a5a0d9ea5275… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:30:57 2011 +0100 FIX: dell_poweredge_cpu: handle sporadic invalid output from agent --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f37c9..8dadd28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,8 @@ * FIX: mem.vmalloc: fix default levels (32 and 64 was swapped) * FIX: smart: make levels work (thanks to Bernhard Schmidt) * FIX: PNP template if if/if64: reset LC_ALL, avoids syntax error + * FIX: dell_powerconnect_cpu: handle sporadic incomplete output + from SNMP agent 1.1.12p4: Multisite: diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index a0209cf..b7787dc 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -48,7 +48,10 @@ def inventory_dell_powerconnect_cpu(checkname, info): # Check of dell power connect CPU details. def check_dell_powerconnect_cpu(item, params, info): - enabled, onesecondperc, oneminuteperc, fiveminutesperc = info[0] + try: + enabled, onesecondperc, oneminuteperc, fiveminutesperc = map(int, info[0]) + except ValueError: + raise MKCounterWrapped("", "Ignoring empty data from SNMP agent") if int(enabled) == 1: cpu_load = int(onesecondperc) if cpu_load >= 0 <= 100:

12 years, 9 months

Check_MK Git: check_mk: dell_powerconnect_cpu: renamed service from CPU to "CPU utilization"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fad7c5d4136c09623106a86534fe961a3ea26bbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fad7c5d4136c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:31:29 2011 +0100 dell_powerconnect_cpu: renamed service from CPU to "CPU utilization" --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dadd28..4957e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.13i2 Checks & Agents: * linux agent - ipmi: Creating directory of cache file if not exists + * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in + order to be consistent with other checks 1.1.13i1: Multisite: diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index b7787dc..124c138 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -64,17 +64,17 @@ def check_dell_powerconnect_cpu(item, params, info): status = 1 output = ' (Above %d%%)' % params[0] - return (status, '%s - CPU load is %d%% %s' % + return (status, '%s - CPU utilization is %d%% %s' % (nagios_state_names[status], cpu_load, output), [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), ]) - return (3, "UNKNOWN - Invalid information in snmp data") + return (3, "UNKNOWN - Invalid information in SNMP data") # Auto-detection of CPU elements. -check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU", 1, inventory_dell_powerconnect_cpu) +check_info['dell_powerconnect_cpu'] = (check_dell_powerconnect_cpu, "CPU utilization", 1, inventory_dell_powerconnect_cpu) snmp_info['dell_powerconnect_cpu'] = ( ".1.3.6.1.4.1.89.1", [ "6", "7", "8", "9" ] ) snmp_scan_functions['dell_powerconnect_cpu'] = \ lambda oid: ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0")

12 years, 9 months

Check_MK Git: check_mk: Helper function saveint() into lib.py

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30f50e1aaacb173088bb963f559cdbed84aa1295 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30f50e1aaacb17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:29:28 2011 +0100 Helper function saveint() into lib.py --- web/htdocs/lib.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index be1be76..e2cffda 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -149,4 +149,8 @@ def format_exception(): traceback.print_exception(t, v, tb, None, txt) return txt.getvalue() - +def saveint(x): + try: + return int(x) + except: + return 0

12 years, 9 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: 01076376ff42a095f249666657dd4581ffcb854b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01076376ff42a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:29:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: linux agent - ipmi: Creating directory of cache file if not exists

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 246e3e02c9128716b47d5af1e906e37b260f4f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=246e3e02c91287… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 16:02:50 2011 +0100 linux agent - ipmi: Creating directory of cache file if not exists --- ChangeLog | 4 ++++ agents/check_mk_agent.linux | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a66111..63b9683 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.13i2 + Checks & Agents: + * linux agent - ipmi: Creating directory of cache file if not exists + 1.1.13i1: Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0424c40..595a934 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -187,6 +187,9 @@ if which ipmitool >/dev/null then echo '<<<ipmi>>>' IPMI_FILE=$MK_CONFDIR/ipmitool_sensors.cache + if [ ! -d $MK_CONFDIR ]; then + mkdir -p $MK_CONFDIR + fi # Do not use cache file after 20 minutes IPMI_MAXAGE=1200

12 years, 9 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: d9814a291a9e9a9c7c9a7b2c895909f561d2a734 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9814a291a9e9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 16 16:12:51 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 9 months

Check_MK Git: check_mk: Switched version to 1.1.13i2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a9491ec3171035b5775b20cf5e74351360d0c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a9491ec317103… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 16 16:02:25 2011 +0100 Switched version to 1.1.13i2 --- 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 debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 1d23a31..db0263c 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.13i1 +VERSION = 1.1.13i2 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 15faae9..fde17f2 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index bc755fb..2497640 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 0cb78ab..bb65fee 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0424c40..f75f229 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.13i1 +echo Version: 1.1.13i2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index c81a7d3..20f4c05 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.1.13i1 +echo Version: 1.1.13i2 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1680b46..5798f48 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.1.13i1" +#define CHECK_MK_VERSION "1.1.13i2" #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 1a87076..743aa7f 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 b69d1ae..6574045 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 377e262..3a140a7 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.13i1-1_all.deb net optional +check-mk_1.1.13i2-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 3e1e333..8124054 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.13i1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.13i2], [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 62589ba..0af62db 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.13i1 +VERSION=1.1.13i2 NAME=check_mk LANG= LC_ALL=

12 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits