Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Minor code cleanup: one line for each import

by Mathias Kettner

Module: check_mk Branch: master Commit: ab3569bf19533445894ed0ec477dfe683c5da6a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab3569bf195334… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:34:16 2015 +0200 Minor code cleanup: one line for each import --- modules/check_mk.py | 14 ++++++++++++-- modules/check_mk_base.py | 9 ++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9741829..5e3d0f8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -31,8 +31,18 @@ # - cluster_name - Name of a cluster (string) # - realhost_name - Name of a *real* host, not a cluster (string) -import os, sys, socket, time, getopt, re, stat, py_compile, urllib, inspect -import subprocess, fcntl +import os +import sys +import time +import socket +import getopt +import re +import stat +import urllib +import subprocess +import fcntl +import py_compile +import inspect # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index dd6a756..5a8099f 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -42,7 +42,14 @@ import sys # to python module names like "random" sys.path.pop(0) -import socket, os, time, re, signal, math, tempfile, traceback +import socket +import os +import time +import re +import signal +import math +import tempfile +import traceback # PLANNED CLEANUP: # - central functions for outputting verbose information and bailing

8 years, 8 months

make new plugins finding function accept None path

by Mathias Kettner

Module: check_mk Branch: master Commit: 3df0560718147c89c569ffe5955398e558231cd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df0560718147c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:32:06 2015 +0200 make new plugins finding function accept None path --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9945810..9741829 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1286,7 +1286,7 @@ def aggregated_service_name(hostname, servicedesc): # '----------------------------------------------------------------------' def plugin_pathnames_in_directory(path): - if os.path.exists(path): + if path and os.path.exists(path): return sorted([ path + "/" + f for f in os.listdir(path)

8 years, 8 months

Cleanup in modules: get rid of module glob

by Mathias Kettner

Module: check_mk Branch: master Commit: 3164085f39186dda45940f1eea25ac11a6de0d72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3164085f39186d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:30:48 2015 +0200 Cleanup in modules: get rid of module glob --- modules/check_mk.py | 71 +++++++++++++++++++++++++++----------------------- modules/inventory.py | 10 ++----- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 86fb81d..9945810 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -31,7 +31,7 @@ # - cluster_name - Name of a cluster (string) # - realhost_name - Name of a *real* host, not a cluster (string) -import os, sys, socket, time, getopt, glob, re, stat, py_compile, urllib, inspect +import os, sys, socket, time, getopt, re, stat, py_compile, urllib, inspect import subprocess, fcntl # These variable will be substituted at 'make dist' time @@ -338,14 +338,8 @@ special_agent_info = {} # values user can override those variables in his configuration. # Do not read in the checks if check_mk is called as module def load_checks(): - filelist = glob.glob(checks_dir + "/*") - filelist.sort() - - # read local checks *after* shipped ones! - if local_checks_dir: - local_files = glob.glob(local_checks_dir + "/*") - local_files.sort() - filelist += local_files + filelist = plugin_pathnames_in_directory(checks_dir) \ + + plugin_pathnames_in_directory(local_checks_dir) # read include files always first, but still in the sorted # order with local ones last (possibly overriding variables) @@ -468,6 +462,32 @@ def active_check_service_description(act_info, params): # | Helper functions for dealing with hosts. | # '----------------------------------------------------------------------' +def is_tcp_host(hostname): + return in_binary_hostlist(hostname, tcp_hosts) + +def is_ping_host(hostname): + return not is_snmp_host(hostname) and not is_tcp_host(hostname) and not has_piggyback_info(hostname) + +def is_dual_host(hostname): + return is_tcp_host(hostname) and is_snmp_host(hostname) + +def is_ipv4_host(hostname): + # Either explicit IPv4 or implicit (when host is not an IPv6 host) + return "ip-v4" in tags_of_host(hostname) or "ip-v6" not in tags_of_host(hostname) + +def is_ipv6_host(hostname): + return "ip-v6" in tags_of_host(hostname) + +def is_ipv6_primary(hostname): + dual_stack_host = is_ipv4v6_host(hostname) + return (not dual_stack_host and is_ipv6_host(hostname)) \ + or (dual_stack_host and host_extra_conf(hostname, primary_address_family) == "ipv6") + +def is_ipv4v6_host(hostname): + tags = tags_of_host(hostname) + return "ip-v6" in tags and "ip-v4" in tags + + # Returns a list of all host names, regardless if currently # disabled or monitored on a remote site. Does not return # cluster hosts. @@ -1265,30 +1285,15 @@ def aggregated_service_name(hostname, servicedesc): # | Misc functions which do not belong to any other topic | # '----------------------------------------------------------------------' -def is_tcp_host(hostname): - return in_binary_hostlist(hostname, tcp_hosts) - -def is_ping_host(hostname): - return not is_snmp_host(hostname) and not is_tcp_host(hostname) and not has_piggyback_info(hostname) - -def is_dual_host(hostname): - return is_tcp_host(hostname) and is_snmp_host(hostname) - -def is_ipv4_host(hostname): - # Either explicit IPv4 or implicit (when host is not an IPv6 host) - return "ip-v4" in tags_of_host(hostname) or "ip-v6" not in tags_of_host(hostname) - -def is_ipv6_host(hostname): - return "ip-v6" in tags_of_host(hostname) - -def is_ipv6_primary(hostname): - dual_stack_host = is_ipv4v6_host(hostname) - return (not dual_stack_host and is_ipv6_host(hostname)) \ - or (dual_stack_host and host_extra_conf(hostname, primary_address_family) == "ipv6") - -def is_ipv4v6_host(hostname): - tags = tags_of_host(hostname) - return "ip-v6" in tags and "ip-v4" in tags +def plugin_pathnames_in_directory(path): + if os.path.exists(path): + return sorted([ + path + "/" + f + for f in os.listdir(path) + if not f.startswith(".") + ]) + else: + return [] def check_period_of(hostname, service): periods = service_extra_conf(hostname, service, check_periods) diff --git a/modules/inventory.py b/modules/inventory.py index 41f2c2a..075d0c5 100644 --- a/modules/inventory.py +++ b/modules/inventory.py @@ -47,14 +47,8 @@ inv_info = {} # Inventory plugins inv_export = {} # Inventory export hooks # Read all inventory plugins right now -filelist = glob.glob(inventory_dir + "/*") -filelist.sort() - -# read local checks *after* shipped ones! -if local_inventory_dir: - local_files = glob.glob(local_inventory_dir + "/*") - local_files.sort() - filelist += local_files +filelist = plugin_pathnames_in_directory(inventory_dir) \ + + plugin_pathnames_in_directory(local_inventory_dir) # read include files always first, but still in the sorted

8 years, 8 months

#2667 FIX solaris_mem: fix exception in inventory plugin

by Mathias Kettner

Module: check_mk Branch: master Commit: 7fa7217682dbbe84718dc4e2d354e331fa53bee7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa7217682dbbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 24 15:27:34 2015 +0200 #2667 FIX solaris_mem: fix exception in inventory plugin --- .werks/2667 | 9 +++++++++ ChangeLog | 1 + inventory/solaris_mem | 20 ++++++++++++-------- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.werks/2667 b/.werks/2667 new file mode 100644 index 0000000..4fd6c1d --- /dev/null +++ b/.werks/2667 @@ -0,0 +1,9 @@ +Title: solaris_mem: fix exception in inventory plugin +Level: 1 +Component: inv +Compatible: compat +Version: 1.2.7i4 +Date: 1445693228 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 44c76d3..32aa5e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ HW/SW-Inventory: * 2436 NetApp monitoring: Now able to gather data for inventory... + * 2667 FIX: solaris_mem: fix exception in inventory plugin 1.2.7i3: diff --git a/inventory/solaris_mem b/inventory/solaris_mem index 3f42b5f..4d9a708 100644 --- a/inventory/solaris_mem +++ b/inventory/solaris_mem @@ -34,17 +34,21 @@ # swap.total 203939356672 # swap.used 116191281152 -def inv_solaris_mem(info): +# statgrab_mem has a parse function with the following output: +# { +# 'SwapTotal' : 0, +# 'Cached' : 0, +# 'MemFree' : 1582464, # kB +# 'MemTotal' : 2017928, # kB +# 'SwapFree' : 0, +# } + +def inv_solaris_mem(parsed): node = inv_tree("hardware.memory.") - for key, value in info: - if key == "mem.total": - node["total_ram_usable"] = int(value) - if key == "swap.total": - node["total_swap"] = int(value) + node["total_ram_usable"] = parsed["MemTotal"] * 1024 + node["total_swap"] = parsed["SwapTotal"] * 1024 inv_info['statgrab_mem'] = { "inv_function" : inv_solaris_mem, } - -

8 years, 8 months

Removed unused file.

by Sven Panne

Module: check_mk Branch: master Commit: f1f8c410ba7c1af4c88f68d52faffd0197be630e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1f8c410ba7c1a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 23 16:13:10 2015 +0200 Removed unused file. --- livestatus/src/strutil.c | 110 ---------------------------------------------- 1 file changed, 110 deletions(-) diff --git a/livestatus/src/strutil.c b/livestatus/src/strutil.c deleted file mode 100644 index e8473e2..0000000 --- a/livestatus/src/strutil.c +++ /dev/null @@ -1,110 +0,0 @@ -// +------------------------------------------------------------------+ -// | ____ _ _ __ __ _ __ | -// | / ___| |__ ___ ___| | __ | \/ | |/ / | -// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -// | | |___| | | | __/ (__| < | | | | . \ | -// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -// | | -// | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -// +------------------------------------------------------------------+ -// -// This file is part of Check_MK. -// The official homepage is at http://mathias-kettner.de/check_mk. -// -// check_mk is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation in version 2. check_mk is distributed -// in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -// out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -// PARTICULAR PURPOSE. See the GNU General Public License for more de- -// ails. You should have received a copy of the GNU General Public -// License along with GNU Make; see the file COPYING. If not, write -// 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" - -char *rstrip(char *c) -{ - char *w = c + strlen(c) - 1; - while (w >= c && isspace(*w)) - *w-- = '\0'; - return c; -} - -char *lstrip(char *c) -{ - while (isspace(*c)) 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 - next field. */ -char *next_field(char **c) -{ - /* *c points to first character of field */ - char *begin = lstrip(*c); // skip leading spaces - if (!*begin) { - *c = begin; - 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 - if (*end) { // string continues -> terminate field with '\0' - *end = '\0'; - *c = end + 1; // skip to character right *after* '\0' - } - else - *c = end; // no more field, point to '\0' - return begin; -} - -/* similar to next_field() but takes one character as delimiter */ -char *next_token(char **c, char delim) -{ - char *begin = *c; - if (!*begin) { - *c = begin; - return 0; - } - - char *end = begin; - while (*end && *end != delim) end++; - if (*end) { - *end = 0; - *c = end + 1; - } - else - *c = end; - return begin; -} - -/* same as next_token() but returns "" instead of 0 if - no tokens has been found */ -char *save_next_token(char **c, char delim) -{ - if (!*c) - return (char *)""; - - char *result = next_token(c, delim); - if (result == 0) - return (char *)""; - else - return result; -} - - -int ends_with(const char *a, const char *b) -{ - return !strcmp(a + strlen(a) - strlen(b), b); -} - -

8 years, 8 months

Cherry-picked bug-fix from strutil.c into strutil.cc.

by Sven Panne

Module: check_mk Branch: master Commit: 4dbaf3a37329f6a8c38fd71c8fadacead7985d81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dbaf3a37329f6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 23 16:10:55 2015 +0200 Cherry-picked bug-fix from strutil.c into strutil.cc. --- livestatus/src/strutil.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/livestatus/src/strutil.cc b/livestatus/src/strutil.cc index 0aae7b6..e8473e2 100644 --- a/livestatus/src/strutil.cc +++ b/livestatus/src/strutil.cc @@ -91,6 +91,9 @@ char *next_token(char **c, char delim) no tokens has been found */ char *save_next_token(char **c, char delim) { + if (!*c) + return (char *)""; + char *result = next_token(c, delim); if (result == 0) return (char *)"";

8 years, 8 months

mssql.vbs: removed debug output, fixed missing var declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: 87a86227749de285808fd1d17cb515cef66bbc6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87a86227749de2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 15:51:58 2015 +0200 mssql.vbs: removed debug output, fixed missing var declaration --- agents/windows/plugins/mssql.vbs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 89baa8e..856d06a 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -5,7 +5,7 @@ ' on the local system. ' ' The current implementation of the check uses the "trusted authentication" -' where no user/password needs to be created in the MSSQL server instance by +' where no user/password needs to be created in the MSSQL server instance by ' default. It is only needed to grant the user as which the Check_MK windows ' agent service is running access to the MSSQL database. ' @@ -30,7 +30,7 @@ Option Explicit Dim WMI, FSO, SHO, items, objItem, prop, instId, instIdx, instVersion -Dim instIds, instName, output, isClustered +Dim instIds, instName, output, isClustered, instServers Dim WMIservice, colRunningServices, objService, cfg_dir, cfg_file, hostname WScript.Timeout = 10 @@ -297,10 +297,9 @@ For Each instId In instIds.Keys Next ' Loop all databases to get the date of the last backup. Only show databases - ' which have at least one backup + ' which have at least one backup Dim lastBackupDate addOutput( "<<<mssql_backup>>>" ) - addOutput( "Blocked _Sessions" ) For Each dbName in dbNames.Keys RS.open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date " & _ "FROM msdb.dbo.backupset " & _

8 years, 8 months

#2691 FIX Fixed exception in host address painter when displaying hosts/ services of older sites

by Lars Michelsen

Module: check_mk Branch: master Commit: 70e94b07f5817d9249717453ae2bf960656e1e28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70e94b07f5817d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 15:46:36 2015 +0200 #2691 FIX Fixed exception in host address painter when displaying hosts/services of older sites --- .werks/2691 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/2691 b/.werks/2691 new file mode 100644 index 0000000..d0d7cef --- /dev/null +++ b/.werks/2691 @@ -0,0 +1,10 @@ +Title: Fixed exception in host address painter when displaying hosts/services of older sites +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445607971 + + diff --git a/ChangeLog b/ChangeLog index 3465668..44c76d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 2687 FIX: Quicksearch: Improved error handling * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings * 2438 FIX: Manpage icons: fixed manpage links for active checks + * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 77c53af..901f628 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1369,11 +1369,11 @@ def paint_host_addresses(row): row["host_custom_variable_values"])) if custom_vars.get("ADDRESS_FAMILY", "4") == "4": - primary = custom_vars["ADDRESS_4"] - secondary = custom_vars["ADDRESS_6"] + primary = custom_vars.get("ADDRESS_4", "") + secondary = custom_vars.get("ADDRESS_6", "") else: - primary = custom_vars["ADDRESS_6"] - secondary = custom_vars["ADDRESS_4"] + primary = custom_vars.get("ADDRESS_6", "") + secondary = custom_vars.get("ADDRESS_4", "") if secondary: secondary = " (%s)" % secondary @@ -1402,9 +1402,9 @@ def paint_host_address_families(row): primary = custom_vars.get("ADDRESS_FAMILY", "4") families = [primary] - if primary == "6" and custom_vars["ADDRESS_4"]: + if primary == "6" and custom_vars.get("ADDRESS_4"): families.append("4") - elif primary == "4" and custom_vars["ADDRESS_6"]: + elif primary == "4" and custom_vars.get("ADDRESS_6"): families.append("6") return "", ", ".join(families)

8 years, 8 months

Minor code cleanup in WUT checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 2748d310053c7af10c6e4e5f081eef10b2177e9d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2748d310053c7a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 23 14:57:36 2015 +0200 Minor code cleanup in WUT checks --- checks/wut_webtherm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/checks/wut_webtherm b/checks/wut_webtherm index 96932f8..62f3b55 100644 --- a/checks/wut_webtherm +++ b/checks/wut_webtherm @@ -26,16 +26,7 @@ def detect_webtherm(oid): - return oid(".1.3.6.1.2.1.1.2.0") in \ - [ ".1.3.6.1.4.1.5040.1.2.1", - ".1.3.6.1.4.1.5040.1.2.2", - ".1.3.6.1.4.1.5040.1.2.3", - ".1.3.6.1.4.1.5040.1.2.6", - ".1.3.6.1.4.1.5040.1.2.7", - ".1.3.6.1.4.1.5040.1.2.8", - ".1.3.6.1.4.1.5040.1.2.9", - ".1.3.6.1.4.1.5040.1.2.16", - ".1.3.6.1.4.1.5040.1.2.18" ] + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5040.1.2.") def parse_wut_webtherm(info): @@ -52,14 +43,14 @@ def parse_wut_webtherm(info): # declare more sensor types here. if "---" not in reading: # We have only temperature sensors - if webtherm_type == "6": + if int(webtherm_type) <= 9: # TODO: this is just a guess parsed[sensor_id] = { "type" : "temp", "reading" : float(reading), } # Here we have three different types of sensors: # 1 = temp, 2 = humid, 3 = air pressure - elif webtherm_type == "16": + else: parsed[sensor_id] = { "type" : map_sensor_type[sensor_id], "reading" : float(reading),

8 years, 8 months

Fixed scaling of ping levels in new metrics

by Lars Michelsen

Module: check_mk Branch: master Commit: 0ba05fa94204e6fe991f913f8953da3322b6b999 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ba05fa94204e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 14:54:50 2015 +0200 Fixed scaling of ping levels in new metrics --- web/plugins/metrics/check_mk.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index a7db95f..aeab587 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2636,14 +2636,16 @@ metric_info["managed_object_count"] = { # '----------------------------------------------------------------------' check_metrics["check-mk-ping"] = { - "rta" : { "scale" : m } + "rta" : { "scale" : m }, + "rtmax" : { "scale" : m }, + "rtmin" : { "scale" : m }, } check_metrics["check-mk-ping-cluster"] = { - "~.*rta": { "name" : "rta" }, - "~.*pl": { "name" : "pl" }, - "~.*rtmax": { "name" : "rtmax" }, - "~.*rtmin": { "name" : "rtmin" }, + "~.*rta" : { "name" : "rta", "scale": m }, + "~.*pl" : { "name" : "pl", "scale": m }, + "~.*rtmax" : { "name" : "rtmax", "scale": m }, + "~.*rtmin" : { "name" : "rtmin", "scale": m }, } check_metrics["check_mk_active-mail_loop"] = {

8 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015