Checkmk git commits July 2014

checkmk-commits@lists.checkmk.com

7 participants
221 discussions

Check_MK Git: check_mk: 1050 FIX websphere_mq_queues: make compatible with old agent, fix not-found case

by Mathias Kettner

Module: check_mk Branch: master Commit: a3f2496e8e4d2c267c98d7ad80de45d417ec0b00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3f2496e8e4d2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 15:49:02 2014 +0200 1050 FIX websphere_mq_queues: make compatible with old agent, fix not-found case --- .werks/1050 | 8 ++++++++ ChangeLog | 1 + checks/websphere_mq_queues | 35 +++++++++++++++++++++++++--------- web/plugins/wato/check_parameters.py | 4 ++-- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.werks/1050 b/.werks/1050 new file mode 100644 index 0000000..74fb9ff --- /dev/null +++ b/.werks/1050 @@ -0,0 +1,8 @@ +Title: websphere_mq_queues: make compatible with old agent, fix not-found case +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406209719 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 348e787..68f6b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 1087 FIX: Active checks: Non-ascii check commands now converted into utf-8... * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine + * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 087c118..00f7239 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -24,12 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#<<<websphere_mq_queues>>> -#0 CD.ISS.CATSOS.REPLY.C000052 5000 -#0 CD.ISS.COBA.REPLY.C000052 5000 -#0 CD.ISS.DEUBA.REPLY.C000052 5000 -#0 CD.ISS.TIQS.REPLY.C000052 5000 -#0 CD.ISS.VWD.REPLY.C000052 5000 +# <<<websphere_mq_queues>>> +# 0 CD.ISS.CATSOS.REPLY.C000052 5000 +# 0 CD.ISS.COBA.REPLY.C000052 5000 +# 0 CD.ISS.DEUBA.REPLY.C000052 5000 +# 0 CD.ISS.TIQS.REPLY.C000052 5000 +# 0 CD.ISS.VWD.REPLY.C000052 5000 + +# Old output +# <<<websphere_mq_queues>>> +# 0 CD.ISS.CATSOS.REPLY.C000052 +# 0 CD.ISS.COBA.REPLY.C000052 +# 0 CD.ISS.DEUBA.REPLY.C000052 +# 0 CD.ISS.TIQS.REPLY.C000052 +# 0 CD.ISS.VWD.REPLY.C000052 websphere_mq_queues_default_levels = ( 1000, 1200 ) @@ -37,11 +45,18 @@ def inventory_websphere_mq_queues(info): return [ ( x[1], 'websphere_mq_queues_default_levels' ) for x in info ] def check_websphere_mq_queues(item, params, info): - for messages, queue, queue_length in info: + for line in info: + queue = line[1] if queue == item: + messages = int(line[0]) + if len(line) >= 3: + queue_length = int(line[2]) + length_info = "/%d" % queue_length + else: + length_info = "" + message = "%d%s messages in queue" % ( messages, length_info ) + warn, crit = params - messages = saveint(messages) - message = "%d/%s Messages in Queue" % ( messages, queue_length ) perf = [ ( "queue", messages, warn, crit ) ] if messages >= crit: return 2, message, perf @@ -49,6 +64,8 @@ def check_websphere_mq_queues(item, params, info): return 1, message, perf return 0, message, perf + return 3, "No message queue named %s in agent output" % item + check_info["websphere_mq_queues"] = { "group" : "websphere_mq", "check_function" : check_websphere_mq_queues, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2b49628..3f5fee7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -530,8 +530,8 @@ register_check_parameters( Tuple( title = _('Maximum number of messages'), elements = [ - Integer(title = _("Warning if above") ), - Integer(title = _("Critical if above") ), + Integer(title = _("Warning if above"), default_value = 1000 ), + Integer(title = _("Critical if above"), default_value = 1200 ), ] ), TextAscii(title = _("Name of Channel or Queue")),

10 years, 1 month

Check_MK Git: check_mk: Fixed missing space in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: 32ef11a0877057b0e1c4317606e375a9e1d80737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32ef11a0877057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 14:38:24 2014 +0200 Fixed missing space in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 654504b..f6e8637 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1092,7 +1092,7 @@ register_configvar(group, ), title = _("Log exceptions in check plugins"), help = _("If this option is enabled Check_MK will create a debug logfile at " - "<tt>%s/chrashed-checks.log</tt>" + "<tt>%s/chrashed-checks.log</tt> " "containing details about failed checks (those which have the state <i>UNKNOWN " "and the output UNKNOWN - invalid output from plugin</i>...) Per default no " "logfile is written.") % defaults.log_dir,

10 years, 1 month

Check_MK Git: check_mk: Removed *lots* of trailing spaces, also in agent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: d7cbcce36ab871d1499cfd940a2370a6c46d5949 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7cbcce36ab871… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 14:25:21 2014 +0200 Removed *lots* of trailing spaces, also in agent plugins --- Makefile | 21 +++++++++++---------- agents/check_mk_agent.aix | 14 +++++++------- agents/check_mk_agent.freebsd | 8 ++++---- agents/check_mk_agent.hpux | 4 ++-- agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.macosx | 6 +++--- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 4 ++-- agents/check_mk_agent.solaris | 4 ++-- agents/plugins/dmraid | 2 +- agents/plugins/jar_signature | 4 ++-- agents/plugins/mk_inventory.aix | 8 ++++---- agents/plugins/mk_inventory.linux | 4 ++-- agents/plugins/mk_jolokia | 2 +- agents/plugins/mk_logwatch | 10 +++++----- agents/plugins/mk_oracle | 14 +++++++------- agents/plugins/mk_sap | 2 +- agents/plugins/mk_tsm | 6 +++--- agents/plugins/nfsexports | 2 +- agents/plugins/plesk_backups | 6 +++--- agents/plugins/smart | 4 ++-- agents/plugins/sylo | 4 ++-- agents/plugins/unitrends_backup.php | 18 +++++++++--------- agents/plugins/unitrends_replication.py | 2 +- agents/plugins/veritas/vxvm_multipath | 4 ++-- agents/plugins/veritas/vxvm_objstatus | 2 +- agents/plugins/websphere_mq.sh | 8 ++++---- checkman/aix_memory | 2 +- checkman/allnet_ip_sensoric.humidity | 2 +- checkman/allnet_ip_sensoric.temp | 2 +- checkman/allnet_ip_sensoric.tension | 2 +- checkman/bintec_sensors.fan | 2 +- checkman/bintec_sensors.temp | 2 +- checks/aix_memory | 2 +- checks/hp_proliant_power | 2 +- checks/logwatch | 4 ++-- checks/sentry_pdu | 6 +++--- modules/check_mk.py | 6 +++--- pnp-templates/check_mk-bintec_sensors.fan.php | 4 ++-- pnp-templates/check_mk-if.php | 6 +++--- web/plugins/views/filters.py | 6 +++--- web/plugins/wato/active_checks.py | 4 ++-- web/plugins/wato/check_parameters.py | 14 +++++++------- 43 files changed, 119 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7cbcce36a…

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2138

by Lars Michelsen

Module: check_mk Branch: master Commit: dcfffd71dc419a03bb723bad99b1fa8fe1699b45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcfffd71dc419a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 13:11:57 2014 +0200 Updated bug entries #2138 --- .bugs/2138 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2138 b/.bugs/2138 new file mode 100644 index 0000000..12411a9 --- /dev/null +++ b/.bugs/2138 @@ -0,0 +1,12 @@ +Title: Multisite does handle state, has_been_checked and initial_state wrong +Component: multisite +State: open +Date: 2014-07-24 13:10:32 +Targetversion: future +Class: bug + +When a host/service has an initial_state configured and the host/service has +never been checked, it is always shown as pending host/service. The initial +state is not handled by multisite. + +Livestatus provides the correct information.

10 years, 1 month

Check_MK Git: check_mk: 1063 SEC Fixed several XSS issues on different pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 24436ace2fe9a21790d0e9eec14ee14cd2e80050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24436ace2fe9a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 12:54:19 2014 +0200 1063 SEC Fixed several XSS issues on different pages Several pages like views and prediction pages missed to escape user provided values before writing them back on the pages. --- .werks/1062 | 9 +++++++++ .werks/1063 | 9 +++++++++ ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/plugins/views/commands.py | 2 +- web/plugins/views/painters.py | 2 +- werk | 2 +- 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/1062 b/.werks/1062 new file mode 100644 index 0000000..a6153e1 --- /dev/null +++ b/.werks/1062 @@ -0,0 +1,9 @@ +Title: Fixed several XSS issues on different pages +Level: 2 +Component: multisite +Version: 1.2.5i5 +Date: 1406198826 +Class: security + +Some pages, like the views and prediction pages missed to escape values +provided by the user. diff --git a/.werks/1063 b/.werks/1063 new file mode 100644 index 0000000..c09be24 --- /dev/null +++ b/.werks/1063 @@ -0,0 +1,9 @@ +Title: Fixed several XSS issues on different pages +Level: 2 +Component: multisite +Version: 1.2.5i5 +Date: 1406199218 +Class: security + +Several pages like views and prediction pages missed to escape user +provided values before writing them back on the pages. diff --git a/ChangeLog b/ChangeLog index c06a11f..348e787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,8 @@ * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... * 1085 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view... * 1047 Virtual Host Tree: Allow to use topic as tree level... + * 1062 SEC: Fixed several XSS issues on different pages... + * 1063 SEC: Fixed several XSS issues on different pages... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output * 1074 FIX: Fix Virtual Host Tree snapin... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index afde184..be17fff 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -746,7 +746,7 @@ class html: self.write('<table class=header><tr><td width="*" class=heading>') self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % - (_("Reloading..."), title)) + (_("Reloading..."), self.attrencode(title))) def top_heading_right(self): cssclass = self.help_visible and "active" or "passive" diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 77a0595..a5461a0 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -157,7 +157,7 @@ def command_fake_checks(cmdtag, spec, row): for s in [0,1,2,3]: statename = html.var("_fake_%d" % s) if statename: - pluginoutput = _("Manually set to %s by %s") % (statename, config.user_id) + pluginoutput = _("Manually set to %s by %s") % (html.attrencode(statename), config.user_id) if cmdtag == "SVC": cmdtag = "SERVICE" command = "PROCESS_%s_CHECK_RESULT;%s;%s;%s" % (cmdtag, spec, s, pluginoutput) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b05e5e6..6b8e2bc 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1258,7 +1258,7 @@ def paint_host_group_memberlist(row): for group in row["host_groups"]: link = "view.py?view_name=hostgroup&hostgroup=" + group if html.var("display_options"): - link += "&display_options=%s" % html.var("display_options") + link += "&display_options=%s" % html.attrencode(html.var("display_options")) links.append('<a href="%s">%s</a>' % (link, group)) return "", ", ".join(links) diff --git a/werk b/werk index cc2db14..9f18bc5 100755 --- a/werk +++ b/werk @@ -249,7 +249,7 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) - title = werk["id"] + " " + title + title = "%d %s" % (werk['id'], title) if custom_files: files_to_commit = custom_files

10 years, 1 month

Check_MK Git: check_mk: Added werk-id to commit message

by Lars Michelsen

Module: check_mk Branch: master Commit: f1abef23034b03e3bf3dca6068fd0c075198d2ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1abef23034b03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 11:56:53 2014 +0200 Added werk-id to commit message --- werk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/werk b/werk index c002b9e..cc2db14 100755 --- a/werk +++ b/werk @@ -249,6 +249,8 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) + title = werk["id"] + " " + title + if custom_files: files_to_commit = custom_files default_files = [ ".werks", "ChangeLog" ]

10 years, 1 month

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 31abc22e88ad539e266af37bc0f848f1a7ddc979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31abc22e88ad53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 11:41:30 2014 +0200 Updated changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e3a48c8..c06a11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,9 +40,9 @@ * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers * 1048 mem.win: support predictive levels... * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers - * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0640 jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates * 1088 included check_mk_agent windows msi installer... + * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...

10 years, 1 month

Check_MK Git: check_mk: FIX SMS notifications: correctly handling spaces in phone numbers

by Lars Michelsen

Module: check_mk Branch: master Commit: a19011bb5904d804bb1a7b3864d69c8d40c17168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a19011bb5904d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 11:40:25 2014 +0200 FIX SMS notifications: correctly handling spaces in phone numbers A user might add a phone number with spaces, because the input is not validated (formalized). This is a quick fix to prevent sendsms to send messages to wrong numbers. --- .werks/1061 | 10 ++++++++++ ChangeLog | 3 ++- notifications/sms | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1061 b/.werks/1061 new file mode 100644 index 0000000..7da0ce0 --- /dev/null +++ b/.werks/1061 @@ -0,0 +1,10 @@ +Title: SMS notifications: correctly handling spaces in phone numbers +Level: 1 +Component: notifications +Version: 1.2.5i5 +Date: 1406194717 +Class: fix + +A user might add a phone number with spaces, because the input is +not validated (formalized). This is a quick fix to prevent sendsms +to send messages to wrong numbers. diff --git a/ChangeLog b/ChangeLog index 4f05f54..cb4a500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,8 @@ * 1133 qlogic_sanbox_fabric_element: New Check for Fabric Elements in QLogic SANbox Fibre Channel Switches * 1134 bintec_sensors.fan: New Check for Fan Speed of Bintec Routers * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers - * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers * 1048 mem.win: support predictive levels... + * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... @@ -94,6 +94,7 @@ Notifications: * 1042 Rule based notifications: allow matching on host groups... * 0828 FIX: Mails sent with mail/asciimail plugin now really set the from address + * 1061 FIX: SMS notifications: correctly handling spaces in phone numbers... Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... diff --git a/notifications/sms b/notifications/sms index 0a1dc82..ba310f2 100755 --- a/notifications/sms +++ b/notifications/sms @@ -54,7 +54,7 @@ if os.environ['NOTIFY_WHAT'] == 'SERVICE': else: message += "is " + os.environ['NOTIFY_HOSTSTATE'] -empf = os.environ['NOTIFY_CONTACTPAGER'] +empf = os.environ['NOTIFY_CONTACTPAGER'].replace( " ", "") if 0 == os.system("%s %s '%s'" % (send_path, empf, message[:160])): sys.exit(0) else:

10 years, 1 month

Check_MK Git: check_mk: raritan_pdu_plugs: Code cleanup

by Bastian Kuhn

Module: check_mk Branch: master Commit: d290b788f23250174091c348c6d5d9926c3a6d77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d290b788f23250… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 11:17:29 2014 +0200 raritan_pdu_plugs: Code cleanup --- checks/raritan_pdu_plugs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/checks/raritan_pdu_plugs b/checks/raritan_pdu_plugs index 8b7145b..cff7c3a 100644 --- a/checks/raritan_pdu_plugs +++ b/checks/raritan_pdu_plugs @@ -24,13 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -raritan_pdu_plugs_default = '"on"' +raritan_pdu_plugs_default = '"on"' # only to be downwards compatible and can be removed later. def inventory_raritan_pdu_plugs(info): inventory = [] for line in info: if saveint(line[0]) != 0: - inventory.append((line[0], raritan_pdu_plugs_default) ) + inventory.append((line[0], int(line[2])) ) return inventory def check_raritan_pdu_plugs(item, params, info): @@ -58,10 +58,11 @@ def check_raritan_pdu_plugs(item, params, info): outletLabel = line[0] # Outlet-Label (Index) (PDU identifier of the outlet) outletName = line[1] # OutletName (vergebene Bezeichnung für den Ausgang) outletState = int(line[2]) # The Outlet state at present (sh. outlet_state_info) - - if states[outletState] == required_state: - state = 0 - else: + state = 0 + if type(required_state) == int: + if outletState != required_state: + state = 2 + elif states[outletState] != required_state: state = 2 message = outletName + ": " + states[outletState]

10 years, 1 month

Check_MK Git: check_mk: sentry_pdu: New check to monitor plugs of sentry PDUs

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3bf97166bd44ccea17eea7f653726b48f000cb43 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bf97166bd44cc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 24 11:36:20 2014 +0200 sentry_pdu: New check to monitor plugs of sentry PDUs --- .werks/183 | 8 ++++ ChangeLog | 3 +- checkman/sentry_pdu | 18 +++++++++ checks/sentry_pdu | 73 ++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 13 +++--- web/plugins/wato/check_parameters.py | 3 +- 6 files changed, 111 insertions(+), 7 deletions(-) diff --git a/.werks/183 b/.werks/183 new file mode 100644 index 0000000..5e76128 --- /dev/null +++ b/.werks/183 @@ -0,0 +1,8 @@ +Title: sentry_pdu: New check to monitor plugs of sentry PDUs +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406194542 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4f05f54..34be56d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,8 +38,9 @@ * 1133 qlogic_sanbox_fabric_element: New Check for Fabric Elements in QLogic SANbox Fibre Channel Switches * 1134 bintec_sensors.fan: New Check for Fan Speed of Bintec Routers * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers - * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers * 1048 mem.win: support predictive levels... + * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers + * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks... diff --git a/checkman/sentry_pdu b/checkman/sentry_pdu new file mode 100644 index 0000000..018b902 --- /dev/null +++ b/checkman/sentry_pdu @@ -0,0 +1,18 @@ +title: Sentry PDU Devices +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the state of the plugs of Sentry PDUs. + As default the state of the time from inventory will result in the state {OK}, + other states are in the state {CRIT}. + The required state can be configured to {on} or {off}. Then these plugs are in + the state {OK} when they are in the configured state, and {CRIT} otherwise. + +item: + The ID Number of the plug as given by the device + +inventory: + One service per plug will be created + diff --git a/checks/sentry_pdu b/checks/sentry_pdu new file mode 100644 index 0000000..63d279c --- /dev/null +++ b/checks/sentry_pdu @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + + +def inventory_sentry_pdu(info): + for line in info: + yield line[0], int(line[1]) + +def check_sentry_pdu(item, params, info): + states = { + 0: "off", + 1: "on", + 2: "offWait", + 3: "onWait", + 4: "offError", + 5: "onError", + 6: "noComm", + } + for name, state, power in info: + if item == name: + required_state = params + # The Wato rule returns eighter on or off + if required_state == 'on': + required_state = 1 + elif required_state == 'off': + required_state = 0 + state = int(state) + power = int(power) + infotext = "State is %s" % states[state] + if state != required_state: + yield 2, infotext + else: + yield 0, infotext + + infotext = "Current consumption %s Watt" % power + perfdata = [ ('power', power )] + yield 0, infotext, perfdata + return + + yield 3, 'Phase information not found' + return + +check_info["sentry_pdu"] = { + "check_function" : check_sentry_pdu, + "inventory_function" : inventory_sentry_pdu, + "service_description" : "Plug %s", + "group" : "plugs", + "snmp_info" : ( ".1.3.6.1.4.1.1718.3.2.2.1", [ 3, 5, 12 ] ), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.1718.3", +} diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 74e6ac6..69a44c9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -381,6 +381,14 @@ perfometers["check_mk-dell_chassis_power"] = perfometer_power perfometers["check_mk-dell_chassis_powersupplies"] = perfometer_power perfometers["check_mk-hp-proliant_power"] = perfometer_power +def perfometer_power_simple(row, check_command, perf_data): + watt = int(perf_data[0][1]) + text = "%s Watt" % watt + return text, perfometer_logarithmic(watt, 150, 2, "#60f020") + +perfometers["check_mk-ibm_svc_enclosurestats.power"] = perfometer_power_simple +perfometers["check_mk-sentry_pdu"] = perfometer_power_simple + def perfometer_users(row, check_command, perf_data): state = row["service_state"] color = "#39f" @@ -1008,11 +1016,6 @@ def perfometer_check_mk_ibm_svc_cache(row, check_command, perf_data): perfometers["check_mk-ibm_svc_nodestats.cache"] = perfometer_check_mk_ibm_svc_cache perfometers["check_mk-ibm_svc_systemstats.cache"] = perfometer_check_mk_ibm_svc_cache -def perfometer_check_mk_ibm_svc_power(row, check_command, perf_data): - watt = int(perf_data[0][1]) - text = "%s Watt" % watt - return text, perfometer_logarithmic(watt, 150, 2, "#60f020") -perfometers["check_mk-ibm_svc_enclosurestats.power"] = perfometer_check_mk_ibm_svc_power def perfometer_licenses_percent(row, check_command, perf_data): licenses = float(perf_data[0][1]) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 33b2a89..73a2ff4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3982,7 +3982,8 @@ register_check_parameters( default_value = "on" ), TextAscii( - title = _("Plug Item ID number"), + title = _("Plug Item number or name"), + help = _("If you need the number or the name depends on the check. Just take a look to the service description. "), allow_empty = True), None )

10 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2014