Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64158 discussions

Check_MK Git: check_mk: Set version to 1.1.9i10

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 71e066810f8f48f8a9fec0ce7fe90a08611c0a97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e066810f8f48… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 24 18:03:06 2011 +0100 Set version to 1.1.9i10 --- 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 661afb5..db5b658 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i9 +VERSION = 1.1.9i10 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 3359863..68a39e7 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.9i9 +echo Version: 1.1.9i10 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 6c82215..b5a508e 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.9i9 +echo Version: 1.1.9i10 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 9363690..6dd58a6 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.9i9 +echo Version: 1.1.9i10 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index bca9c5f..9e252d7 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.9i9 +echo Version: 1.1.9i10 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index be4b537..13cb99a 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.9i9 +echo Version: 1.1.9i10 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d10cea5..7e4c38e 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.9i9" +#define CHECK_MK_VERSION "1.1.9i10" #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 fd6eafb..a1d825d 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 2f924b9..8f291c5 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 7c3d6aa..e297c0c 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.9i9], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i10], [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 8efa1f6..73ecbb5 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.9i9 +CHECK_MK_VERSION=1.1.9i10 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.6 diff --git a/scripts/setup.sh b/scripts/setup.sh index 12cc64c..35b5379 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i9 +VERSION=1.1.9i10 NAME=check_mk LANG= LC_ALL=

13 years, 6 months

Check_MK Git: check_mk: Updated ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 138b7507f9614193a2eabd5b60409adb3fe97f80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=138b7507f96141… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 24 16:37:17 2011 +0100 Updated ChangeLog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a57a57..6b1bd57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ Livestatus: * FIX: fix most compiler warnings (thanks to patch by Sami Kerola) + * FIX: fix memory leak. The leak caused increasing check latency in some + situations 1.1.9i8: Multisite:

13 years, 6 months

Check_MK Git: check_mk: df&friends: disable trend perfdata per default

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5cbe4bec2c45217aa20a499ed0b2e821bd46f335 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cbe4bec2c4521… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 24 16:27:31 2011 +0100 df&friends: disable trend perfdata per default --- ChangeLog | 7 ------- checkman/df | 20 ++++++++++---------- checks/df.include | 10 ++++++++-- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a42a02..6a57a57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,4 @@ 1.1.9i9: - INCOMPATIBLE CHANGES: - * All filesystem checks now have trends enabled per default. The checks - output now three performance values instead of one. This can break - updates of PNP graphs. Either delete all PNP graphs of {fs_} checks - or switch off trend reporting in order for your graphs to work. Trends - are very usefull, however... - Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts (needed for Shinken) diff --git a/checkman/df b/checkman/df index 7050794..7f26520 100644 --- a/checkman/df +++ b/checkman/df @@ -22,7 +22,7 @@ description: a logarithmic average that weights the more recent time more than time farer away. Also data beyond the 24 hours will to some small degree be reflected in the computation. The advantage of this algorithm is a more - precise predection and a simpler implementation, which does not need any + precise prediction and a simpler implementation, which does not need any access to any RRDs or similar storage. Please note, that when a filesystem is started being monitored, then @@ -30,14 +30,6 @@ description: that it will take at least one trend range of time until the trend approximately reflects the reality. - Please note that after an update to {1.1.9i9} the output of the performance - data is not compatible with older versions any longer since it outputs two - additional values. If you use PNP in {MULTIPLE} mode then this should not be - a problem. If you use PNP in {SINGLE} mode - which still is the default - - then you either have to {(1)} delete your RRD files beginning with {fs_} - or {(2)} switch off trend computing by setting - {filesystem_default_levels["trend_range"] = None}. - item: The mount point of the filesystem (UNIX) or the drive letter in upper case followed by a colon (Windows). @@ -89,11 +81,16 @@ examples: perfdata: One or three values: The first value is the used space of the filesystem in MB. Also the minimum (0 MB), maximum (size of the filesystem) and the warning and critical - levels in MB are provided. If {trend_range} is set (the default), then + levels in MB are provided. If you set {filesystem_trend_perfdata = True}, then two additional values are output: the change of the usage in MB per range since the last check (e.g. in MB per 24 hours) and the averaged change (so called trend), also in MB per range. + Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios - + changing the setting of {filesystem_trend_perfdata} will stop all updates to + your existing filesystem RRDs. You need either to delete or convert your RRDs + if you want to change. + inventory: df supports inventory. All filesystem the agent reports will be inventorized except mount points listed in @@ -164,3 +161,6 @@ inventory_df_exclude_mountpoints (list of strings): List of mount points to excl filesystem_default_levels: Default levels for filesystem detected by inventory. This variable is preset to {{ "levels" : (80, 90), "magic_normsize" : 20, "levels_low" : (50, 60), "trend_range" : 24 }} +filesystem_trend_perfdata (boolean): Whether or not to output trend performance data. This is + preset to {False} so that no trend performance data is output. If you change this setting you + need to convert or delete all RRD databases of filesystems. diff --git a/checks/df.include b/checks/df.include index a34054e..b2f3699 100644 --- a/checks/df.include +++ b/checks/df.include @@ -58,6 +58,10 @@ filesystem_default_levels = { # Users might have set filesystem_default_levels to old format like (80, 90) +# Turn off trend perfdata per default in order to keep +# compatible to existing RRDs +filesystem_trend_perfdata = False + # needed by df, df_netapp and vms_df and maybe others in future: # compute warning and critical levels. Takes into account the size of @@ -159,7 +163,8 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): this_time = time.time() # rate in MB/s, allow negative timdif, rate = get_counter("df.%s.delta" % mountpoint, this_time, used_mb, True) - perfdata.append(("growth", rate * range_sec)) + if filesystem_trend_perfdata: + perfdata.append(("growth", rate * range_sec)) # average trend, initialize with zero timedif, rate_avg = get_average("df.%s.trend" % mountpoint, this_time, rate, range_sec, True) @@ -196,7 +201,8 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): status = 2 problems[-1] += "!" - perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) + if filesystem_trend_perfdata: + perfdata.append(("trend", trend, wa, cr, 0, size_mb / range)) # compute time until filesystem is full (only for positive trend, of course) if trend > 0:

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8d77015d7990b1ab10263456fc235533d04ae609 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d77015d7990b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 17:43:26 2011 +0100 Updated bug entries --- .bugs/155 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/155 b/.bugs/155 new file mode 100644 index 0000000..85eac66 --- /dev/null +++ b/.bugs/155 @@ -0,0 +1,11 @@ +Title: check_mk -I should accept tags +Component: core +Benefit: 2 +State: open +Cost: 1 +Date: 2011-02-21 17:42:12 +Class: feature + +When doing a cmk -I(I), one should be possible to +specify tags instead of specific hosts. The same feature +could be usefull for -N, -C, -D and maybe other commands as well.

13 years, 7 months

Check_MK Git: check_mk: use snmp commands always with -Ot

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 51cc5e0d1b33bd90ae8accdf6743839cfcdf8632 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51cc5e0d1b33bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 17:40:39 2011 +0100 use snmp commands always with -Ot --- ChangeLog | 2 ++ modules/check_mk.py | 4 ++-- modules/snmp.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbb55b8..6a42a02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ * local.mk: This file is read after final.mk and *not* backup up or restored * read all files in conf.d/*.mk in alphabetical order now. + * use snmp commands always with -Ot: output time stamps as UNIX epoch + (thanks to Ulrich Kiermayr) Checks & Agents: * ucd_cpu_load: new check for CPU load via UCD SNMP agent diff --git a/modules/check_mk.py b/modules/check_mk.py index c3acd35..6685637 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -617,7 +617,7 @@ def get_single_oid(hostname, ipaddress, oid): return None command = snmp_get_command(hostname) + \ - " -On -OQ -Oe %s %s 2>/dev/null" % (ipaddress, oid) + " -On -OQ -Oe -Ot %s %s 2>/dev/null" % (ipaddress, oid) try: if opt_debug: sys.stdout.write("Running '%s'\n" % command) @@ -2710,7 +2710,7 @@ def do_snmpwalk_on(hostname, filename): if opt_verbose: sys.stdout.write("%s:\n" % hostname) ip = lookup_ipaddress(hostname) - cmd = snmp_walk_command(hostname) + " -On -Ob -OQ %s " % ip + cmd = snmp_walk_command(hostname) + " -On -Ob -OQ -Ot %s " % ip if opt_debug: print 'Executing: %s' % cmd out = file(filename, "w") diff --git a/modules/snmp.py b/modules/snmp.py index 5ed920d..7ff3e74 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -113,7 +113,7 @@ def get_snmp_explicit(hostname, ipaddress, mib, baseoid, suffixes): def snmpwalk_on_suboid(hostname, ip, oid): command = snmp_walk_command(hostname) + \ - " -OQ -OU -On %s %s 2>/dev/null" % (ip, oid) + " -OQ -OU -On -Ot %s %s 2>/dev/null" % (ip, oid) if opt_debug: sys.stderr.write(' Running %s\n' % (command,)) snmp_process = os.popen(command, "r").xreadlines()

13 years, 7 months

Check_MK Git: check_mk: WATO: fix missing service on windows

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 16dbe37033676d72f19374fc2dbf4e7914f7dc3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16dbe37033676d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 17:35:24 2011 +0100 WATO: fix missing service on windows --- ChangeLog | 4 ++++ web/htdocs/htmllib.py | 5 ++++- web/htdocs/index.py | 1 + web/htdocs/wato.py | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 672143f..dbb55b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,10 @@ * FIX: fix PNP icon in cases where host and service icons are displayed in same view (found by Wolfgang Barth) + WATO: + * FIX: fix problem with vanishing services on Windows. Affected were services + containing colons (such as fs_C:/). + Livestatus: * FIX: fix most compiler warnings (thanks to patch by Sami Kerola) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 14d800f..9316994 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import time, cgi, config, os, defaults, pwd +import time, cgi, config, os, defaults, pwd, urllib from lib import * # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' @@ -98,6 +98,9 @@ def urlencode(value): ret += c return ret +def urldecode(value): + return urllib.unquote_plus(value) + def u8(c): if ord(c) > 127: return "&#%d;" % ord(c) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b29431f..81d64c3 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -51,6 +51,7 @@ def read_get_vars(req): def parse_vars(vars): req.rawvars = util.parse_qs(vars, True) for (key,values) in req.rawvars.items(): + key = htmllib.urldecode(key) if len(values) >= 1: req.vars[key] = values[-1] req.multivars[key] = values diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7fa5f2c..903cebc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -425,12 +425,12 @@ def mode_inventory(phase, firsttime): elif (html.has_var("_activate_all") or html.has_var("_fixall")) and st == "new": active_checks[(ct, item)] = paramstring else: - varname = ("_%s_%s" % (ct, item)).replace(' ', '+') + varname = "_%s_%s" % (ct, item) if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring check_mk_automation("set-autochecks", [hostname], active_checks) - message = "Saved check configuration of host [%s] with %d checks" % (hostname, len(active_checks)) + message = "Saved check configuration of host [%s] with %d services" % (hostname, len(active_checks)) log_pending(hostname, "set-autochecks", message) return new_target, message return "index"

13 years, 7 months

Check_MK Git: check_mk: read in local.mk as last file, sort conf.d files

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f4d40ffed7c5961f2e40c6f6cc152a1a223503e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4d40ffed7c59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 15:57:57 2011 +0100 read in local.mk as last file, sort conf.d files --- .bugs/33 | 10 +++++++--- ChangeLog | 3 +++ modules/check_mk.py | 13 ++++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.bugs/33 b/.bugs/33 index cceb386..f39be6c 100644 --- a/.bugs/33 +++ b/.bugs/33 @@ -1,10 +1,14 @@ Title: Datei local.mk, die nicht gebackupt wird Component: core +State: done +Class: feature +Date: 2010-12-21 20:50:02 Benefit: 1 -State: open Cost: 1 -Date: 2010-12-21 20:50:02 -Class: feature +Fun: 0 Analog zu final, kommt noch nach final und wird von backup/restore nicht angefasst. + +2011-02-21 15:57:37: changed state open -> done +Is done. View updated docu for details. diff --git a/ChangeLog b/ChangeLog index fbf282d..672143f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,9 @@ * FIX: read *.include files before checks. Fixes df_netapp not finding its check function * FIX: inventory checks on SNMP+TCP hosts ignored new TCP checks + * local.mk: This file is read after final.mk and *not* backup up + or restored + * read all files in conf.d/*.mk in alphabetical order now. Checks & Agents: * ucd_cpu_load: new check for CPU load via UCD SNMP agent diff --git a/modules/check_mk.py b/modules/check_mk.py index a98a40d..c3acd35 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3756,13 +3756,20 @@ def do_automation(cmd, args): def all_nonfunction_vars(): return set([ name for name,value in globals().items() if name[0] != '_' and type(value) != type(lambda:0) ]) -vars_before_config = all_nonfunction_vars() -list_of_files = [ check_mk_configfile ] + glob.glob(check_mk_configdir + '/*.mk') +# Create list of all files to be included +list_of_files = glob.glob(check_mk_configdir + '/*.mk') +list_of_files.sort() +list_of_files = [ check_mk_configfile ] + list_of_files final_mk = check_mk_basedir + "/final.mk" if os.path.exists(final_mk): list_of_files.append(final_mk) +local_mk = check_mk_basedir + "/local.mk" +if os.path.exists(local_mk): + list_of_files.append(local_mk) + +vars_before_config = all_nonfunction_vars() for _f in list_of_files: # Hack: during parent scan mode we must not read in old version of parents.mk! if '--scan-parents' in sys.argv and _f.endswith("/parents.mk"): @@ -3840,7 +3847,7 @@ if __name__ == "__main__": checks = autochecks + checks vars_after_config = all_nonfunction_vars() -ignored_variables = set(['vars_before_config', 'rrdtool', 'final_mk', 'list_of_files', 'autochecks', +ignored_variables = set(['vars_before_config', 'rrdtool', 'autochecks', 'parts' ,'hosttags' ,'seen_hostnames' ,'all_hosts_untagged' ,'taggedhost' ,'hostname']) errors = 0 for name in vars_after_config:

13 years, 7 months

Check_MK Git: check_mk: Updated man page of df

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c46afb3f2cd18e683681941c789b22eaf2e0f96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c46afb3f2cd18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 10:14:34 2011 +0100 Updated man page of df --- checkman/df | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/checkman/df b/checkman/df index 8a57dba..7050794 100644 --- a/checkman/df +++ b/checkman/df @@ -25,12 +25,18 @@ description: precise predection and a simpler implementation, which does not need any access to any RRDs or similar storage. - Please note that after an update to {1.1.9i1} the output of the performance + Please note, that when a filesystem is started being monitored, then + the trend of the past is unknown and will be assumed to be {zero}. That means + that it will take at least one trend range of time until the trend approximately + reflects the reality. + + Please note that after an update to {1.1.9i9} the output of the performance data is not compatible with older versions any longer since it outputs two additional values. If you use PNP in {MULTIPLE} mode then this should not be a problem. If you use PNP in {SINGLE} mode - which still is the default - then you either have to {(1)} delete your RRD files beginning with {fs_} - or {(2)} switch off trend computing by setting {filesystem_default_levels["trend_rangE"] = None}. + or {(2)} switch off trend computing by setting + {filesystem_default_levels["trend_range"] = None}. item: The mount point of the filesystem (UNIX) or the drive

13 years, 7 months

Check_MK Git: check_mk: PNP template for local honors all dirs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9e303bfb9f41ac894dcbac76647cd57ed45e90f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e303bfb9f41a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 21 10:03:03 2011 +0100 PNP template for local honors all dirs Thanks to Patrick Schaaf --- ChangeLog | 4 +++- pnp-templates/check_mk-local.php | 27 +++++++++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index c207c9a..fbf282d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,9 @@ trends. Please look at check manpage of df for details. * FIX: heartbeat_nodes: Fixed error handling when node is active but at least one link is dead * 3ware_units: Handling INITIALIZING state as warning now - * 3ware_units: Better handling of outputs from different tw_cli versions now + * FIX: 3ware_units: Better handling of outputs from different tw_cli versions now + * FIX: local: PNP template for local now looks in all template directories for + specific templates (thanks to Patrick Schaaf) Multisite: * FIX: fix "too many values to unpack" when editing views in single layout diff --git a/pnp-templates/check_mk-local.php b/pnp-templates/check_mk-local.php index a1e284c..1f3914f 100644 --- a/pnp-templates/check_mk-local.php +++ b/pnp-templates/check_mk-local.php @@ -23,19 +23,26 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$x = getcwd(); - // try to find template matching a prefix of the service // description first. Slashes are replaced by underscores. +$template_dirs = array('.'); +if (isset($this->config->conf['template_dirs'])) { + $template_dirs = $this->config->conf['template_dirs']; +} $descr = str_replace("/", "_", $servicedesc); -$found = 0; -for ($i = strlen($descr); $i > 0; $i--) -{ - $tryname = 'templates/'.substr($descr, 0, $i) . ".php"; - if (file_exists($tryname) && include($tryname)) { - $found = 1; - break; - } +foreach ($template_dirs as $template_dir) { + $found = 0; + for ($i = strlen($descr); $i > 0; $i--) + { + $tryname = $template_dir . '/' . substr($descr, 0, $i) . '.php'; + if (file_exists($tryname) && include($tryname)) { + $found = 1; + break; + } + } + if ($found) { + break; + } } if (!$found) {

13 years, 7 months

Check_MK Git: check_mk: livestatus: fix to most of compiler warnings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2e9e82bcbe091ee0fa06822017aca533d3cb263 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e9e82bcbe091… Author: Sami Kerola <kerolasa(a)iki.fi> Date: Sun Feb 20 23:23:38 2011 +0100 livestatus: fix to most of compiler warnings Signed-off-by: Mathias Kettner <mk(a)mathias-kettner.de> --- ChangeLog | 3 ++ livestatus/src/Aggregator.h | 2 +- livestatus/src/AndingFilter.h | 6 ++-- livestatus/src/AttributelistColumn.cc | 2 +- livestatus/src/AttributelistColumn.h | 6 ++-- livestatus/src/AttributelistFilter.h | 2 +- livestatus/src/Column.h | 10 +++--- livestatus/src/ColumnsColumn.h | 2 +- livestatus/src/ContactgroupsMemberColumn.h | 4 +- livestatus/src/ContactsColumn.h | 4 +- livestatus/src/CountAggregator.h | 2 +- livestatus/src/CustomVarsColumn.h | 4 +- livestatus/src/CustomVarsFilter.h | 2 +- livestatus/src/DoubleAggregator.h | 2 +- livestatus/src/DoubleColumn.h | 4 +- livestatus/src/DownCommColumn.h | 4 +- livestatus/src/DowntimeOrComment.cc | 4 +- livestatus/src/EmptyColumn.cc | 2 +- livestatus/src/EmptyColumn.h | 4 +- livestatus/src/Filter.h | 18 +++++----- livestatus/src/GlobalCountersColumn.h | 6 ++-- livestatus/src/HostContactsColumn.h | 4 +- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/HostgroupsColumn.h | 4 +- livestatus/src/HostlistColumn.h | 4 +- livestatus/src/HostlistColumnFilter.h | 2 +- livestatus/src/HostlistStateColumn.h | 2 +- livestatus/src/InputBuffer.h | 2 +- livestatus/src/IntAggregator.h | 2 +- livestatus/src/IntColumn.h | 4 +- livestatus/src/IntColumnFilter.cc | 2 +- livestatus/src/IntPointerColumn.h | 4 +- livestatus/src/ListColumn.h | 4 +- livestatus/src/Logfile.h | 8 ++-- livestatus/src/OffsetDoubleColumn.h | 4 +- livestatus/src/OffsetIntColumn.h | 4 +- livestatus/src/OffsetStringColumn.h | 2 +- livestatus/src/OffsetStringHostMacroColumn.cc | 2 +- livestatus/src/OffsetStringHostMacroColumn.h | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/OffsetStringMacroColumn.h | 2 +- livestatus/src/OffsetStringServiceMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.h | 6 ++-- livestatus/src/OutputBuffer.h | 14 ++++---- livestatus/src/Query.h | 6 ++-- livestatus/src/ServiceContactsColumn.h | 4 +- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/ServicegroupsColumn.h | 4 +- livestatus/src/ServicelistColumn.h | 4 +- livestatus/src/ServicelistStateColumn.h | 2 +- livestatus/src/StatsColumn.h | 6 ++-- livestatus/src/Store.cc | 6 ++-- livestatus/src/StringColumn.h | 6 ++-- livestatus/src/StringPointerColumn.h | 4 +- livestatus/src/Table.h | 10 +++--- livestatus/src/TableColumns.h | 2 +- livestatus/src/TableCommands.h | 2 +- livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.h | 2 +- livestatus/src/TableDownComm.h | 2 +- livestatus/src/TableHostgroups.h | 2 +- livestatus/src/TableHosts.h | 4 +- livestatus/src/TableLog.cc | 6 ++-- livestatus/src/TableLog.h | 4 +- livestatus/src/TableServicegroups.h | 2 +- livestatus/src/TableServices.h | 4 +- livestatus/src/TableStatus.h | 2 +- livestatus/src/TableTimeperiods.h | 2 +- livestatus/src/TimeColumnFilter.h | 2 +- livestatus/src/TimePointerColumn.h | 4 +- livestatus/src/logger.c | 1 + livestatus/src/module.c | 43 +++++++++++++++------- livestatus/src/pnp4nagios.cc | 2 +- livestatus/src/unixcat.c | 4 ++- 74 files changed, 172 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a2e9e82bcb…

13 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits