Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

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 Host problems for NagStaMon 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 Host problems for NagStaMon 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

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7b9dd2a018cbf344598dc6a34f3ce0f00b008716 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b9dd2a018cbf3… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 15 15:02:59 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8fee0ff..ed8cc24 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -892 +902

10 years, 5 months

Check_MK Git: check_mk: wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 6548bee220aecb88aa46d8e35700035ef2e2a2b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6548bee220aecb… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 15 15:03:44 2014 +0200 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices --- .werks/892 | 8 ++ ChangeLog | 1 + checkman/wagner_titanus_topsense.info | 16 +++ checkman/wagner_titanus_topsense.overall_status | 14 +++ checks/wagner_titanus_topsense | 119 +++++++++++++++++++++++ modules/catalog.py | 1 + 6 files changed, 159 insertions(+) diff --git a/.werks/892 b/.werks/892 new file mode 100644 index 0000000..c4ccc7c --- /dev/null +++ b/.werks/892 @@ -0,0 +1,8 @@ +Title: wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397566982 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 79dd18f..6d7932d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 0806 ibm_svc_enclosurestats.temp: New Check for temperature in enclosures of IBM SVC / Storwize V3700 / V7000 devices * 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 * 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.info b/checkman/wagner_titanus_topsense.info new file mode 100644 index 0000000..db77d92 --- /dev/null +++ b/checkman/wagner_titanus_topsense.info @@ -0,0 +1,16 @@ +title: Wagner Titanus Top Sens: System Infos +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Gathers some system information from Wagner Titanus Top Sens devices + and displays them. In detail these are: + Uptime, System Name, System Contact, System Location, Company, Model, + Revision and LSNi bus status. + + This check is for information only and returns always {OK}. + +inventory: + Creates exactly one check for each Top Sense device called + Topsense Info. diff --git a/checkman/wagner_titanus_topsense.overall_status b/checkman/wagner_titanus_topsense.overall_status new file mode 100644 index 0000000..75a49c2 --- /dev/null +++ b/checkman/wagner_titanus_topsense.overall_status @@ -0,0 +1,14 @@ +title: Wagner Titanus Top Sens: Overall Status +agents: snmp +catalog: hw/environment/wagner +license: GPL +distribution: check_mk +description: + Checks the Overall Status of Wagner Titanus Top Sens devices. + + If pswFailureDisplay reports to be switched off, the check returns {OK} and + {CRIT} otherwise. + +inventory: + Creates exactly one check for each Top Sense device called + Overall Status. diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense new file mode 100644 index 0000000..1b89bf7 --- /dev/null +++ b/checks/wagner_titanus_topsense @@ -0,0 +1,119 @@ +#!/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. + +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 + # off(0), on(1) + (".1.3.6.1.4.1.34187.21501.2.1", [24584008]), # tsLSNbusOnline + # offline(0),online(1) + ] + +def wagner_titanus_topsense_scan(oid): + return oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.34187.21501") + +# .--titanus info--------------------------------------------------------. +# | _ _ _ _ __ | +# | | |_(_) |_ __ _ _ __ _ _ ___ (_)_ __ / _| ___ | +# | | __| | __/ _` | '_ \| | | / __| | | '_ \| |_ / _ \ | +# | | |_| | || (_| | | | | |_| \__ \ | | | | | _| (_) | | +# | \__|_|\__\__,_|_| |_|\__,_|___/ |_|_| |_|_| \___/ | +# | | +# '----------------------------------------------------------------------' + +def inventory_wagner_titanus_topsense_info(info): + return [ (None, None) ] + +def check_wagner_titanus_topsense_info(item, _no_params, info): + ts_lsn_bus = info[2][0][0] + if ts_lsn_bus == "0": + ts_lsn_bus = "offline" + elif ts_lsn_bus == "1": + ts_lsn_bus = "online" + else: + ts_lsn_bus = "unknown" + + message = "System: " + info[0][0][0] + message += ", Uptime: " + get_age_human_readable(int(info[0][0][1]) / 100) + message += ", System Name: " + info[0][0][3] + message += ", System Contact: " + info[0][0][2] + message += ", System Location: " + info[0][0][4] + message += ", Company: " + info[1][0][0] + message += ", Model: " + info[1][0][1] + message += ", Revision: " + info[1][0][2] + message += ", LSNi bus: " + ts_lsn_bus + return 0, message + +check_info["wagner_titanus_topsense.info"] = { + "check_function" : check_wagner_titanus_topsense_info, + "inventory_function" : inventory_wagner_titanus_topsense_info, + "service_description" : "Topsense Info", + "has_perfdata" : False, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. +# .--overall status------------------------------------------------------. +# | _ _ _ _ | +# | _____ _____ _ __ __ _| | | ___| |_ __ _| |_ _ _ ___ | +# | / _ \ \ / / _ \ '__/ _` | | | / __| __/ _` | __| | | / __| | +# | | (_) \ V / __/ | | (_| | | | \__ \ || (_| | |_| |_| \__ \ | +# | \___/ \_/ \___|_| \__,_|_|_| |___/\__\__,_|\__|\__,_|___/ | +# | | +# '----------------------------------------------------------------------' + + +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] + status = 3 + if psw_failure == "0": + message = "Overall Status reports OK" + status = 0 + else: + message = "Overall Status reports a problem" + status = 2 + return status, message + +check_info["wagner_titanus_topsense.overall_status"] = { + "check_function" : check_wagner_titanus_topsense_overall_status, + "inventory_function" : inventory_wagner_titanus_topsense_overall_status, + "service_description" : "Overall Status", + "has_perfdata" : False, + "snmp_info" : wagner_titanus_topsense_info, + "snmp_scan_function" : wagner_titanus_topsense_scan +} + +#. diff --git a/modules/catalog.py b/modules/catalog.py index e69266d..d6b23e7 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -11,6 +11,7 @@ manpage_catalog_titles = { "sensatronics" : "Sensatronics", "stulz" : "STULZ", "wut" : "Wiesemann & Theis", + "wagner" : "WAGNER Group", "other" : "Other devices", "network" : "Networking (Switches, Routers, etc.)", "alcatel" : "Alcatel",

10 years, 5 months

Check_MK Git: check_mk: brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c307249f119d45c651634333410c3178480d1280 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c307249f119d45… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 15 13:55:28 2014 +0200 brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices --- .werks/808 | 8 ++++++++ ChangeLog | 1 + checkman/brocade_mlx.module_status | 6 +++--- checkman/brocade_mlx_fan | 6 +++--- checkman/brocade_mlx_power | 6 +++--- checkman/brocade_mlx_temp | 4 ++-- checks/brocade_mlx_fan | 2 +- checks/brocade_mlx_power | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.werks/808 b/.werks/808 new file mode 100644 index 0000000..7373269 --- /dev/null +++ b/.werks/808 @@ -0,0 +1,8 @@ +Title: brocade_mlx*: Checks now also work correctly with Brocade ADX / FGS / ICX devices +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1397562878 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9a7f3bd..8dfeb5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0805 ibm_svc_enclosure: New Check for Enclosures, Canisters and PSUs in IBM SVC / Storwize V3700 / V7000 devices * 0806 ibm_svc_enclosurestats.temp: New Check for temperature in enclosures of IBM SVC / Storwize V3700 / V7000 devices * 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 * 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/brocade_mlx.module_status b/checkman/brocade_mlx.module_status index c27da0a..985e4c8 100644 --- a/checkman/brocade_mlx.module_status +++ b/checkman/brocade_mlx.module_status @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Module Overall Status +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Module Overall Status agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the overall status of modules in Brocade NetIron MLX - switching / routing devices. + Checks the overall status of modules in Brocade NetIron MLX / ADX / FGS / + ICX switching / routing devices. Returns {OK} on status 10 (running) and 11 (Blocked for full height card). Returns {WARN} on status 0 (empty), 2 (going down) and 9 (coming up). diff --git a/checkman/brocade_mlx_fan b/checkman/brocade_mlx_fan index a933c9c..a0a48b9 100644 --- a/checkman/brocade_mlx_fan +++ b/checkman/brocade_mlx_fan @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Fans +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Fans agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the operational status of fans in Brocade NetIron MLX - switching / routing devices. + Checks the operational status of fans in Brocade NetIron MLX / ADX / + FGS / ICX switching / routing devices. Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) and {UNKN} on every other status. diff --git a/checkman/brocade_mlx_power b/checkman/brocade_mlx_power index 9b8d1b3..f392d24 100644 --- a/checkman/brocade_mlx_power +++ b/checkman/brocade_mlx_power @@ -1,11 +1,11 @@ -title: Brocade NetIron MLX devices: Power Supplies +title: Brocade NetIron MLX / ADX / FGS / ICX devices: Power Supplies agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the operational status of power supplies on Brocade NetIron MLX - switching / routing devices. + Checks the operational status of power supplies on Brocade NetIron MLX / ADX + / FGS / ICX switching / routing devices. Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) and {UNKN} on every other status. diff --git a/checkman/brocade_mlx_temp b/checkman/brocade_mlx_temp index a6cc0e5..505bb33 100644 --- a/checkman/brocade_mlx_temp +++ b/checkman/brocade_mlx_temp @@ -1,10 +1,10 @@ -title: Brocade NetIron MLX devices: Temperature Sensors +title: Brocade NetIron MLX / FGS / ICX devices: Temperature Sensors agents: snmp catalog: hw/network/brocade license: GPL distribution: check_mk description: - Checks the temperature sensors of one module in Brocade NetIron MLX switching / + Checks the temperature sensors of one module in Brocade NetIron MLX / FGS / ICX switching / routing devices. {WARN} or {CRIT} is returned, if at least one of the temperatures is above given diff --git a/checks/brocade_mlx_fan b/checks/brocade_mlx_fan index bd35d69..28d5ff5 100644 --- a/checks/brocade_mlx_fan +++ b/checks/brocade_mlx_fan @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def brocade_mlx_fan_combine_item(id, descr): - if descr == "": + if descr == "" or "(RPM " in descr: return id else: return "%s %s" % (id, descr) diff --git a/checks/brocade_mlx_power b/checks/brocade_mlx_power index 2e3ab2d..195f424 100644 --- a/checks/brocade_mlx_power +++ b/checks/brocade_mlx_power @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. def brocade_mlx_power_combine_item(id, descr): - if descr == "": + if descr == "" or "AC " in descr: return id else: return "%s %s" % (id, descr)

10 years, 5 months

Check_MK Git: check_mk: FIX solaris_mem: fixed invalid calculation of total swap

by Andreas Boesl

Module: check_mk Branch: master Commit: b2ce37ec1cf8f408701a29ca267359de3f8718a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2ce37ec1cf8f4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 15 12:16:16 2014 +0200 FIX solaris_mem: fixed invalid calculation of total swap Solaris systems which reported the memory information like Memory: 10G phys mem, 1905M free mem, 8002M total swap, 8002M free swap got incorrect total swap values in the check. --- .werks/832 | 11 +++++++++++ ChangeLog | 1 + checks/solaris_mem | 14 +++++++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/832 b/.werks/832 new file mode 100644 index 0000000..17e2f60 --- /dev/null +++ b/.werks/832 @@ -0,0 +1,11 @@ +Title: solaris_mem: fixed invalid calculation of total swap +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397556871 +Class: fix + +Solaris systems which reported the memory information like +Memory: 10G phys mem, 1905M free mem, 8002M total swap, 8002M free swap +got incorrect total swap values in the check. + diff --git a/ChangeLog b/ChangeLog index 9a7f3bd..686c0a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * 0889 FIX: logwatch: fix case where rule wouldn't be applied... * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers + * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/checks/solaris_mem b/checks/solaris_mem index ab5dc59..95ab08c 100644 --- a/checks/solaris_mem +++ b/checks/solaris_mem @@ -49,14 +49,22 @@ def inventory_solaris_mem_used(info): return [(None, {})] def check_solaris_mem_used(_no_item, params, info): - keys = ['MemTotal', 'MemFree', 'SwapTotal', 'SwapFree'] - values = [ solaris_mem_to_kbytes(v) for v in info[0] if v[0] in '01234567890' ] + values = [] + mem_tokens = " ".join(info[0][1:]).split(",") + is_total_swap = False + for token in mem_tokens: + if "total swap" in token: + is_total_swap = True + values.append(solaris_mem_to_kbytes(token.split()[0])) + if len(values) != 4: return 3, "Got unexpected information from agent" # convert swap-in-use to swap-total, as expected by check_memory() - values[2] = values[2] + values[3] + if not is_total_swap: + values[2] = values[2] + values[3] + keys = ['MemTotal', 'MemFree', 'SwapTotal', 'SwapFree'] return check_memory(params, dict(zip(keys, values))) check_info['solaris_mem'] = {

10 years, 5 months

Check_MK Git: check_mk: FIX table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax

by Andreas Boesl

Module: check_mk Branch: master Commit: cd7aa28d9bd6eddbffa9981d7ee4de417a7fdb3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd7aa28d9bd6ed… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 15 11:08:29 2014 +0200 FIX table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax The livestatus table could crash incomplete TIMEPERIOD TRANSITION logentries which where caused by a maximum line length. <tt>Working:</tt> [1391727600] TIMEPERIOD TRANSITION: good_transition;0;1 <tt>Caused crash:</tt> [1391727600] TIMEPERIOD TRANSITION: this_timeperiod_transition_name_is_way_too_lo --- .werks/831 | 15 +++++++++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 9 +++++++++ 3 files changed, 25 insertions(+) diff --git a/.werks/831 b/.werks/831 new file mode 100644 index 0000000..5d44271 --- /dev/null +++ b/.werks/831 @@ -0,0 +1,15 @@ +Title: table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax +Level: 1 +Component: livestatus +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1397552565 + +The livestatus table could crash incomplete TIMEPERIOD TRANSITION logentries which where +caused by a maximum line length. +<tt>Working:</tt> +[1391727600] TIMEPERIOD TRANSITION: good_transition;0;1 +<tt>Caused crash:</tt> +[1391727600] TIMEPERIOD TRANSITION: this_timeperiod_transition_name_is_way_too_lo + diff --git a/ChangeLog b/ChangeLog index 5f0089d..9a7f3bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... + * 0831 FIX: table statehist: no longer crashes on TIMEPERIOD TRANSITION entries with an invalid syntax... HW/SW-Inventory: * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 39d1ab7..5d4ac39 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -611,6 +611,15 @@ void TableStateHistory::answerQuery(Query *query) char *tp_name = strtok_r(buffer, ";", &save_ptr); strtok_r(NULL, ";", &save_ptr); char *tp_state = strtok_r(NULL, ";", &save_ptr); + if (tp_state) + tp_state = strtok_r(NULL, ";", &save_ptr); + + if (tp_state == NULL) { + // This line is broken... + logger(LOG_WARNING, "Error: Invalid syntax of TIMEPERIOD TRANSITION: %s", entry->_complete); + free(buffer); + break; + } _notification_periods[tp_name] = atoi(tp_state); state_info_t::iterator it_hst = state_info.begin();

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits