Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: Reserved 50 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: eb5e0d08bcf243121acff4fd3739cc4273f550db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb5e0d08bcf243… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Apr 17 15:03:53 2014 +0200 Reserved 50 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index ed8cc24..be1c55a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -902 +952

10 years, 5 months

Check_MK Git: check_mk: wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cd9dfbfd8bbced9448da209dc1117f8e5877e13d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd9dfbfd8bbced… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Apr 17 14:46:37 2014 +0200 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices --- .werks/894 | 8 ++++ ChangeLog | 1 + checkman/wagner_titanus_topsense.smoke | 18 ++++++++ checks/wagner_titanus_topsense | 45 ++++++++++++++++++-- .../check_mk-wagner_titanus_topsense.smoke.php | 34 +++++++++++++++ web/plugins/perfometer/check_mk.py | 6 +++ 6 files changed, 109 insertions(+), 3 deletions(-) diff --git a/.werks/894 b/.werks/894 new file mode 100644 index 0000000..00edc06 --- /dev/null +++ b/.werks/894 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397738763 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 83cdd29..b4e41b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0808 brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices + * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.smoke b/checkman/wagner_titanus_topsense.smoke new file mode 100644 index 0000000..20709bf --- /dev/null +++ b/checkman/wagner_titanus_topsense.smoke @@ -0,0 +1,18 @@ +title: Wagner Titanus Top Sens: Smoke Detectors +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Checks the Levels reported by Smoke Detectors of Wagner Titanus Top Sens devices. + + The check returns {OK} if the level is 0.000000 % and {CRIT} otherwise. + +inventory: + Creates two checks, one for every Smoke Detector. + +item: + The ID of the detector. + +perfdata: + One value: The level of smoke in percent. diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index c084814..7fec122 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -41,8 +41,10 @@ wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # 1006]), # pswFailureDisplayOn 9 # off(0), on(1) - (".1.3.6.1.4.1.34187.21501.2.1", [24584008]), # tsLSNbusOnline 0 - # offline(0),online(1) + (".1.3.6.1.4.1.34187.21501.2.1", [24584008, # tsLSNbusOnline 0 + # offline(0),online(1) + 245810000, # tsBarGraph1String + 245820000]), # tsBarGraph2String ] def wagner_titanus_topsense_scan(oid): @@ -146,7 +148,7 @@ def check_wagner_titanus_topsense_alarm(item, _no_params, info): pre_alarm = info[1][0][7] info_alarm = info[1][0][8] else: - return 3, "%s not found in SNMP" % item + return 3, "Alarm Detector %s not found in SNMP" % item status = 0 message = "No Alarm" @@ -172,4 +174,41 @@ check_info["wagner_titanus_topsense.alarm"] = { } #. +# .--smoke percent-------------------------------------------------------. +# | _ _ | +# | ___ _ __ ___ ___ | | _____ _ __ ___ _ __ ___ ___ _ __ | |_ | +# | / __| '_ ` _ \ / _ \| |/ / _ \ | '_ \ / _ \ '__/ __/ _ \ '_ \| __| | +# | \__ \ | | | | | (_) | < __/ | |_) | __/ | | (_| __/ | | | |_ | +# | |___/_| |_| |_|\___/|_|\_\___| | .__/ \___|_| \___\___|_| |_|\__| | +# | |_| | +# '----------------------------------------------------------------------' + +def inventory_wagner_titanus_topsense_smoke(info): + return [ ("1", None), ("2", None) ] +def check_wagner_titanus_topsense_smoke(item, _no_params, info): + if item == "1": + smoke_perc = float(info[2][0][1]) + elif item == "2": + smoke_perc = float(info[2][0][2]) + else: + return 3, "Smoke Detector %s not found in SNMP" % item + + perfdata = [("smoke_perc", smoke_perc)] + if smoke_perc > 0: + status = 2 + else: + status = 0 + + return status, "%0.6f%% smoke detected" % smoke_perc, perfdata + +check_info["wagner_titanus_topsense.smoke"] = { + "check_function" : check_wagner_titanus_topsense_smoke, + "inventory_function" : inventory_wagner_titanus_topsense_smoke, + "service_description" : "Smoke Detector %s", + "has_perfdata" : True, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/pnp-templates/check_mk-wagner_titanus_topsense.smoke.php b/pnp-templates/check_mk-wagner_titanus_topsense.smoke.php new file mode 100644 index 0000000..cadd4f1 --- /dev/null +++ b/pnp-templates/check_mk-wagner_titanus_topsense.smoke.php @@ -0,0 +1,34 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$opt[1] = "--vertical-label \"%\" -l 0 --title \"$hostname / $servicedesc\" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#808080:\"Smoke\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%0.6lf%%\" "; +$def[1] .= "LINE1:var1#000080:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %0.6lf%%,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %0.6lf%%)\" "; +?> diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0738ddb..63d1258 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -931,3 +931,9 @@ def perfometer_licenses_percent(row, check_command, perf_data): return "%.0f%% used" % used_perc, perfometer_linear( used_perc, 'orange' ) perfometers['check_mk-innovaphone_licenses'] = perfometer_licenses_percent + +def perfometer_smoke_percent(row, command, perf): + used_perc = float(perf[0][1]) + return "%0.6f%%" % used_perc, perfometer_linear(used_perc, "#404040") + +perfometers['check_mk-wagner_titanus_topsense.smoke'] = perfometer_smoke_percent

10 years, 5 months

Check_MK Git: check_mk: Force notification number to be at least one (e.g. for custom notifications)

by Mathias Kettner

Module: check_mk Branch: master Commit: 5bc2c7ea3c9520dd8400056cc498db8e34bb11d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bc2c7ea3c9520… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 17 10:04:45 2014 +0200 Force notification number to be at least one (e.g. for custom notifications) --- modules/notify.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index 06da82f..2aa518d 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -203,11 +203,17 @@ def notify_notify(raw_context, analyse=False): notify_log("Got raw notification context with %s variables" % len(raw_context)) # Add some further variable for the conveniance of the plugins - complete_raw_context(raw_context) if notification_logging >= 2: notify_log("Raw notification context:\n" - + "\n".join(["%s=%s" % v for v in sorted(raw_context.items())])) + + "\n".join([" %s=%s" % v for v in sorted(raw_context.items())])) + + raw_keys = list(raw_context.keys()) + complete_raw_context(raw_context) + + if notification_logging >= 2: + notify_log("Computed variables:\n" + + "\n".join(sorted([" %s=%s" % (k, raw_context[k]) for k in raw_context if k not in raw_keys]))) # Spool notification to remote host, if this is enabled if notification_spool_to: @@ -1518,6 +1524,12 @@ def complete_raw_context(raw_context): if not contact or contact == "check-mk-notify": add_rulebased_macros(raw_context) + # For custom notifications the number is set to 0 by the core (Nagios and CMC). We force at least + # number 1 here, so that rules with conditions on numbers do not fail (the minimum is 1 here) + for what in [ "HOST", "SERVICE" ]: + key = what + "NOTIFICATIONNUMBER" + if key in raw_context and raw_context[key] == "0": + raw_context[key] = "1" # Add the previous hard state. This is neccessary for notification rules that depend on certain transitions, # like OK -> WARN (but not CRIT -> WARN). The CMC sends PREVIOUSHOSTHARDSTATE and PREVIOUSSERVICEHARDSTATE.

10 years, 5 months

Check_MK Git: check_mk: added colspan support for single cells to table api

by Lars Michelsen

Module: check_mk Branch: master Commit: 325abef0bb39952a4618d69aa2a78a4cd3fe5aa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=325abef0bb3995… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 17 09:53:10 2014 +0200 added colspan support for single cells to table api --- web/htdocs/table.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 6561ef6..2bb03c4 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -109,13 +109,13 @@ def cell(*posargs, **kwargs): next_func = add_cell next_args = posargs, kwargs -def add_cell(title="", text="", css=None, help=None): +def add_cell(title="", text="", css=None, help=None, colspan=None): if type(text) != unicode: text = str(text) htmlcode = text + html.drain() if table["collect_headers"] == True: table["headers"].append((title, help)) - table["rows"][-1][0].append((htmlcode, css)) + table["rows"][-1][0].append((htmlcode, css, colspan)) def end(): global table @@ -272,8 +272,9 @@ def end(): if css: html.write(' %s' % css) html.write('">\n') - for cell_content, css_classes in row: - html.write(" <td%s>" % (css_classes and (" class='%s'" % css_classes) or "")) + for cell_content, css_classes, colspan in row: + colspan = colspan and (' colspan="%d"' % colspan) or '' + html.write(" <td%s%s>" % (css_classes and (" class='%s'" % css_classes) or "", colspan)) html.write(cell_content) html.write("</td>\n") html.write("</tr>\n")

10 years, 5 months

Check_MK Git: check_mk: Fix attrencode in notification tooltip

by Mathias Kettner

Module: check_mk Branch: master Commit: 1601aedbce7d85302bc1e14906d3a33eb318d8bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1601aedbce7d85… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 17 09:41:45 2014 +0200 Fix attrencode in notification tooltip --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 6862841..488852f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -326,7 +326,7 @@ class html: 'src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>' % (id, onclick, style, target, cssclass, url, help, icon)) + '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">')

10 years, 5 months

Check_MK Git: check_mk: Add new column painter "Host Notifications Enabled"

by Mathias Kettner

Module: check_mk Branch: master Commit: 134d77284e9d11284d7aef6f99b8ef70ec76c46d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=134d77284e9d11… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 16 15:35:14 2014 +0200 Add new column painter "Host Notifications Enabled" This new column has been added to the view <i>Host problems for NagStaMon</i> and is used for providing that information to NagStaMon. Note: You will need to update NagStaMon in order to use this new information. --- .werks/887 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/builtin.py | 4 +++- web/plugins/views/painters.py | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/887 b/.werks/887 new file mode 100644 index 0000000..bf22bee --- /dev/null +++ b/.werks/887 @@ -0,0 +1,10 @@ +Title: Add new column painter "Host Notifications Enabled" +Level: 1 +Component: multisite +Version: 1.2.5i3 +Date: 1397655243 +Class: feature + +This new column has been added to the view <i>Host problems for NagStaMon</i> and is used +for providing that information to NagStaMon. Note: You will need to update NagStaMon in order +to use this new information. diff --git a/ChangeLog b/ChangeLog index ac200e0..83cdd29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) + * 0887 Add new column painter "Host Notifications Enabled"... WATO: * 0784 Improved security of WATO bulk inventory by using transaction ids diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 2103533..5f31c78 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -2110,7 +2110,9 @@ multisite_builtin_views.update({ ('host_acknowledged', None, ''), ('sitename_plain', None, ''), ('host_flapping', None, ''), - ('host_is_active', None, ''),], + ('host_is_active', None, ''), + ('host_notifications_enabled', None, ''), + ], 'play_sounds': False, 'public': True, 'show_filters': ['host_scheduled_downtime_depth', diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 65a5628..3d601df 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1048,6 +1048,12 @@ multisite_painters["host_is_active"] = { "columns" : [ "host_active_checks_enabled" ], "paint" : lambda row: paint_nagiosflag(row, "host_active_checks_enabled", None), } +multisite_painters["host_notifications_enabled"] = { + "title" : _("Host notifications enabled"), + "short" : _("Notif."), + "columns" : [ "host_notifications_enabled" ], + "paint" : lambda row: paint_nagiosflag(row, "host_notifications_enabled", False), +} multisite_painters["host_pnpgraph" ] = { "title" : _("PNP host graph"),

10 years, 5 months

Check_MK Git: check_mk: Fix crash in AV when timeline is inline and icons are hidden

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e5a8a7be9a63296e2c04010532c09b290758a38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e5a8a7be9a632… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 16 13:40:27 2014 +0200 Fix crash in AV when timeline is inline and icons are hidden --- web/plugins/views/availability.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index d7da0cc..a76f7f0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -1184,20 +1184,23 @@ def render_availability_group(group_title, range_title, group_id, availability, for site, host, service, display_name, states, considered_duration, total_duration, statistics, timeline_rows, group_ids in group_availability: table.row() + if what != "bi": + timeline_url = html.makeuri([ + ("timeline", "yes"), + ("timeline_site", site), + ("timeline_host", host), + ("timeline_service", service)]) + else: + timeline_url = html.makeuri([("timeline", "yes"), ("av_aggr_name", service), ("av_aggr_group", host)]) + + if not "omit_buttons" in labelling and not do_csv: table.cell("", css="buttons") if what != "bi": - timeline_url = html.makeuri([ - ("timeline", "yes"), - ("timeline_site", site), - ("timeline_host", host), - ("timeline_service", service)]) - history_url = history_url_of(site, host, service, from_time, until_time) html.icon_button(history_url, _("Event History"), "history") html.icon_button(timeline_url, _("Timeline"), "timeline") else: - timeline_url = html.makeuri([("timeline", "yes"), ("av_aggr_name", service), ("av_aggr_group", host)]) html.icon_button(timeline_url, _("Timeline"), "timeline") host_url = "view.py?" + html.urlencode_vars([("view_name", "hoststatus"), ("site", site), ("host", host)])

10 years, 5 months

Check_MK Git: check_mk: Removed unused variable in liveproxyd

by Mathias Kettner

Module: check_mk Branch: master Commit: ca6249684d54ab7fb596f64e378ca599a564d7dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca6249684d54ab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 16 13:37:06 2014 +0200 Removed unused variable in liveproxyd --- doc/treasures/liveproxy/liveproxyd | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 624c2a2..162ebe2 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -159,7 +159,6 @@ def send_heartbeat(sitename, sitestate): for channel in sitestate["channels"]: if channel["state"] == "ready": if next_channel == None or channel["since"] < next_channel["since"]: - min_since = channel["since"] next_channel = channel if not next_channel: log("Cannot send heartbeat to %s: no channel ready" % sitename)

10 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0841, #0842, #0843

by Bastian Kuhn

Module: check_mk Branch: master Commit: b8b4d19d191ca5ac55e0eef11b1c101dabfc14fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b4d19d191ca5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Apr 16 09:41:42 2014 +0200 Updated bug entries #0841, #0842, #0843 --- .bugs/841 | 8 ++++++++ .bugs/842 | 10 ++++++++++ .bugs/843 | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/.bugs/841 b/.bugs/841 new file mode 100644 index 0000000..3bed1c3 --- /dev/null +++ b/.bugs/841 @@ -0,0 +1,8 @@ +Title: View Editor: It's not possible to delete a view +Component: multisite +State: open +Date: 2014-04-16 09:34:07 +Targetversion: 1.2.5i1 +Class: bug + +Currently it is not possible to delete a view in Multisite. I think this has to do with the new security features regarding to the CVE's diff --git a/.bugs/842 b/.bugs/842 new file mode 100644 index 0000000..52d4d2e --- /dev/null +++ b/.bugs/842 @@ -0,0 +1,10 @@ +Title: HW/SW Inventory should not be appear on Clusters or some Special Agents +Component: inv +State: open +Date: 2014-04-16 09:35:42 +Targetversion: 1.2.5i1 +Class: bug + +In Wato there is no option like PHYSICAL_HOSTS or CLUSTER_HOSTS so there should be a easy way to deactivate the HW/SW Inventory check using Wato for clusters. +If you have a big enviroment it is not fine solution to click through a couple of folders to find all clusters an add a Cluster Tag. +Same Problem with special agents like VMware ESX. diff --git a/.bugs/843 b/.bugs/843 new file mode 100644 index 0000000..dd133dd --- /dev/null +++ b/.bugs/843 @@ -0,0 +1,9 @@ +Title: Wato service parametr icon +Component: wato +State: open +Date: 2014-04-16 09:39:19 +Targetversion: 1.2.5i1 +Class: bug + +If you reenter the service view in wato and you have missing services, they allready have the icon with the link to the parameter information page. But +the link only works after activating the new services.

10 years, 5 months

Check_MK Git: check_mk: wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7caf8fbf173a3a26509342cd93fab64bf81d0d97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7caf8fbf173a3a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 15 15:54:38 2014 +0200 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices --- .werks/893 | 8 ++++ ChangeLog | 1 + checkman/wagner_titanus_topsense.alarm | 17 +++++++ checks/wagner_titanus_topsense | 78 +++++++++++++++++++++++++++----- 4 files changed, 93 insertions(+), 11 deletions(-) diff --git a/.werks/893 b/.werks/893 new file mode 100644 index 0000000..c43af74 --- /dev/null +++ b/.werks/893 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397570062 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6d7932d..ac200e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 0807 ibm_svc_enclosurestats.power: New check for power consumption of enclosures of IBM SVC / Storwize V3700 / V7000 devices * 0808 brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices + * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/wagner_titanus_topsense.alarm b/checkman/wagner_titanus_topsense.alarm new file mode 100644 index 0000000..71bb6d0 --- /dev/null +++ b/checkman/wagner_titanus_topsense.alarm @@ -0,0 +1,17 @@ +title: Wagner Titanus Top Sens: Alarms Triggered +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Checks if alarms have been triggered on an Wagner Titanus Top Sens device. + + If pswMainAlarm is triggered, the check returns {CRIT}, if pswPreAlarm or + pswInfAlarm is triggered, it return {WARN} and if none of these is triggered + it returns {OK}. + +item: + The ID of the detector. + +inventory: + Creates two checks on every Top Sense device, one for each detector. diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 1b89bf7..c084814 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -24,17 +24,24 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # sysDescr - 3, # sysUpTimeInstance - 4, # sysContact - 5, # sysName - 6]), # sysLocation - (".1.3.6.1.4.1.34187.21501.1.1", [1, # company - 2, # model - 3, # revision - 1006]), # pswFailureDisplayOn +wagner_titanus_topsense_info = [(".1.3.6.1.2.1.1", [1, # sysDescr 0 + 3, # sysUpTimeInstance 1 + 4, # sysContact 2 + 5, # sysName 3 + 6]), # sysLocation 4 + (".1.3.6.1.4.1.34187.21501.1.1", [1, # company 0 + 2, # model 1 + 3, # revision 2 + 1000, # pswMainAlarmD1 3 + 1001, # pswPreAlarmD1 4 + 1002, # pswInfAlarmD1 5 + 1003, # pswMainAlarmD2 6 + 1004, # pswPreAlarmD2 7 + 1005, # pswInfAlarmD2 8 + 1006]), # pswFailureDisplayOn 9 # off(0), on(1) - (".1.3.6.1.4.1.34187.21501.2.1", [24584008]), # tsLSNbusOnline + + (".1.3.6.1.4.1.34187.21501.2.1", [24584008]), # tsLSNbusOnline 0 # offline(0),online(1) ] @@ -97,7 +104,7 @@ def inventory_wagner_titanus_topsense_overall_status(info): return [ (None, None) ] def check_wagner_titanus_topsense_overall_status(item, _no_params, info): - psw_failure = info[1][0][3] + psw_failure = info[1][0][9] status = 3 if psw_failure == "0": message = "Overall Status reports OK" @@ -117,3 +124,52 @@ check_info["wagner_titanus_topsense.overall_status"] = { } #. +# .--alarm---------------------------------------------------------------. +# | _ | +# | __ _| | __ _ _ __ _ __ ___ | +# | / _` | |/ _` | '__| '_ ` _ \ | +# | | (_| | | (_| | | | | | | | | | +# | \__,_|_|\__,_|_| |_| |_| |_| | +# | | +# '----------------------------------------------------------------------' + +def inventory_wagner_titanus_topsense_alarm(info): + return [ ("1", None), ("2", None) ] + +def check_wagner_titanus_topsense_alarm(item, _no_params, info): + if item == "1": + main_alarm = info[1][0][3] + pre_alarm = info[1][0][4] + info_alarm = info[1][0][5] + elif item == "2": + main_alarm = info[1][0][6] + pre_alarm = info[1][0][7] + info_alarm = info[1][0][8] + else: + return 3, "%s not found in SNMP" % item + + status = 0 + message = "No Alarm" + if info_alarm != "0": + message = "Info Alarm" + status = 1 + if pre_alarm != "0": + message = "Pre Alarm" + status = 1 + if main_alarm != "0": + message = "Main Alarm: Fire" + status = 2 + + return status, message + +check_info["wagner_titanus_topsense.alarm"] = { + "check_function" : check_wagner_titanus_topsense_alarm, + "inventory_function" : inventory_wagner_titanus_topsense_alarm, + "service_description" : "Alarm Detector %s", + "has_perfdata" : False, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. +

10 years, 5 months

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014