Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: renamed: agent_vsphere (old version) to agent_vsphere.pysphere

by Andreas Boesl

Module: check_mk Branch: master Commit: c200bc53d77ddd3cdd08dc72bd0089da66eac598 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c200bc53d77ddd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 16 14:30:57 2013 +0200 renamed: agent_vsphere (old version) to agent_vsphere.pysphere --- agents/special/agent_vsphere.pysphere | 741 +++++++++++++++++++++++++++++++++ 1 file changed, 741 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c200bc53d7…

11 years

Check_MK Git: check_mk: man page for new sql check

by Götz Golla

Module: check_mk Branch: master Commit: 8f258a6bea1d496f4640359fe6a42bf36f1b3371 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f258a6bea1d49… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 16 14:05:04 2013 +0200 man page for new sql check --- checkman/check_sql | 30 ++++++++++++++++++++++++++++++ doc/treasures/active_checks/check_sql | 21 ++++++++++++++------- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/checkman/check_sql b/checkman/check_sql new file mode 100644 index 0000000..e57b67d --- /dev/null +++ b/checkman/check_sql @@ -0,0 +1,30 @@ +title: SQL database request check +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This is an active check that connects to a database server, sends an sql + statement to that server, and checks for the following result: + + The query must return two columns, a number and a text, plus + optional performance data. + If upper and lower levels are given, the number is being checked + against these levels and the according state is being computed. + Otherwise the number ist treated as a Nagios state (0,1,2,3). + State, text and the optional performance data are being returned + + The check works with mysql, postgres and oracle databases using the + python drivers MySQLdb, psycopg2 and cx_Oracle. For cx_oracle the + oracle-instantclient needs to be installed as well, and the + LD_LIBRARY_PATH needs to be modified to point to the libclntsh.so of + that package. + + This check can be configured by Wato. + +perfdata: + Optionally one value: the third field of the database response.. + +installation: + + diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index e97848b..47a7212 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -143,12 +143,12 @@ try: db_connection = db.connect(host=opt_hostname, db=opt_name, \ user=opt_user, passwd=opt_password ) - elif opt_dbms == "odbc": - import pyodbc # odbc driver - db = odbc - db_connection = db.connect(DRIVER=opt_dbms, SERVER=opt_hostname, DATABASE=opt_name, \ - UID=opt_user, PWD=opt_password, CHARSET='UTF8' ) - + 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 + db_connection = db.connect(cstring) else: print "UNKNOWN - dbms not found" sys.exit(3) @@ -199,6 +199,13 @@ try: row = rows[0] number = float(row[0]) text = str(row[1]) + try: + perf = row[2] + except IndexError: + if opt_debug: + raise + perf = "" # no perf data + state = 0 if warn != [ None, None] or crit != [ None, None ]: if (warn[0] != None and warn[0] > number) or \ @@ -221,6 +228,6 @@ except Exception, e: sys.exit(3) result = ["OK", "WARN", "CRIT", "UNKNOWN" ][state] -print "%s - %s %s" % (result, number, text) +print "%s - %s %s %s" % (result, number, text, perf) sys.exit(state)

11 years

Check_MK Git: check_mk: call classic agent_vsphere. pysphere when --direct is not set. fixed handling of opt_hostname

by Andreas Boesl

Module: check_mk Branch: master Commit: fd87996f110b72ea9b4ea70028bb172a18edf63c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd87996f110b72… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 16 13:51:41 2013 +0200 call classic agent_vsphere.pysphere when --direct is not set. fixed handling of opt_hostname --- agents/special/agent_vsphere | 976 +++++++++++++++++------------------------- 1 file changed, 397 insertions(+), 579 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fd87996f11…

11 years

Check_MK Git: check_mk: Implemented new (faster) version of agent_vsphere

by Andreas Boesl

Module: check_mk Branch: master Commit: edd5faa3f9f47613523339e0888abb0825c37556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edd5faa3f9f476… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 16 13:57:05 2013 +0200 Implemented new (faster) version of agent_vsphere --- ChangeLog | 2 + agents/special/agent_vsphere.fast | 540 ------------------------------------- 2 files changed, 2 insertions(+), 540 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=edd5faa3f9…

11 years

Check_MK Git: check_mk: agent_vsphere.fast: improved robustness when regex sections are missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 96487faacacfab6b222823072604b69eb5e9d970 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96487faacacfab… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 16 13:10:10 2013 +0200 agent_vsphere.fast: improved robustness when regex sections are missing --- agents/special/agent_vsphere.fast | 2 ++ 1 file changed, 2 insertions(+) diff --git a/agents/special/agent_vsphere.fast b/agents/special/agent_vsphere.fast index 35cfe6e..70dced3 100755 --- a/agents/special/agent_vsphere.fast +++ b/agents/special/agent_vsphere.fast @@ -258,6 +258,8 @@ esx_name = "" import re def get_pattern(pattern, line): + if not line: + return [] p = re.compile(pattern) return p.findall(line)

11 years

Check_MK Git: check_mk: check_mk-ipmi.php: PNP template now displays correct units as delivered by the check plugin ( more generic approach now)

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: b15c72b033483edf40c9eb3ec588423c4847705d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b15c72b033483e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 16 12:26:22 2013 +0200 check_mk-ipmi.php: PNP template now displays correct units as delivered by the check plugin (more generic approach now) --- ChangeLog | 4 ++-- pnp-templates/check_mk-ipmi.php | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7139d8d..9027c3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,8 +92,8 @@ currently supported: temperature, humidity, switch contact and smoke sensors * cisco_wlc_client: now supports low/high warn and crit levels * cisco_wlc: now supports configuration options for missing AP - * FIX: check_mk-ipmi.php: PNP template for Power_Meter now displays correct - unit (Watts) + * FIX: check_mk-ipmi.php: PNP template now displays correct units as delivered + by the check plugin Notifications: diff --git a/pnp-templates/check_mk-ipmi.php b/pnp-templates/check_mk-ipmi.php index 462e179..92130b2 100644 --- a/pnp-templates/check_mk-ipmi.php +++ b/pnp-templates/check_mk-ipmi.php @@ -23,18 +23,24 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -if (substr($NAME[1], 0, 11) == 'Power_Meter') { - $vlabel = "--vertical-label 'Watts'"; -} elseif (substr($NAME[1], 0, 4) == 'Temp') { +if ($UNIT[1] == 'degrees_C') { + $unit = "°C"; $vlabel = "--vertical-label 'Celsius'"; -} else { +} elseif ($UNIT[1] == 'unspecified') { + $unit = ""; $vlabel = ""; +} else { + $unit = $UNIT[1]; + $vlabel = "--vertical-label '$UNIT[1]'"; } -$opt[1] = "$vlabel -l0 -u60 --title \"IPMI sensor $NAME[1] / $hostname\" "; +$opt[1] = "$vlabel -l0 --title \"IPMI sensor $NAME[1] / $hostname\" "; $def[1] = "DEF:value=$RRDFILE[1]:$DS[1]:MAX "; -$def[1] .= "AREA:value#ffd040:\"Sensor $NAME[1] \\n\" "; +$def[1] .= "AREA:value#ffd040:\"Sensor $NAME[1]\" "; $def[1] .= "LINE:value#ff8000 "; +$def[1] .= "GPRINT:value:LAST:\"%6.2lf $unit last\" " ; +$def[1] .= "GPRINT:value:AVERAGE:\"%6.2lf $unit avg\" " ; +$def[1] .= "GPRINT:value:MAX:\"%6.2lf $unit max\\n\" "; ?>

11 years

Check_MK Git: check_mk: Updated bug entries #0952

by Mathias Kettner

Module: check_mk Branch: master Commit: de302a6698cb9519c17922c01eead328abc42267 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de302a6698cb95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 16 11:36:04 2013 +0200 Updated bug entries #0952 --- .bugs/952 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/952 b/.bugs/952 new file mode 100644 index 0000000..c7f4078 --- /dev/null +++ b/.bugs/952 @@ -0,0 +1,14 @@ +Title: Livestatus: parse DOWNTIMESTOPPED (UP) into correct state UP +Component: livestatus +State: open +Date: 2013-09-16 11:34:56 +Targetversion: 1.4.0 +Class: nastiness + +When parsing lines like: + +[1379282400] HOST NOTIFICATION: mk;Lehrerrechner;check-mk-notify;DOWNTIMESTOPPED (UP);mk + +Livestatus sets 3 as the state (meaning invalid). It should extract the (UP) however +and set the state 0. +

11 years

Check_MK Git: check_mk: Multisite: fix state column in log view if state is invalid

by Mathias Kettner

Module: check_mk Branch: master Commit: 5ffb06cf45213d28c728719397f7afb34aa9aa1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ffb06cf45213d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 16 11:34:45 2013 +0200 Multisite: fix state column in log view if state is invalid --- web/htdocs/lib.py | 4 ++-- web/plugins/views/painters.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index f37ba2e..ce752f8 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -33,8 +33,8 @@ except: pass -nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } -nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } +nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN" } +nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN" } nagios_short_host_state_names = { 0: "UP", 1: "DOWN", 2: "UNREACH" } class MKGeneralException(Exception): diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 02614f0..5cc842c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -281,7 +281,7 @@ multisite_painters["sitealias"] = { def paint_service_state_short(row): if row["service_has_been_checked"] == 1: state = str(row["service_state"]) - name = nagios_short_state_names[row["service_state"]] + name = nagios_short_state_names.get(row["service_state"], "") else: state = "p" name = "PEND" @@ -293,7 +293,9 @@ def paint_host_state_short(row): # return None, str(row) if row["host_has_been_checked"] == 1: state = row["host_state"] - name = nagios_short_host_state_names[row["host_state"]] + # A state of 3 is sent by livestatus in cases where no normal state + # information is avaiable, e.g. for "DOWNTIMESTOPPED (UP)" + name = nagios_short_host_state_names.get(row["host_state"], "") else: state = "p" name = "PEND"

11 years

Check_MK Git: check_mk: New option for painting timestamp: as Unix Epoch time

by Mathias Kettner

Module: check_mk Branch: master Commit: 04477a40268dc519117e999bda4ef4a66444e585 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04477a40268dc5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 16 11:18:01 2013 +0200 New option for painting timestamp: as Unix Epoch time --- ChangeLog | 1 + web/plugins/views/painters.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7139d8d..2178687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -161,6 +161,7 @@ To make the sidebar check for new messages on a regular base, you need to configure the interval of sidebar popup notification updates e.g. via WATO Global Settings. + * New option for painting timestamp: as Unix Epoch time * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 95bb8d0..02614f0 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -90,6 +90,7 @@ multisite_painter_options["ts_format"] = { ("abs", _("Absolute")), ("rel", _("Relative")), ("both", _("Both")), + ("epoch", _("Unix Timestamp (Epoch)")), ] } @@ -214,6 +215,9 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None): if mode == None: mode = get_painter_option("ts_format") + if mode == "epoch": + return "", str(int(timestamp)) + if mode == "both": css, h1 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "abs") css, h2 = paint_age(timestamp, has_been_checked, bold_if_younger_than, "rel")

11 years

Check_MK Git: check_mk: Updated bug entries #1052

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ae048842dcac8bc8e85b5519c07896e8fe207f72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae048842dcac8b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Sep 16 08:57:44 2013 +0200 Updated bug entries #1052 --- .bugs/1052 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/1052 b/.bugs/1052 new file mode 100644 index 0000000..e89f6e8 --- /dev/null +++ b/.bugs/1052 @@ -0,0 +1,16 @@ +Title: CUPS print queue monitoring: Default Printer is not checked / inventorized +Component: checks +State: open +Date: 2013-09-16 08:52:34 +Targetversion: 1.2.3i2 +Class: bug + +after a change in the linux agent, all printers are monitored / inventorized +except the default printer, having a +<DefaultPrinter sw> +section in /etc/cups/printers.conf + +execution time optimization can be done within the change: +lpstat -a +command should not be executed twice, but only once +(whereas the lpstat -p and lpstat -o commands can be done once per printer)

11 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013