Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: check_sql: Database port can now be explicitly set; Wato fields for Username and Password added

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: dd44b1bd3d6cb8323ebc1c222b2c67a80603281b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd44b1bd3d6cb8… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Oct 14 16:16:44 2013 +0200 check_sql: Database port can now be explicitly set; Wato fields for Username and Password added --- ChangeLog | 1 + checks/check_sql | 7 ++++++- doc/treasures/active_checks/check_sql | 26 ++++++++++++++++++-------- web/plugins/wato/active_checks.py | 14 +++++++++++++- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ebc0c5..c3b6959 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * ucd_cpu_load: support predictive levels * hpux_cpu, blade_bx_load: support predictive levels, add perf-o-meter, make WATO-configable + * check_sql: Database port can now be explicitly set WATO: * You can now have site-specific global settings when using diff --git a/checks/check_sql b/checks/check_sql index 9018cf3..54a1bca 100644 --- a/checks/check_sql +++ b/checks/check_sql @@ -25,9 +25,14 @@ # Boston, MA 02110-1301 USA. def check_sql_arguments(params): - args = " -H '$HOSTNAME$'" + args = " --hostname '$HOSTNAME$'" args += " --dbms %s" % quote_shell_string(params["dbms"]) args += " --name %s" % quote_shell_string(params["name"]) + args += " --user '%s'" % params["user"] + args += " --password '%s'" % params["password"] + + if "port" in params: + args += " --port %s" % params["port"] if "levels" in params: upper = params["levels"] diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 4b9954e..3e90ba5 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -46,6 +46,7 @@ OPTIONS: Default is 'postgres', other valid values are 'mysql' and 'oracle' -H HOST, --hostname HOST Hostname or IP-Address where the database lives. Default is '127.0.0.1' + -P PORT, --port PORT Port used to connect to the database -n NAME, --name NAME Name of the database on the DBMS -w RANGE, --warning RANGE lower and upper level for the warning state, separated by a colon -c RANGE, --critical RANGE lower and upper level for the critical state, separated by a colon @@ -65,10 +66,10 @@ def saverfloat(f): # # defining and collection input parameters # -short_options = 'hu:p:d:n:H:w:c:v' +short_options = 'hu:p:d:n:H:P:w:c:v' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', - 'debug', 'verbose' + 'port=', 'debug', 'verbose' ] try: @@ -85,6 +86,7 @@ opt_name = None opt_user = opt_dbms opt_password = None opt_hostname = "127.0.0.1" +opt_port = None opt_sql = None warn = [ None, None ] crit = [ None, None ] @@ -105,6 +107,8 @@ try: opt_password = a elif o in [ '-H', '--hostname' ]: opt_hostname = a + elif o in [ '-P', '--port' ]: + opt_port = int(a) elif o in [ '-w', '--warning' ]: warn = map(saverfloat,a.split(":",2)) elif o in [ '-c', '--critical' ]: @@ -134,20 +138,26 @@ try: if opt_dbms == "postgres": import psycopg2 # postgres driver db = psycopg2 - db_connection = db.connect(host=opt_hostname, database=opt_name, \ - user=opt_user, password=opt_password ) + if opt_port == None: + opt_port=5432 + db_connection = db.connect(host=opt_hostname, port=opt_port, \ + database=opt_name, user=opt_user, password=opt_password ) elif opt_dbms == "mysql": import MySQLdb # mysql driver db = MySQLdb - db_connection = db.connect(host=opt_hostname, db=opt_name, \ - user=opt_user, passwd=opt_password ) + if opt_port == None: + opt_port=3306 + db_connection = db.connect(host=opt_hostname, port=opt_port, \ + db=opt_name, user=opt_user, passwd=opt_password ) elif opt_dbms == "oracle": sys.path.append('/usr/lib/python2.7/site-packages') import cx_Oracle db = cx_Oracle - cstring = opt_user+"/"+opt_password+"@"+opt_hostname+"/"+opt_name + if opt_port == None: + opt_port=1521 + cstring = opt_user+"/"+opt_password+"@"+opt_hostname+":"+opt_port+"/"+opt_name db_connection = db.connect(cstring) else: print "UNKNOWN - dbms not found" @@ -216,7 +226,7 @@ try: state = 2 else: if number in [ 0 ,1 ,2 ,3 ]: - state = number + state = int(number) else: print "UNKNOWN - <%s> is not a state, and no levels given" % str(number) sys.exit(3) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index a622d4f..c25ccc7 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -160,7 +160,7 @@ register_rule(group, "number, a text, and performance data. Upper or lower levels may be defined " "here. If they are not defined the number is taken as the state of the check." "This check uses the active check <tt>check_sql</tt>."), - optional_keys = [ "levels", "levels_low", "perfdata" ], + optional_keys = [ "levels", "levels_low", "perfdata", "port" ], elements = [ ( "description", TextUnicode(title = _("Service Description"), @@ -178,6 +178,10 @@ register_rule(group, default_value = "mysql", ), ), + ( "port", + Integer(title = _("Database Port"), allow_empty = True, + help = _('The port the DBMS listens to')) + ), ( "name", TextAscii(title = _("Database Name"), allow_empty = False, help = _('The name of the database on the DBMS')) @@ -186,6 +190,14 @@ register_rule(group, TextAscii(title = _("SQL-Statement"), allow_empty = False, help = _('The SQL-Statement which is sent to the DBMS')) ), + ( "user", + TextAscii(title = _("Database User"), allow_empty = False, + help = _('The username used to connect to the database')) + ), + ( "password", + Password(title = _("Database Password"), allow_empty = False, + help = _('The password used to connect to the database')) + ), ( "levels", Tuple( title = _("Upper levels for first output item"),

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0940

by Andreas Boesl

Module: check_mk Branch: master Commit: 41d4056b997fdaab802973669eb98d132587d15b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41d4056b997fda… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 14 13:19:58 2013 +0200 Updated bug entries #0940 --- .bugs/940 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/940 b/.bugs/940 new file mode 100644 index 0000000..f493797 --- /dev/null +++ b/.bugs/940 @@ -0,0 +1,9 @@ +Title: rrdtoolmodule.so installed two times in ~/lib/ +Component: core +State: open +Date: 2013-10-14 13:17:24 +Targetversion: future +Class: nastiness + +The file rrdtoolmodule.so is installed in ~/lib/python (good) +and also installed in ~/lib/python2.7/site-packages (bad)

10 years, 11 months

Check_MK Git: check_mk: cpu checks: fixed incorrect check_info includes key

by Andreas Boesl

Module: check_mk Branch: master Commit: d32119e3a0ab2bb3108b10a4fc3188e98c951c82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d32119e3a0ab2b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 14 12:41:03 2013 +0200 cpu checks: fixed incorrect check_info includes key --- checks/blade_bx_load | 2 +- checks/cpu | 2 +- checks/hpux_cpu | 2 +- checks/statgrab_load | 2 +- checks/ucd_cpu_load | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/blade_bx_load b/checks/blade_bx_load index d4b12cb..1c5afe5 100644 --- a/checks/blade_bx_load +++ b/checks/blade_bx_load @@ -46,5 +46,5 @@ check_info['blade_bx_load'] = { "snmp_info" : (".1.3.6.1.4.1.2021.10.1", [ 1, 2, 6 ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), "group" : "cpu_load", - "includes" : "cpu_load.include", + "includes" : ["cpu_load.include"], } diff --git a/checks/cpu b/checks/cpu index 8f23011..2cf4933 100644 --- a/checks/cpu +++ b/checks/cpu @@ -69,7 +69,7 @@ check_info["cpu.loads"] = { "service_description" : "CPU load", "has_perfdata" : True, "group" : "cpu_load", - "includes" : "cpu_load.include", + "includes" : ["cpu_load.include"], } check_info["cpu.threads"] = { diff --git a/checks/hpux_cpu b/checks/hpux_cpu index 8d083cc..8401ffc 100644 --- a/checks/hpux_cpu +++ b/checks/hpux_cpu @@ -51,5 +51,5 @@ check_info["hpux_cpu"] = { 'service_description': 'CPU load', 'has_perfdata': True, "group": "cpu_load", - "includes": "cpu_load.include", + "includes": ["cpu_load.include"], } diff --git a/checks/statgrab_load b/checks/statgrab_load index c6d7902..be8dc73 100644 --- a/checks/statgrab_load +++ b/checks/statgrab_load @@ -48,5 +48,5 @@ check_info["statgrab_load"] = { 'service_description': 'CPU load', 'has_perfdata': True, 'group': 'cpu_load', - "includes" : "cpu_load.include", + "includes": ["cpu_load.include"], } diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index bafc96b..65b3019 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -51,5 +51,5 @@ check_info["ucd_cpu_load"] = { "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0"), 'group': 'cpu_load', - "includes" : "cpu_load.include", + "includes": ["cpu_load.include"], }

10 years, 11 months

Check_MK Git: check_mk: psperf.bat/ps: Plugin output processing no longer crashes when

by Andreas Boesl

Module: check_mk Branch: master Commit: e304efa97bbd10300e8e3cae84cf48a040034fe3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e304efa97bbd10… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 14 11:58:39 2013 +0200 psperf.bat/ps: Plugin output processing no longer crashes when the ps service is clustered --- ChangeLog | 2 ++ agents/windows/plugins/psperf.bat | 1 + checks/ps | 23 ++++++++++++++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d82de5..1ebc0c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,8 @@ * FIX: check_mk_agent.linux: limit Livestatus check to 3 seconds * FIX: esx_vsphere_vm: fixed exception when memory info for vm is missing * FIX: esx_vsphere_hostsystem: Fixed typo in check output + * FIX: psperf.bat/ps: Plugin output processing no longer crashes when + the ps service is clustered Multisite: * Filtering in views by Hostalias is possible now too diff --git a/agents/windows/plugins/psperf.bat b/agents/windows/plugins/psperf.bat index a9fdbc9..d793112 100644 --- a/agents/windows/plugins/psperf.bat +++ b/agents/windows/plugins/psperf.bat @@ -5,3 +5,4 @@ rem directly supported by the normal ps check. echo ^<^<^<ps:sep^(44^)^>^>^> echo [wmic process] wmic process get ProcessId,name,pagefileusage,virtualsize,workingsetsize,usermodetime,kernelmodetime,ThreadCount /format:csv +echo [wmic process end] \ No newline at end of file diff --git a/checks/ps b/checks/ps index 6d7d705..a18d1d2 100644 --- a/checks/ps +++ b/checks/ps @@ -74,17 +74,22 @@ def ps_parse_info(info): wmic_info = {} cpu_cores = 1 try: + is_wmic = False while True: line = lines.next() if line[-1] == '[wmic process]': - break - result.append(line) - # part of wmic data - headers = ["node"] + lines.next()[1:] - while True: - row = dict(zip(headers, lines.next())) - wmic_info[(row["node"], row["Name"])] = row - + is_wmic = True + wmic_headers = ["node"] + lines.next()[1:] + continue + elif line[-1] == '[wmic process end]': + is_wmic = False + continue + + if not is_wmic: + result.append(line) + else: + row = dict(zip(wmic_headers, line)) + wmic_info[(row["node"], row["Name"])] = row except StopIteration: pass @@ -96,7 +101,7 @@ def ps_parse_info(info): psinfo = wmic_info.get(tuple(line)) # Get number of CPU cores from system idle process if psinfo: - if "ThreadCount" in headers and psinfo["Name"].lower() == "system idle process": + if "ThreadCount" in wmic_headers and psinfo["Name"].lower() == "system idle process": cpucores = int(psinfo["ThreadCount"]) pid = int(psinfo["ProcessId"]) if pid not in seen_pids:

10 years, 11 months

Check_MK Git: check_mk: FIX: Fixed encoding problem in webservice column output

by Lars Michelsen

Module: check_mk Branch: master Commit: 3fbe5e78e91c9c2dab1cb4199cb0c153e1766394 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3fbe5e78e91c9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 14 08:55:03 2013 +0200 FIX: Fixed encoding problem in webservice column output --- ChangeLog | 1 + web/plugins/views/webservice.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd166d5..4d82de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * Speed-O-Meter: now measure only service checks. Host checks are omitted, since they do not really matter and make the results less useful when using CMC. + * FIX: Fixed encoding problem in webservice column output Checks & Agents: * diskstat: removed (ever incorrect) latency computation for Linux diff --git a/web/plugins/views/webservice.py b/web/plugins/views/webservice.py index a4e9561..f25e424 100644 --- a/web/plugins/views/webservice.py +++ b/web/plugins/views/webservice.py @@ -93,10 +93,13 @@ def render_json(rows, view, group_painters, painters, num_columns, show_checkbox else: html.write(",") tdclass, content = paint_painter(p[0], row) - content = str(content).replace("<br>","\n") + if type(content) == unicode: + content = content.encode("utf-8") + else: + content = str(content) + content = content.replace("<br>","\n") stripped = html.strip_tags(content) - utf8 = stripped.encode("utf-8") - html.write(encode_string_json(utf8)) + html.write(encode_string_json(content)) html.write("]") html.write("\n]\n")

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0938

by Mathias Kettner

Module: check_mk Branch: master Commit: 69d911af409be21e7671762ad0c0bebaab28943b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69d911af409be2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 01:00:23 2013 +0200 Updated bug entries #0938 --- .bugs/938 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/938 b/.bugs/938 index e115d35..9e4227f 100644 --- a/.bugs/938 +++ b/.bugs/938 @@ -1,11 +1,14 @@ Title: snmp check without inventory Component: checks -State: open +Class: bug +State: done Date: 2013-09-10 15:06:00 Targetversion: 1.2.3i2 -Class: bug The snmp_scan_function needs to be set in order to complete a cmk -II call. Otherwise the inventory process exits with Sorry. No inventory possible for check type etherbox_dew and other checks are skipped + +2013-10-14 01:00:17: changed state open -> done +Fixed.

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0959

by Mathias Kettner

Module: check_mk Branch: master Commit: f87e074af3ec264689d08fe77c4db17f67a32f01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87e074af3ec26… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 01:07:12 2013 +0200 Updated bug entries #0959 --- .bugs/959 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.bugs/959 b/.bugs/959 index 86aaea5..f5aa041 100644 --- a/.bugs/959 +++ b/.bugs/959 @@ -1,13 +1,10 @@ -Title: Livestatus/Nagios Core crashes, if nagios.log is not accessible +Title: Livestatus/Nagios Core crashes, if nagios.log is too large Component: livestatus State: open Date: 2013-08-08 11:30:12 Targetversion: future Class: bug -vermutlich ist das die falsche Mailadresse, um Vorschläger oder Probleme -zu melden. Aber ich habe keine passende(re) gefunden. - In Benutzung war: Nagios 3.3, Check_MK check_mk-1.2.2p2 sowie mk-livestatus-1.2.2p2 auf einem Centos 5.5. @@ -23,3 +20,8 @@ Fehlermeldung bzw. ein Eintrag in der Dokumentation angepasst werden könnten. Der Fehler ist in gewisser Weise selbst verschuldet, jedoch war es nicht leicht, die Ursache zu finden. +Lösung: Eventuell müssen wir die maximale Anzahl von Logzeilen, +die wir untersuchen, beschränken. Wenn man z.B. sagt max. +5 Mio Zeilen festlegt, dann sind dass etwa 500 MB Dateigröße. +Das ganze könnte konfigurierbar sein, analog zu den schon +vorhandenen Caching-Optionen.

10 years, 11 months

Check_MK Git: check_mk: Reclassify some inventory output verbose -> debug

by Mathias Kettner

Module: check_mk Branch: master Commit: ddd0c8d1ee63989f7b227c59d35b5621fadcf747 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd0c8d1ee6398… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 01:01:30 2013 +0200 Reclassify some inventory output verbose -> debug --- modules/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9602144..9c6d5ff 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4660,7 +4660,7 @@ def do_cleanup_autochecks(): for host, lines in hostdata.items(): lines.sort() fn = host.replace(":","_") + ".mk" - if opt_verbose: + if opt_debug: sys.stdout.write("Writing %s: %d checks\n" % (fn, len(lines))) newfiles.add(fn) f = file(fn, "w+") @@ -4672,7 +4672,7 @@ def do_cleanup_autochecks(): # 3. Remove obsolete files for f in glob.glob("*.mk"): if f not in newfiles: - if opt_verbose: + if opt_debug: sys.stdout.write("Deleting %s\n" % f) os.remove(f)

10 years, 11 months

Check_MK Git: check_mk: FIX: continue inventory, if one check does not support it

by Mathias Kettner

Module: check_mk Branch: master Commit: d3922e17d08c714b903ee649eae47db15c0c1650 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3922e17d08c71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 01:01:01 2013 +0200 FIX: continue inventory, if one check does not support it --- ChangeLog | 1 + modules/check_mk.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcf96ea..bd166d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * FIX: inventory check now honors settings for exit code * FIX: avoid exception nodes of cluster have different agent type + * FIX: continue inventory, if one check does not support it Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk.py b/modules/check_mk.py index 990303f..9602144 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -381,8 +381,9 @@ except Exception, e: # those checks that do not support inventory. It must be known before # we read in all the checks def no_inventory_possible(checkname, info): - sys.stderr.write("Sorry. No inventory possible for check type %s.\n" % checkname) - sys.exit(3) + if opt_verbose: + sys.stdout.write("%s does not support inventory. Skipping it.\n" % checkname) + return [] # +----------------------------------------------------------------------+

10 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0896

by Mathias Kettner

Module: check_mk Branch: master Commit: 59f4c6e2ad93a269c7b372cf7a8b3ebaa1d157bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59f4c6e2ad93a2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 13 21:45:53 2013 +0200 Updated bug entries #0896 --- .bugs/896 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/896 b/.bugs/896 index 51934e3..8fe5b41 100644 --- a/.bugs/896 +++ b/.bugs/896 @@ -1,10 +1,14 @@ Title: Perf-O-Meter of oracle_tablespaces broken Component: checks -State: open +Class: bug +State: works4me Date: 2013-06-26 11:59:45 Targetversion: 1.2.3 -Class: bug Perfdata is e.g. size=709911117824;652298158080;688536944640;; used=663243390976;;;; max_size=724775731200;;;; Checkouput look OK (size 661.16GB, used 617.69GB, max 675.00GB) Perfometer show 709911117824% + +2013-10-13 21:42:58: changed state open -> works4me +Everything seems to be in perfect order here. Also +tests are flawless.

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits