Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64518 discussions

Check_MK Git: check_mk: fixed formating error in mysql.sessions checkman

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5935b3cee64e67003e88148536637a75d6ee0c2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5935b3cee64e67… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Nov 26 16:42:43 2013 +0100 fixed formating error in mysql.sessions checkman --- checkman/mysql.sessions | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/checkman/mysql.sessions b/checkman/mysql.sessions index 18da436..58c8a33 100644 --- a/checkman/mysql.sessions +++ b/checkman/mysql.sessions @@ -15,12 +15,10 @@ description: inventory: The check generates one item for the sessions connected to the MySQL daemon. +perfdata: + The check generates perfdata for the total and running sessions, and the + connection rate. [configuration] warn(int): number of sessions at which the check goes warn crit(int): number of sessions for a critical state - - -perfdata: - The check generates perfdata for the total and running sessions, and the - connection rate.

10 years, 10 months

Check_MK Git: check_mk: Fixed ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: ee92070fc0853ad3c956ef17a3b1fca57116589e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee92070fc0853a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 16:17:06 2013 +0100 Fixed ChangeLog --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2a31f2a..5772c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,7 +50,6 @@ WATO: * 0053 New rule for configuring the display_name of a service... * 0216 Supporting float values as SNMP timeout value now... - * 0235 module table.py: table headers are omitted if all header fields are empty... * 0048 FIX: Tests on host diagnose page are executed parallel now... * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: NagVis related permissions of roles can be edited again...

10 years, 10 months

Check_MK Git: check_mk: Fixed typo in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1c27ee6ab3422ab27349b922a6ed9520978c1e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c27ee6ab3422a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 26 13:58:56 2013 +0100 Fixed typo in wato --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ff501fe..24c2aca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3841,7 +3841,7 @@ def mode_changelog(phase): table += '</table>' c = wato_confirm(_("Confirm activating foreign changes"), '<img class=foreignchanges src="images/icon_foreign_changes.png">' + - _("There are some changes made by your collegues that you will " + _("There are some changes made by your colleagues that you will " "activate if you proceed:") + table + _("Do you really want to proceed?")) if c == False:

10 years, 10 months

Check_MK Git: check_mk: Fixed format error in werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 84d409a30d57009c56f0e9bea103863c4159b838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84d409a30d5700… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 12:12:07 2013 +0100 Fixed format error in werk --- .werks/235 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/235 b/.werks/235 index 56617ff..3116457 100644 --- a/.werks/235 +++ b/.werks/235 @@ -5,7 +5,7 @@ Version: 1.2.3i7 Date: 1385120851 Class: feature -Html tables rendered with the help of the table module always displayed the <th> fields, +Html tables rendered with the help of the table module always displayed the <th> fields, even if none if this fields were filled. For example: C+:

10 years, 10 months

Check_MK Git: check_mk: Removed non-werk

by Mathias Kettner

Module: check_mk Branch: master Commit: f2eedd5c64d1012711fd814e98c36b1c5bf52158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2eedd5c64d101… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 12:12:48 2013 +0100 Removed non-werk --- .werks/235 | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.werks/235 b/.werks/235 deleted file mode 100644 index 3116457..0000000 --- a/.werks/235 +++ /dev/null @@ -1,25 +0,0 @@ -Title: module table.py: table headers are omitted if all header fields are empty -Level: 1 -Component: wato -Version: 1.2.3i7 -Date: 1385120851 -Class: feature - -Html tables rendered with the help of the table module always displayed the <th> fields, -even if none if this fields were filled. For example: - -C+: -table.begin(searchable = False) -# Firma -table.row() -table.cell("", "Company") -table.cell("", "Yummifood") -# Adresse -table.row() -table.cell("", "Address") -table.cell("", "Yummistreet 7, 12345 Yummiville") -table.end() -C-: - -This created a table with empty headers. -The new feature omits this headerline if it's not used otherwise, e.g. by a table action.

10 years, 10 months

Check_MK Git: check_mk: Availability: fixed missing timeline

by Mathias Kettner

Module: check_mk Branch: master Commit: c55a6993335191ee3339a795c92110d5854d5237 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c55a6993335191… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 10:23:28 2013 +0100 Availability: fixed missing timeline --- web/plugins/views/availability.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index c572850..23eca6e 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -82,7 +82,8 @@ def render_availability(view, datasource, filterheaders, display_options, html.write(avoptions_html) if not html.has_user_errors(): - rows = get_availability_data(datasource, filterheaders, range, only_sites, limit, timeline, timeline or avoptions["show_timeline"], avoptions) + rows = get_availability_data(datasource, filterheaders, range, only_sites, + limit, timeline, timeline or avoptions["show_timeline"], avoptions) what = "service" in datasource["infos"] and "service" or "host" do_render_availability(rows, what, avoptions, timeline, "") @@ -654,7 +655,7 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): availability = [] os_aggrs, os_states = avoptions.get("outage_statistics", ([],[])) need_statistics = os_aggrs and os_states - show_timeline = avoptions["show_timeline"] + show_timeline = avoptions["show_timeline"] or timeline grouping = avoptions["grouping"] timeline_rows = [] # Need this as a global variable if just one service is affected total_duration = 0 @@ -757,7 +758,8 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): if not show_timeline: timeline_rows = None - availability.append([site_host[0], site_host[1], service, display_name, states, considered_duration, total_duration, statistics, timeline_rows, group_ids]) + availability.append([site_host[0], site_host[1], service, display_name, states, + considered_duration, total_duration, statistics, timeline_rows, group_ids]) # Prepare number format function range, range_title = avoptions["range"] @@ -786,7 +788,8 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): return "%02d:%02d:%02d" % (hours, minn, sec) if timeline: - render_timeline(timeline_rows, from_time, until_time, total_duration, timeline, range_title, render_number, what, timewarpcode, style="standalone") + render_timeline(timeline_rows, from_time, until_time, total_duration, + timeline, range_title, render_number, what, timewarpcode, style="standalone") else: render_availability_table(availability, from_time, until_time, range_title, what, avoptions, render_number)

10 years, 10 months

Check_MK Git: check_mk: preliminary versions of two new cisco checks

by Götz Golla

Module: check_mk Branch: master Commit: 077b659c53e9a8c438282ed7aa1abf83f7bb576c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077b659c53e9a8… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 25 19:59:26 2013 +0100 preliminary versions of two new cisco checks --- checks/cisco_fru_power | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ checks/cisco_sys_mem | 62 +++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power new file mode 100644 index 0000000..33b9ba6 --- /dev/null +++ b/checks/cisco_fru_power @@ -0,0 +1,102 @@ +#!/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. + +# .1.3.6.1.4.1.9.9.13.1.5.1.2.1 "removed" +# .1.3.6.1.4.1.9.9.13.1.5.1.2.2 "AC Power Supply" +# .1.3.6.1.4.1.9.9.13.1.5.1.3.1 5 +# .1.3.6.1.4.1.9.9.13.1.5.1.3.2 1 +# .1.3.6.1.4.1.9.9.13.1.5.1.4.1 1 +# .1.3.6.1.4.1.9.9.13.1.5.1.4.2 2 + +# OID 1.3.6.1.4.1.9.9.117.1.1.2.1.2 +# Type PowerOperType +# 1:offEnvOther +# 2:on +# 3:offAdmin +# 4:offDenied +# 5:offEnvPower +# 6:offEnvTemp +# 7:offEnvFan +# 8:failed +# 9:onButFanFail +# 10:offCooling +# 11:offConnectorRating +# 12:onButInlinePowerFail +# +# OID 1.3.6.1.4.1.9.9.117.1.1.2.1.1 +# Type PowerAdminType +# 1:on +# 2:off +# 3:inlineAuto +# 4:inlineOn +# 5:powerCycle +# + +power_oper_type = ('', 'offEnvOther', 'on', 'offAdmin', 'offDenied', + 'offEnvPower', 'offEnvTemp', 'offEnvFan', 'failed', + 'onButFanFail', 'offCooling', 'offConnectorRating', + 'onButInlinePowerFail' ) + +power_admin_type = ( '', 'on', 'off', 'inlineAuto', 'inlineOn', 'powercycle') + +def inventory_cisco_fru_power(info): + return [ (line[0], None ) for line in info ] + +def check_cisco_fru_power(item, params, info): + for line in info: + if line[0] == item: + admin_state, oper_state = map(saveint, line[1:3]) + output = 'Admin-State: %s, Oper-State: %s' % (power_admin_type[admin_state], + power_oper_type[oper_state]) + admin_sym = "" + oper_sym = "" + if admin_state == 1 and oper_state == 2: + state = 0 + elif admin_state == 2 or oper_state in ( 4,5,6,7,8,12): + state = 2 + if admin_state == 2: + admin_sym = "(!!)" + if oper_state in ( 4,5,6,7,8,12): + oper_sym = "(!!)" + else: + state = 1 + if admin_state not in (1,2): + admin_sym = "(!)" + if oper_state not in (2,4,5,6,7,8,12): + oper_sym = "(!)" + return (state, "Admin-State: %s%s, Oper-State: %s%s" % \ + (power_admin_type[admin_state],admin_sym,power_oper_type[oper_state],oper_sym)) + + return (3, "item not found in snmp data") + +check_info["cisco_fru_power"] = { + 'check_function': check_cisco_fru_power, + 'inventory_function': inventory_cisco_fru_power, + 'service_description': 'FRU Power %s', + 'snmp_info': ('.1.3.6.1.4.1.9.9.117.1.1.2.1', [ OID_END, '1', '2'] ), + 'snmp_scan_function': \ + lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower(), +} diff --git a/checks/cisco_sys_mem b/checks/cisco_sys_mem new file mode 100644 index 0000000..e202981 --- /dev/null +++ b/checks/cisco_sys_mem @@ -0,0 +1,62 @@ +#!/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. + +# cseSysMemoryUtilization .1.3.6.1.4.1.9.9.305.1.1.2.0 +# + +cisco_mem_default_levels = (80.0, 90.0) + +def inventory_cisco_sys_mem(info): + if info: + return [ (None, "cisco_mem_default_levels") ] + else: + return (3, "no snmp data found") + +def check_cisco_sys_mem(item, params, info): + warn, crit = params + if info[0][0]: + mem_used = float(info[0][0]) + perfdata = [("mem_used", mem_used, warn, crit, 0, 100)] + infotext = "%2.1f%% of supervisor memory used" % mem_used + if type(warn) == int or type(crit) == int: + return (3, infotext + "no limits applied, must be given in precent", perfdata) + if mem_used >= crit: + return (2, infotext + " (critical at %2.1f%% MB)" % crit, perfdata) + elif mem_used >= warn: + return (1, infotext + " (warning at %2.1f%% MB)" % warn, perfdata) + else: + return (0, infotext, perfdata) + + +check_info["cisco_sys_mem"] = { + "check_function" : check_cisco_sys_mem, + "inventory_function" : inventory_cisco_sys_mem, + "service_description" : "Supervisor Mem Used", + "has_perfdata" : True, + "group" : "cisco_sys_mem", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.305.1.1.2.0"), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.305.1.1.2", "0" ), +}

10 years, 10 months

Check_MK Git: check_mk: Preliminary versions of new tests for Rittals cmc III and moxa units

by Götz Golla

Module: check_mk Branch: master Commit: 59725f082b5fc92e54be7e2e1d85f96127cefa41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59725f082b5fc9… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Nov 25 19:58:05 2013 +0100 Preliminary versions of new tests for Rittals cmc III and moxa units --- checks/cmciii_access | 65 ++++++++++++++++++++++++ checks/cmciii_fanunit_airtemp | 111 +++++++++++++++++++++++++++++++++++++++++ checks/cmciii_psm_current | 74 +++++++++++++++++++++++++++ checks/cmciii_psm_io | 86 +++++++++++++++++++++++++++++++ checks/cmciii_psm_plugs | 69 +++++++++++++++++++++++++ checks/cmciii_pu_io | 68 +++++++++++++++++++++++++ checks/cmciii_state | 74 +++++++++++++++++++++++++++ checks/cmciii_temp | 91 +++++++++++++++++++++++++++++++++ checks/moxa-iologik-e2242 | 79 +++++++++++++++++++++++++++++ 9 files changed, 717 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=59725f082b…

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1085

by Mathias Kettner

Module: check_mk Branch: master Commit: d4152fea96673809962d7888c566c5339bcc8d6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4152fea966738… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 25 10:37:21 2013 +0100 Updated bug entries #1085 --- .bugs/1085 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/1085 b/.bugs/1085 new file mode 100644 index 0000000..0890761 --- /dev/null +++ b/.bugs/1085 @@ -0,0 +1,9 @@ +Title: Personal settings: name of language de missing +Component: multisite +State: open +Date: 2013-11-25 10:36:27 +Targetversion: future +Class: nastiness + +In the personal setting when you want to select a language, +instead of "German" there is just a "de".

10 years, 10 months

Check_MK Git: check_mk: Fixed bug introduced on last friday with multi line SNMP response

by Lars Michelsen

Module: check_mk Branch: master Commit: a3111cd2a4e3421eb1f5a06da16dd1521de27e21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3111cd2a4e342… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 25 10:17:16 2013 +0100 Fixed bug introduced on last friday with multi line SNMP response --- modules/snmp.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index b44890d..ecf8e48 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -417,8 +417,9 @@ def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False): # a continuation line. rowinfo = [] try: - for line in snmp_process.stdout.xreadlines(): - line = line.strip() + line_iter = snmp_process.stdout.xreadlines() + while True: + line = line_iter.next().strip() parts = line.split('=', 1) if len(parts) < 2: continue # broken line, must contain = @@ -431,7 +432,7 @@ def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False): if len(value) > 0 and value[0] == '"' and value[-1] != '"': # to be continued while True: # scan for end of this dataset - nextline = snmp_process.next().strip() + nextline = line_iter.next().strip() value += " " + nextline if value[-1] == '"': break

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits