Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

#2809 netscaler_vserver: now reports health_perc as performance data

by Andreas Boesl

Module: check_mk Branch: master Commit: c10d00f064aedcc0c2195d9ec680d2e7abf8c55a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c10d00f064aedc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 10 10:09:34 2015 +0100 #2809 netscaler_vserver: now reports health_perc as performance data --- .werks/2809 | 9 +++++++++ ChangeLog | 1 + checks/netscaler_vserver | 3 ++- web/plugins/metrics/check_mk.py | 12 ++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/2809 b/.werks/2809 new file mode 100644 index 0000000..a38e8da --- /dev/null +++ b/.werks/2809 @@ -0,0 +1,9 @@ +Title: netscaler_vserver: now reports health_perc as performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449738535 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d52e000..9c34e85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 1315 check_mk_agent.linux: The ps section of the agent now supports long usernames... * 2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library * 1316 mysql_slave: Levels can now be configured with WATO + * 2809 netscaler_vserver: now reports health_perc as performance data * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/netscaler_vserver b/checks/netscaler_vserver index b2f55ff..1f8ea7c 100644 --- a/checks/netscaler_vserver +++ b/checks/netscaler_vserver @@ -99,7 +99,7 @@ def check_netscaler_vserver(item, _no_params, info): health_state = 2 elif health_perc < 100: health_state = 1 - yield health_state, "Health at: %s%%" % health_perc + yield health_state, "Health at: %s%%" % health_perc, [("health_perc", health_perc, None, None, 0, 100)] yield 0, "Type: %s" % netscaler_vserver_entitytypes.get(svr_entitytype , "unknown") yield 0, "Protocol: %s" % netscaler_vserver_types.get(svr_type, "serviceUnknown") @@ -118,5 +118,6 @@ check_info["netscaler_vserver"] = { 62, # vsvrHealth 64, # vsvrEntityType ]), + "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1"), } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index fd82a25..ac366b3 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -932,6 +932,12 @@ metric_info["deviation_airflow"] = { "color" : "#60f020", } +metric_info["health_perc"] = { + "title" : _("Health"), + "unit" : "%", + "color" : "#ff6234", +} + # TODO: user -> cpu_util_user metric_info["user"] = { "title" : _("User"), @@ -4224,6 +4230,12 @@ perfometer_info.append({ perfometer_info.append({ "type" : "linear", + "segments" : [ "health_perc" ], + "total" : 100, +}) + +perfometer_info.append({ + "type" : "linear", "segments" : [ "deviation_calibration_point" ], "total" : 10, })

8 years, 9 months

esx_vsphere_sensors: added some documentation regarding incorrect sensor data

by Andreas Boesl

Module: check_mk Branch: master Commit: 4159e127c0d3ea1bd5497f06cf07431fbdba3cb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4159e127c0d3ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Dec 10 09:49:21 2015 +0100 esx_vsphere_sensors: added some documentation regarding incorrect sensor data --- checks/esx_vsphere_sensors | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/esx_vsphere_sensors b/checks/esx_vsphere_sensors index ffb084a..a771625 100644 --- a/checks/esx_vsphere_sensors +++ b/checks/esx_vsphere_sensors @@ -24,6 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + +# Note: Sometimes the esx_vsphere_sensors check reports incorrect sensor data. +# The reason is that the data is cached on the esx system. In the worst case some sensors +# might get stuck in an unhealthy state. You can find more information under the following link: +# http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externa… + # <<<esx_vsphere_sensors:sep(59)>>> # VMware Rollup Health State;;0;system;0;;red;Red;Sensor is operating under critical conditions # Power Domain 1 Power Unit 0 - Redundancy lost;;0;power;0;;yellow;Yellow;Sensor is operating under conditions that are non-critical

8 years, 9 months

iwyu + clang-format.

by Sven Panne

Module: check_mk Branch: master Commit: 97164d0d8a897f03c10849e64de989410c1e9bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97164d0d8a897f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Dec 10 09:20:59 2015 +0100 iwyu + clang-format. --- livestatus/src/strutil.cc | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index 5660570..fedb373 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -22,16 +22,15 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#include <string.h> -#include <ctype.h> - #include "strutil.h" +#include <ctype.h> +#include <stddef.h> +#include <string.h> char *rstrip(char *c) { char *w = c + strlen(c) - 1; - while (w >= c && isspace(*w)) - *w-- = '\0'; + while (w >= c && isspace(*w)) *w-- = '\0'; return c; } @@ -41,11 +40,9 @@ char *lstrip(char *c) return c; } -/* *c points to a string containing - white space separated columns. This method returns - a pointer to the zero-terminated next field. That - might be identical with *c itself. The pointer c - is then moved to the possible beginning of the +/* *c points to a string containing white space separated columns. This method + returns a pointer to the zero-terminated next field. That might be identical + with *c itself. The pointer c is then moved to the possible beginning of the next field. */ char *next_field(char **c) { @@ -56,8 +53,8 @@ char *next_field(char **c) return 0; // found end of string -> no more field } - char *end = begin; // copy pointer, search end of field - while (*end && !isspace(*end)) end++; // search for \0 or white space + char *end = begin; // copy pointer, search end of field + while (*end && !isspace(*end)) end++; // search for \0 or white space if (*end) { // string continues -> terminate field with '\0' *end = '\0'; *c = end + 1; // skip to character right *after* '\0' @@ -91,8 +88,7 @@ char *next_token(char **c, char delim) no tokens has been found */ char *save_next_token(char **c, char delim) { - if (!*c) - return (char *)""; + if (!*c) return (char *)""; char *result = next_token(c, delim); if (result == 0) @@ -108,5 +104,3 @@ int ends_with(const char *a, const char *b) size_t len_b = strlen(b); return len_a >= len_b && strcmp(a + len_a - len_b, b) == 0; } - -

8 years, 9 months

#1316 mysql_slave: Levels can now be configured with WATO

by Bastian Kuhn

Module: check_mk Branch: master Commit: 208a405859a2b2c3483ffc128f7c16869acf3f0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=208a405859a2b2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 9 11:01:10 2015 +0100 #1316 mysql_slave: Levels can now be configured with WATO --- .werks/1316 | 9 +++++++++ ChangeLog | 1 + checks/mysql_slave | 1 + web/plugins/wato/check_parameters.py | 27 +++++++++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/.werks/1316 b/.werks/1316 new file mode 100644 index 0000000..f7b1b9b --- /dev/null +++ b/.werks/1316 @@ -0,0 +1,9 @@ +Title: mysql_slave: Levels can now be configured with WATO +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449655241 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5eba1d6..d52e000 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 1314 apc_sts_source: New Check to monitor if the input source changes on APC STS devices * 1315 check_mk_agent.linux: The ps section of the agent now supports long usernames... * 2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library + * 1316 mysql_slave: Levels can now be configured with WATO * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/mysql_slave b/checks/mysql_slave index f07b3c8..95945df 100644 --- a/checks/mysql_slave +++ b/checks/mysql_slave @@ -119,5 +119,6 @@ check_info['mysql_slave'] = { "check_function" : check_mysql_slave, "service_description" : "MySQL DB Slave %s", "has_perfdata" : True, + "group" : "mysql_slave", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index a8025fa..8cd92b2 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5470,6 +5470,33 @@ register_check_parameters( register_check_parameters( subgroup_applications, + "mysql_slave", + _("MySQL Slave"), + Dictionary( + elements = [ + ( "seconds_behind_master", + Tuple( + title = _("Max. time behind the master"), + help = _("Compares the time which the slave can be behind the master. " + "This rule makes the check raise warning/critical states if the time is equal to " + "or above the configured levels."), + elements = [ + Age(title = _("Warning at")), + Age(title = _("Critical at")), + ] + ) + ), + ], + optional_keys = None), + TextAscii( + title = _("Instance"), + help = _("Only needed if you have multiple MySQL Instances on one server"), + ), + "dict", +) + +register_check_parameters( + subgroup_applications, "db_bloat", _("Database Bloat (PostgreSQL)"), Dictionary(

8 years, 9 months

#2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library

by Sebastian Herbord

Module: check_mk Branch: master Commit: a9196fd0662df88cd2f76484b00012f41954200e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9196fd0662df8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 9 10:57:59 2015 +0100 #2869 ibm_storage_ts, ibm_storage_ts.drive, ibm_storage_ts_library, ibm_storage_ts.status: new checks for IBM TS3100 Tape Library --- .werks/2869 | 9 +++ ChangeLog | 1 + checkman/ibm_storage_ts | 13 +++ checkman/ibm_storage_ts.drive | 16 ++++ checkman/ibm_storage_ts.library | 20 +++++ checkman/ibm_storage_ts.status | 19 +++++ checks/ibm_storage_ts | 170 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 248 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a9196fd066…

8 years, 9 months

Fixed potential out-of-bounds access in ends_with.

by Sven Panne

Module: check_mk Branch: master Commit: 92accd385c0cf864dc77f16f07aadba8efba6e50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92accd385c0cf8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 9 10:23:03 2015 +0100 Fixed potential out-of-bounds access in ends_with. --- livestatus/src/strutil.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index e8473e2..5660570 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -104,7 +104,9 @@ char *save_next_token(char **c, char delim) int ends_with(const char *a, const char *b) { - return !strcmp(a + strlen(a) - strlen(b), b); + size_t len_a = strlen(a); + size_t len_b = strlen(b); + return len_a >= len_b && strcmp(a + len_a - len_b, b) == 0; }

8 years, 9 months

#2868 FIX cpu_util.include: fixed crash on some systems if per-core statistics were enabled

by Sebastian Herbord

Module: check_mk Branch: master Commit: deb769c4683245dbf0167ad56ab70af58ba05fe2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb769c4683245… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Dec 9 09:56:12 2015 +0100 #2868 FIX cpu_util.include: fixed crash on some systems if per-core statistics were enabled The per-core statistics previously depended on a specific number of performance measures per core. --- .werks/2868 | 10 ++++++++++ ChangeLog | 1 + checks/cpu_util.include | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2868 b/.werks/2868 new file mode 100644 index 0000000..1035be0 --- /dev/null +++ b/.werks/2868 @@ -0,0 +1,10 @@ +Title: cpu_util.include: fixed crash on some systems if per-core statistics were enabled +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449651270 + +The per-core statistics previously depended on a specific number of performance measures per core. diff --git a/ChangeLog b/ChangeLog index efcbdfb..149ff5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,7 @@ * 2808 FIX: db2_connections: added missing connections performance data * 2861 FIX: hivemanager_devices: Fixed configuration of states to treat as WARN * 1312 FIX: carel_uniflair_cooling: Check is now disabled... + * 2868 FIX: cpu_util.include: fixed crash on some systems if per-core statistics were enabled... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cpu_util.include b/checks/cpu_util.include index a3c1ab0..e0e6278 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -210,8 +210,9 @@ def check_cpu_util_unix(values, params, cores = None): ("core_util_graph" in params or \ "core_util_time" in params): ctr = 0 + cores_padded = [line + [0] * (11 - len(line)) for line in cores] for core, user, nice, system, idle, iowait,\ - irq, softirq, steal, guest, guest_nice in cores: + irq, softirq, steal, guest, guest_nice in cores_padded: total = user + nice + system + iowait + irq + softirq + steal + guest + guest_nice

8 years, 9 months

When monitoring clustered hosts using Nagios as core, the Check_MK service always

by Lars Michelsen

Module: check_mk Branch: master Commit: 072f80100d13dd61afc4f07f01e8ee4029bb7171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=072f80100d13dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 9 08:32:10 2015 +0100 When monitoring clustered hosts using Nagios as core, the Check_MK service always resulted in an UNKNOWN state and this exception: NameError: global name 'set_use_cachefile' is not defined Conflicts: ChangeLog modules/check_mk.py --- .werks/2894 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 9 +-------- modules/check_mk_base.py | 5 +++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.werks/2894 b/.werks/2894 new file mode 100644 index 0000000..5b96ca9 --- /dev/null +++ b/.werks/2894 @@ -0,0 +1,13 @@ +Title: Fixed broken cluster checks when using Nagios core +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449646012 + +When monitoring clustered hosts using Nagios as core, the Check_MK service always +resulted in an UNKNOWN state and this exception: + +NameError: global name 'set_use_cachefile' is not defined diff --git a/ChangeLog b/ChangeLog index 9be5a43..efcbdfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 2764 FIX: Fixed broken SNMP checks in case SNMP check interval is configured for clusters... * 2770 FIX: Check_MK is now warning the user about deprecated but configured checkgroup parameters... * 2848 FIX: Fixed cleanup of old autocheck files of cluster hosts... + * 2894 FIX: Fixed broken cluster checks when using Nagios core... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/check_mk.py b/modules/check_mk.py index 25436c0..a949c75 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1352,12 +1352,6 @@ orig_cluster_max_cachefile_age = None orig_inventory_max_cachefile_age = None -def set_use_cachefile(state=True): - global opt_use_cachefile, orig_opt_use_cachefile - orig_opt_use_cachefile = opt_use_cachefile - opt_use_cachefile = state - - def restore_use_cachefile(): global opt_use_cachefile, orig_opt_use_cachefile if orig_opt_use_cachefile != None: @@ -4622,8 +4616,7 @@ def do_check_keepalive(): sys.stderr.flush() cleanup_globals() # Prepare for next check - global opt_use_cachefile - opt_use_cachefile = True + restore_use_cachefile() restore_original_agent_caching_usage() # Check if all global variables are clean, but only in verbose logging mode diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e25eae0..0fb0f06 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1999,6 +1999,11 @@ def worst_monitoring_state(status_a, status_b): return max(status_a, status_b) +def set_use_cachefile(state=True): + global opt_use_cachefile, orig_opt_use_cachefile + orig_opt_use_cachefile = opt_use_cachefile + opt_use_cachefile = state + #. # .--Check helpers-------------------------------------------------------.

8 years, 9 months

Fixed 'dist' target.

by Sven Panne

Module: check_mk Branch: master Commit: 3acb385b95055e372f0d3f230f20fd5fa3e449a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3acb385b95055e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Dec 9 07:44:35 2015 +0100 Fixed 'dist' target. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5a51741..e426078 100644 --- a/Makefile +++ b/Makefile @@ -42,13 +42,13 @@ IWYU := include-what-you-use LIVESTATUS_SOURCES := configure aclocal.m4 config.guess config.h.in config.sub \ configure.ac ltmain.sh Makefile.am Makefile.in missing \ nagios/README nagios/*.h nagios4/README nagios4/*.h \ - src/*.{h,c,cc} src/Makefile.{in,am} \ + src/*.{h,c,cc} src/mk/*.h src/Makefile.{in,am} \ depcomp install-sh api/python/{*.py,README} api/perl/* # Files that are checked for trailing spaces HEAL_SPACES_IN := checkman/* modules/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*{cc,c,h} \ - livestatus/src/mk/*{cc,c,h} agents/windows/*.cc \ + $$(find -name Makefile) livestatus/src/*.{cc,c,h} \ + livestatus/src/mk/*.h agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \

8 years, 9 months

Move all our C++11 look-alike headers to a separate directory.

by Sven Panne

Module: check_mk Branch: master Commit: ea77dbeb158a3ea63724e3fba4b252d5b41b572e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea77dbeb158a3e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Dec 8 18:03:08 2015 +0100 Move all our C++11 look-alike headers to a separate directory. --- Makefile | 4 +- livestatus/src/ClientQueue.h | 4 +- livestatus/src/LogCache.h | 2 +- livestatus/src/Store.h | 2 +- livestatus/src/TableLog.cc | 2 +- livestatus/src/TableStateHistory.cc | 2 +- livestatus/src/TimeperiodsCache.h | 2 +- livestatus/src/{ => mk}/ConditionVariable.h | 6 +- livestatus/src/{ => mk}/Mutex.h | 6 +- livestatus/src/mk/SharedMutex.h | 184 +++++++++++++++++++++++++++ livestatus/src/mk/String.h | 94 ++++++++++++++ livestatus/src/waittriggers.cc | 4 +- 12 files changed, 296 insertions(+), 16 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ea77dbeb15…

8 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015