Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

Check_MK Git: check_mk: Make Views snapin foldable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab3a54e7b64d4c9064cbcf64a1969a0f15dcee40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab3a54e7b64d4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 24 09:41:48 2011 +0200 Make Views snapin foldable --- ChangeLog | 1 + web/htdocs/check_mk.css | 12 ++++++++++++ web/htdocs/htmllib.py | 24 +++++++++++++++++++++++- web/htdocs/index.py | 2 ++ web/htdocs/js/check_mk.js | 13 +++++++++++-- web/htdocs/weblib.py | 23 +++++++++-------------- web/plugins/sidebar/shipped.py | 8 +++++--- 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8ee6ea..fb6366f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Multisite: * FIX: make non-Ascii characters in services names work again * Introduced basic infrastructure for multilanguage support in Multisite + * Make 'Views' snapin foldable WATO: * Configration files can now be administered via the WEB UI diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5a703e5..029ea0d 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -45,6 +45,18 @@ div { padding: 0; } +/* foldable trees */ +img.treeangle { + width: 14px; + height: 14px; + margin-right: 3px; + margin-top: 2px; +} +b.treeangle.title { + font-weight: bold; + color: #ffffff; +} + /* __ __ _ | \/ | __ _(_)_ __ diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ea26276..8b29899 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import time, cgi, config, os, defaults, pwd, urllib +import time, cgi, config, os, defaults, pwd, urllib, weblib from lib import * # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' @@ -656,3 +656,25 @@ class html: if omd_site == self.apache_user(): omd_mode = 'own' return (omd_mode, omd_site) + + def begin_foldable_container(self, treename, id, isopen, title): + # try to get persistet state of tree + tree_state = weblib.get_tree_states(treename) + if id in tree_state: + isopen = tree_state[id] == "on" + + img_num = isopen and "90" or "00" + onclick = ' onclick="toggle_foldable_container(\'%s\', \'%s\')"' % (treename, id) + onclick += ' onmouseover="this.style.cursor=\'pointer\';" ' + onclick += ' onmouseout="this.style.cursor=\'auto\';" ' + + self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' + 'src="images/tree_%s.png" %s>' % + (treename, id, img_num, onclick)) + self.write('<b class="treeangle title" class=treeangle %s>%s</b><br>' % + (onclick, title)) + self.write('<ul class="treeangle" style="display: %s" id="tree.%s.%s">' % + ((not isopen) and "none" or "", treename, id)) + + def end_foldable_container(self): + self.write("</ul>") diff --git a/web/htdocs/index.py b/web/htdocs/index.py index fba1c4d..5bfa3ff 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -149,6 +149,8 @@ def handler(req, profiling = True): # helper functions for creating valid HTML. Parse URI and # store results in the request object for later usage. html = htmllib.html(req) + html.id = {} # create unique ID for this request + __builtin__.html = html req.uriinfo = htmllib.uriinfo(req) try: diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 650ae44..547b4e8 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -496,7 +496,7 @@ var tree_anim_o = null; function toggle_folding(oImg, state) { tree_anim_o = oImg; - if(state === 1) { + if (state) { oImg.src = "images/tree_10.png"; setTimeout("set_tree_animation_step('20');", 10); setTimeout("set_tree_animation_step('30');", 20); @@ -507,7 +507,8 @@ function toggle_folding(oImg, state) { setTimeout("set_tree_animation_step('80');", 180); setTimeout("set_tree_animation_step('90');", 260); - } else { + } + else { oImg.src = "images/tree_80.png"; setTimeout("set_tree_animation_step('70');", 10); setTimeout("set_tree_animation_step('60');", 20); @@ -557,6 +558,14 @@ function set_tree_animation_step(num) tree_anim_o.src = "images/tree_" + num + ".png"; } +function toggle_foldable_container(treename, id) { + var oImg = document.getElementById('treeimg.' + treename + '.' + id); + var oBox = document.getElementById('tree.' + treename + '.' + id); + toggle_tree_state(treename, id, oBox); + toggle_folding(oImg, oBox.style.display != "none"); + oImg = null; + oBox = null; +} function toggle_assumption(oImg, site, host, service) { diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 3ec120e..b316091 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -28,40 +28,36 @@ import config import lib treestates = {} +treestates_for_id = None def load_tree_states(): global treestates - treestates = config.load_user_file("treestates", {}) + global treestates_for_id + if html.id is not treestates_for_id: + treestates = config.load_user_file("treestates", {}) + treestates_for_id = html.id def save_tree_states(): config.save_user_file("treestates", treestates) def get_tree_states(tree): - if not treestates: - load_tree_states() + load_tree_states() return treestates.get(tree, {}) def set_tree_state(tree, key, val): - global treestates - - if not treestates: - load_tree_states() + load_tree_states() if tree not in treestates: treestates[tree] = {} treestates[tree][key] = val - def set_tree_states(tree, val): - global treestates - if not treestates: - load_tree_states() + load_tree_states() treestates[tree] = val def ajax_tree_openclose(h): - global html - html = h + load_tree_states() tree = html.var("tree") name = html.var("name") @@ -71,4 +67,3 @@ def ajax_tree_openclose(h): set_tree_state(tree, name, html.var("state")) save_tree_states() - diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 01d98ad..4d46540 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -104,12 +104,14 @@ def render_views(): continue if t == topic: if first: - html.write("<h3>%s</h3>\n" % topic) + html.begin_foldable_container("views", topic, False, topic) + # html.write("<h3>%s</h3>\n" % topic) first = False - html.write("<ul>") + # html.write("<ul>") bulletlink(title, "view.py?view_name=%s" % name) if not first: # at least one item rendered - html.write("</ul>") + html.end_foldable_container() + # html.write("</ul>") s = [ (view.get("topic", _("Other")), view["title"], name) for name, view in html.available_views.items() if not view["hidden"] ] s.sort()

13 years, 1 month

Check_MK Git: check_mk: Added man pages for brocade_fcport

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e16189d4e2b06125b4e43cd51e9900c1d288d7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e16189d4e2b06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 17:54:27 2011 +0200 Added man pages for brocade_fcport --- checkman/brocade_fcport | 138 +++++++++++++++++++++++++++++++++++++++++++++++ checks/brocade_fcport | 8 ++-- 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/checkman/brocade_fcport b/checkman/brocade_fcport new file mode 100644 index 0000000..0a0ff8e --- /dev/null +++ b/checkman/brocade_fcport @@ -0,0 +1,138 @@ +title: Monitor FibreChannel ports of Brocade FC switches +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This checks monitors a FibreChannel port of a Brocade FC switch + to very great detail. It obsoletes the older checks {fc_brocade_port} and + {fc_brocade_port_detailed}. The check goes critical under the following conditions: + + {[1]} The physical state, operational state or adminstrative state of the port is not + as expected. + + {[2]} The current or averaged throughput exceeds certain absolute or + percentual levels. + + {[3]} An error counter exceeds its configured levels (CRC errors, Enc-OUT + frames, no Tx credits, C3 discards) + + {Averaging}: This check supports averaging on all counters. Averaging is + turned on but setting the check parameter {"average"} to a number of minutes. + In that case the check produces additional performance data for each parameter + and all warning/error levels are only applied on the averaged value, not on + the current one. This is especially helpful when using levels on the throughput. + +item: + The item is the port-number as two-digit or three-digit string (on switches + with 100 or more ports) as printed on the switch (note: the SNMP-index of + port {00} is {1}!). For ISL ports (inter-switch-links), an {ISL} is appended + to the item, e.g. {00 ISL}. That allows you to create rules that select + different check parameters for ISL and normal ports without specifying each + individual port. Also if you have configured port names, they will appear + in the check item (and thus the service description). This can be turned + off. + +examples: + # Generally turn on averaging with 15 Minutes on all ports: + brocade_fcport_default_levels["average"] = 15 + + # Alternative: set all default parameters at once: + brocade_fcport_default_levels = { + "rxcrcs": (3.0, 20.0), # allowed percentage of CRC errors + "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames + "notxcredits": (3.0, 20.0), # allowed percentage of No Tx Credits + "c3discards": (3.0, 20.0), # allowed percentage of C3 discards + "assumed_speed": 2.0, # used, if speed not available in SNMP data + "bw": (80.0, 90.0), # percentual levels for throughput + "average": 30, # apply all levels on 30 minute average + } + + # Set traffic levels to 80/90% on ISL ports + check_parameters += [ + ( { "bw" : (80.0, 90.0) }, ALL_HOSTS, [ "Port .* ISL" ]), + ] + + # Ignore port states on non-ISL ports + check_parameters += [ + ( { "phystate" : None, "opstate" : None }, ALL_HOSTS, [ "!Port .* ISL", "Port" ]), + ] + + +perfdata: + For each port there are sent {in}, {out}, {rxframes}, {txframes}, {rxcrcs}, + {rxencoutframes}, {c3discards} and {notxcredits}. If averaging is turned on, then + each value comes twices: once normal and once with {_avg} appended as averaged + value. All rates are in Bytes/s or Frames/s. If you are using PNP4Nagios, then + you are strongly encouraged to set {RRD_STORAGE_TYPE = MULTIPLE} in + {process_perfdata.cfg}. Please note, that you need to re-create or convert existing + RRD database if you change this setting. + +inventory: + The inventory creates checks for all operational ports. What this exactly means, + can be configured (see CONFIGURATION VARIABLES). + +[parameters] +parameters (dict): This check works with dictionary based parameters. The + following keys are allowed: + + {"bw"}: A pair of warn / crit levels on the throughput. Floating point + numbers are interpreted as percentages of the maximum bandwidth of + the port, e.g. {(80.0, 90.0)}. Integer numbers are interpreted as megabytes, + e.g. {(100, 150)}. + + {"assumed_speed"}: On some older devices the automatic detection of the + link speed does not work. You can set the assumed link speed (in GBit/s) + here (example: {2.0}) + + {"rxcrcs"}: A pair of percentages of the maximum allowed CRC errors on + received frames. The default is set to {(3.0, 20.0)}, which will warn + at 3% and be critical at 20% of errors. + + {"rxencoutframes"}: A pair of percentages for the Enc-Out frames rate. The + default is {(3.0, 20.0)}. + + {"notxcredits"}: A pair of percentages for no-TxCredits errors. The default + is {(3.0, 20.0)}. + + {"c3discards"}: A pair of percentages for the C3 discards. The default is + {(3.0, 20.0)}. + + {"average"}: A number in minutes. If this parameter is set, then averaging + is turned on and all levels will be applied to the averaged values, not the + the current ones. Per default, averaging is turned off. + + {"phystate"}: The expected physical state of the port or {None} if that should + not be checked. + + {"opstate"}: The expected operational state of the port or {None} if that should + not be checked. + + {"admstate"}: The expected adminstrative state of the port of {None} if that should + not be checked. + + +[configuration] +brocade_fcport_inventory_phystates(list): If list of physical states that ports + must have in order to be inventorized. The default value is {[ 3, 4, 5, 6, 7, 8, 9, ]}. + Possible are: {1}: noCard, {2}: noTransceiver, {3}: laserFault, {4}: noLight, + {5}: noSync, {6}: inSync, {7}: portFault, {8}: diagFault and {9}: lockRef. + +brocade_fcport_inventory_opstates(list): The list of operational states inventorized + ports must have to be inventorized. The default is {[ 1, 2, 3, 4, ]}. Possible are: + {0}: unknown, {1}: online, {2}: offline, {3}: testing, {4}: faulty. + +brocade_fcport_inventory_admstates(list): The list of adminstrative states inventorized + ports must have. The default is {[ 1, 3, 4, ]}. Possible are: + {1}: online, {2}: offline, {3}: testing, {4}: faulty. + +brocade_fcport_inventory_use_portname(boolean): If you set this to {True}, then + configured names of the ports appear in the service descripion (and thus can + also be used for check parameter rules). This uses the SNMP OID {swFCPortName}. + The default is {True}. + +brocade_fcport_inventory_show_isl(boolean): If you set this {True} (which is the default), + then {ISL} will be appended to the port name if that port is in inter-switch-link. + +brocade_fcport_default_levels(dict): The default check parameters for all ports. + These can be overridden (also partially) by {check_parameters}. diff --git a/checks/brocade_fcport b/checks/brocade_fcport index fe851fd..58f0ef2 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -44,10 +44,10 @@ brocade_fcport_inventory_show_isl = True # add "ISL" to service description check_default_levels["brocade_fcport"] = "brocade_fcport_default_levels" factory_settings["brocade_fcport_default_levels"] = { - "rxcrcs": (3.0, 20.0), - "rxencoutframes": (3.0, 20.0), - "notxcredits": (3.0, 20.0), - "c3discards": (3.0, 20.0), + "rxcrcs": (3.0, 20.0), # allowed percentage of CRC errors + "rxencoutframes": (3.0, 20.0), # allowed percentage of Enc-OUT Frames + "notxcredits": (3.0, 20.0), # allowed percentage of No Tx Credits + "c3discards": (3.0, 20.0), # allowed percentage of CRC errors "assumed_speed": 2.0, # used, if speed not available in SNMP data }

13 years, 1 month

Check_MK Git: check_mk: Added Perf-O-Meter for Brocade FC Ports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e6ace98839dbda3e1d95cc0399557cf3856c5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e6ace98839dbd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 16:57:57 2011 +0200 Added Perf-O-Meter for Brocade FC Ports --- web/plugins/perfometer/check_mk.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 068b296..b9a4c99 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -231,6 +231,7 @@ perfometers["check_mk-if64"] = perfometer_check_mk_if perfometers["check_mk-lnx_if"] = perfometer_check_mk_if perfometers["check_mk-hpux_if"] = perfometer_check_mk_if perfometers["check_mk-mcdata_fcport"] = perfometer_check_mk_if +perfometers["check_mk-brocade_fcport"] = perfometer_check_mk_if def perfometer_oracle_tablespaces(row, check_command, perf_data): current = float(perf_data[0][1])

13 years, 1 month

Check_MK Git: check_mk: brocade_fcport: add speed information to output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5ac0e54f245b9f7246d92683a3df20ba8115bd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5ac0e54f245b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 16:52:32 2011 +0200 brocade_fcport: add speed information to output --- checks/brocade_fcport | 26 ++++++++++++++------------ modules/agent_simulator.py | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 7da3826..fe851fd 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -98,12 +98,11 @@ def inventory_brocade_fcport(checkname, info): def check_brocade_fcport(item, params, info): # Accept item, even if port name or ISL state has changed - item_index = int(item.split()[0]) + 1 # we substracted 1 at inventory - portinfo = [ line for line in info[0] if int(line[0]) == item_index ] + item_index = int(item.split()[0]) + portinfo = [ line for line in info[0] if int(line[0]) == item_index + 1] index, phystate, opstate, admstate, txwords, rxwords, txframes, rxframes, \ notxcredits, rxcrcs, rxencoutframes, c3discards, speed = map(int, portinfo[0][:-1]) - summarystate = 0 output = [] perfdata = [] @@ -123,15 +122,16 @@ def check_brocade_fcport(item, params, info): gbit = float(brocade_fcport_speed[speed].replace("Gbit", "")) speedmsg = ("%.0fGbit/s" % gbit) + output.append(speedmsg) # convert gbit netto link-rate to Byte/s (8/10 enc) - wirespeed = gbit * 0.8 * 1000000.0 / 8 + wirespeed = gbit * 1000000000.0 * 0.8 / 8 # Now check rates of various error counters this_time = time.time() try: - timedif, rxwords_rate = get_counter("brocade_fcport.rxwords.%s" % index, this_time, rxwords) - timedif, txwords_rate = get_counter("brocade_fcport.txwords.%s" % index, this_time, txwords) + timedif, rxwords_rate = get_counter("brocade_fcport.rxwords.%s" % index, this_time, rxwords) + timedif, txwords_rate = get_counter("brocade_fcport.txwords.%s" % index, this_time, txwords) # compute traffic in B/s and MB/s in_bytes = rxwords_rate * 4 @@ -148,12 +148,12 @@ def check_brocade_fcport(item, params, info): warn, crit = bw_thresh if type(warn) == float: warn_bytes = wirespeed * warn / 100.0 - else: - warn_bytes = warn / 1048576.0 + else: # in MB + warn_bytes = warn * 1048576.0 if type(crit) == float: crit_bytes = wirespeed * crit / 100.0 - else: - crit_bytes = crit / 1048576.0 + else: # in MB + crit_bytes = crit * 1048576.0 for what, value in [("In", in_bytes), ("Out", out_bytes)]: output.append("%s: %s/s" % (what, get_bytes_human_readable(value))) @@ -197,7 +197,8 @@ def check_brocade_fcport(item, params, info): # if averaging is on, compute average and apply levels to average if average: - timedif, per_sec_avg = get_average("brocade_fcport.%s.%s.avg" % (counter, item), this_time, per_sec, average) + timedif, per_sec_avg = get_average("brocade_fcport.%s.%s.avg" % \ + (counter, item), this_time, per_sec, average) perfdata.append( ("%s_avg" % counter, per_sec_avg ) ) # compute error rate (errors in relation to number of frames) (from 0.0 to 1.0) @@ -209,7 +210,8 @@ def check_brocade_fcport(item, params, info): # Honor averaging of error rate if average: - timedif, rate = get_average("brocade_fcport.%s.%s.avgrate" % (counter, item), this_time, rate, average) + timedif, rate = get_average("brocade_fcport.%s.%s.avgrate" % + (counter, item), this_time, rate, average) text += ", Avg: %.2f%%" % (rate * 100.0) error_percentage = rate * 100.0 diff --git a/modules/agent_simulator.py b/modules/agent_simulator.py index 9847aec..51d7c71 100644 --- a/modules/agent_simulator.py +++ b/modules/agent_simulator.py @@ -37,5 +37,5 @@ def agentsim_enum(values, period = 1): # period is in seconds return values[hit] def agentsim_sinus(base = 50, amplitude = 50, period = 300): - return math.sin(our_uptime() * 2.0 * math.pi / period) * amplitude + base + return int(math.sin(our_uptime() * 2.0 * math.pi / period) * amplitude + base)

13 years, 1 month

Check_MK Git: check_mk: brocade_fcport: add PNP template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: abac35bc9646287219a074f81357a3804b12a1c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abac35bc964628… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 16:53:47 2011 +0200 brocade_fcport: add PNP template --- ChangeLog | 3 - pnp-templates/check_mk-brocade_fcport.php | 132 +++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b522f3b..a8ee6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,9 +3,6 @@ * FIX: sort output of cmk --list-hosts alphabetically Checks & Agents: - * FIX: brocade_fcport: port numbers where shifted by one - * FIX: brocade_fcport: inventory handles invalid data better - * FIX: brocade_fcport: add missing perfdata for frames * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. diff --git a/pnp-templates/check_mk-brocade_fcport.php b/pnp-templates/check_mk-brocade_fcport.php new file mode 100644 index 0000000..40077e5 --- /dev/null +++ b/pnp-templates/check_mk-brocade_fcport.php @@ -0,0 +1,132 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2010 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. + + +# The number of data source various due to different +# settings (such as averaging). We rather work with names +# than with numbers. +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; +} + + +# 1. GRAPH: THROUGHPUT IN MB/s + +$ds_name[1] = 'Traffic'; +$opt[1] = "--vertical-label \"MByte/sec\" -X0 -b 1024 --title \"Traffic for $hostname / $servicedesc\" "; + +$def[1] = "" + . "HRULE:0#c0c0c0 " + . "DEF:in=$RRD[in] " + . "DEF:out=$RRD[out] " + . "CDEF:inmb=in,1048576,/ " + . "CDEF:outmb=out,1048576,/ " + . "AREA:inmb#60a020:\"in \" " + . "GPRINT:inmb:LAST:\"%5.1lf MB/s last\" " + . "GPRINT:inmb:AVERAGE:\"%5.1lf MB/s avg\" " + . "GPRINT:inmb:MAX:\"%5.1lf MB/s max\\n\" " + . "CDEF:out_draw=outmb,-1,* " + . "AREA:out_draw#2060a0:\"out \" " + . "GPRINT:outmb:LAST:\"%5.1lf MB/s last\" " + . "GPRINT:outmb:AVERAGE:\"%5.1lf MB/s avg\" " + . "GPRINT:outmb:MAX:\"%5.1lf MB/s max\\n\" " + ; + +if (isset($RRD['in_avg'])) { +$def[1] .= "" + . "DEF:inavg=$RRD[in_avg] " + . "DEF:outavg=$RRD[out_avg] " + . "CDEF:inavgmb=inavg,1048576,/ " + . "CDEF:outavgmb=outavg,1048576,/ " + . "CDEF:outavgmbdraw=outavg,-1048576,/ " + . "LINE:inavgmb#a0d040:\"in (avg) \" " + . "GPRINT:inavgmb:LAST:\"%5.1lf MB/s last\" " + . "GPRINT:inavgmb:AVERAGE:\"%5.1lf MB/s avg\" " + . "GPRINT:inavgmb:MAX:\"%5.1lf MB/s max\\n\" " + . "LINE:outavgmbdraw#40a0d0:\"out (avg)\" " + . "GPRINT:outavgmb:LAST:\"%5.1lf MB/s last\" " + . "GPRINT:outavgmb:AVERAGE:\"%5.1lf MB/s avg\" " + . "GPRINT:outavgmb:MAX:\"%5.1lf MB/s max\\n\" " + ; +} + +if ($WARN['in']) { + $def[1] .= "HRULE:$WARN[in]#ffff00:\"Warning (in)\" "; + $def[1] .= "HRULE:-$WARN[out]#ffff00:\"Warning (out)\" "; +} +if ($CRIT['in']) { + $def[1] .= "HRULE:$CRIT[in]#ff0000:\"Critical (in)\" "; + $def[1] .= "HRULE:-$CRIT[out]#ff0000:\"Critical (out)\" "; +} +if ($MAX['in']) { + $speedmb = $MAX['in'] / 1048576.0; + $speedtxt = sprintf("%.1f MB/s", $speedmb); + $def[1] .= "HRULE:$speedmb#ff80c0:\"Portspeed\: $speedtxt\" "; + $def[1] .= "HRULE:-$speedmb#ff80c0 "; + # $opt[1] .= " -u $speedmb -l -$speedmb"; +} + +# 2. GRAPH: FRAMES +$ds_name[2] = 'Frames'; +$opt[2] = "--vertical-label \"Frames/sec\" -b 1024 --title \"Frames per second\" "; +$def[2] = "" + . "HRULE:0#c0c0c0 " + . "DEF:in=$RRD[rxframes] " + . "DEF:out=$RRD[txframes] " + . "AREA:in#a0d040:\"in \" " + . "GPRINT:in:LAST:\"%5.1lf/s last\" " + . "GPRINT:in:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:in:MAX:\"%5.1lf/s max\\n\" " + . "CDEF:out_draw=out,-1,* " + . "AREA:out_draw#40a0d0:\"out \" " + . "GPRINT:out:LAST:\"%5.1lf/s last\" " + . "GPRINT:out:AVERAGE:\"%5.1lf/s avg\" " + . "GPRINT:out:MAX:\"%5.1lf/s max\\n\" " + ; + +# 3. GRAPH: ERRORS + +$ds_name[3] = 'Error counter'; +$opt[3] = "--vertical-label \"Error counter\" --title \"Problems\" "; +$def[3] = "" + . "DEF:rxcrcs=$RRD[rxcrcs] " + . "DEF:notxcredits=$RRD[notxcredits] " + . "DEF:rxencoutframes=$RRD[rxencoutframes] " + . "DEF:c3discards=$RRD[c3discards] " + . "LINE1:rxcrcs#c00000:\"CRC Errors \" " + . "GPRINT:rxcrcs:LAST:\"last\: %4.0lf/s \" " + . "LINE1:notxcredits#ff8000:\"No Tx Credits \" " + . "GPRINT:notxcredits:LAST:\"last\: %4.0lf/s\\n\" " + . "LINE1:rxencoutframes#ff0080:\"ENC-Out Frames \" " + . "GPRINT:rxencoutframes:LAST:\"last\: %4.0lf/s \" " + . "LINE1:c3discards#ffa0a0:\"Class 3 Discards\" " + . "GPRINT:c3discards:LAST:\"last\: %4.0lf/s\\n\" " + ; +?>

13 years, 1 month

Check_MK Git: check_mk: FIX: fix several problems in brodade_fcport

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8da1da9ab9e7dc9ba6d645a4d288565aec720b2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8da1da9ab9e7dc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 15:00:57 2011 +0200 FIX: fix several problems in brodade_fcport --- ChangeLog | 6 ++++-- checks/brocade_fcport | 39 +++++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b46672e..b522f3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,15 +3,17 @@ * FIX: sort output of cmk --list-hosts alphabetically Checks & Agents: + * FIX: brocade_fcport: port numbers where shifted by one + * FIX: brocade_fcport: inventory handles invalid data better + * FIX: brocade_fcport: add missing perfdata for frames * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) - * brocade_fcport: inventory handles invalid data better Multisite: - * Introduced basic infrastructure for multilanguage support in Multisite * FIX: make non-Ascii characters in services names work again + * Introduced basic infrastructure for multilanguage support in Multisite WATO: * Configration files can now be administered via the WEB UI diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 56d09a9..7da3826 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -64,6 +64,7 @@ def brocade_fcport_getitem(ports, index, portname, is_isl): def inventory_brocade_fcport(checkname, info): + # info[0] is port table, info[1] is ISL table if len(info) != 2: return @@ -72,17 +73,17 @@ def inventory_brocade_fcport(checkname, info): if len(info) > 1: isl_ports = dict(info[1]) - for item in info[0]: - if len(item) == 14: + for line in info[0]: + if len(line) == 14: try: - index = int(item[0]) - phystate = int(item[1]) - opstate = int(item[2]) - admstate = int(item[3]) + index = int(line[0]) + phystate = int(line[1]) + opstate = int(line[2]) + admstate = int(line[3]) except: # missing vital data. Skipping this port continue - portname = item[13] - is_isl = item[0] in isl_ports + portname = line[13] + is_isl = line[0] in isl_ports if admstate in brocade_fcport_inventory_admstates and \ opstate in brocade_fcport_inventory_opstates and \ @@ -97,24 +98,19 @@ def inventory_brocade_fcport(checkname, info): def check_brocade_fcport(item, params, info): # Accept item, even if port name or ISL state has changed - item_index = int(item.split()[0]) + item_index = int(item.split()[0]) + 1 # we substracted 1 at inventory portinfo = [ line for line in info[0] if int(line[0]) == item_index ] - if len(portinfo) < 1: - return (3, "UNKOWN - Port not found in SNMP data") - - isl_ports = dict(info[1]) - - # Prepare data, convert to int index, phystate, opstate, admstate, txwords, rxwords, txframes, rxframes, \ notxcredits, rxcrcs, rxencoutframes, c3discards, speed = map(int, portinfo[0][:-1]) - + summarystate = 0 output = [] perfdata = [] # Lookup port speed in ISL table for ISL ports (older switches do not provide this # information in the normal table) + isl_ports = dict(info[1]) if str(index) in isl_ports: gbit = float(int(isl_ports.get(str(index))) / 16) speedmsg = ("ISL at %.0fGbit/s" % gbit) @@ -134,8 +130,6 @@ def check_brocade_fcport(item, params, info): # Now check rates of various error counters this_time = time.time() try: - timedif, rxframes_rate = get_counter("brocade_fcport.rxframes.%s" % index, this_time, rxframes) - timedif, txframes_rate = get_counter("brocade_fcport.txframes.%s" % index, this_time, txframes) timedif, rxwords_rate = get_counter("brocade_fcport.rxwords.%s" % index, this_time, rxwords) timedif, txwords_rate = get_counter("brocade_fcport.txwords.%s" % index, this_time, txwords) @@ -179,6 +173,15 @@ def check_brocade_fcport(item, params, info): summarystate = max(1, summarystate) output.append(" >= %s/s(!!)" % (get_bytes_human_readable(warn_bytes))) + # R X F R A M E S & T X F R A M E S + # Put number of frames into performance data (honor averaging) + timedif, rxframes_rate = get_counter("brocade_fcport.rxframes.%s" % index, this_time, rxframes) + timedif, txframes_rate = get_counter("brocade_fcport.txframes.%s" % index, this_time, txframes) + for what, value in [ ("rxframes", rxframes_rate), ("txframes", txframes_rate) ]: + perfdata.append((what, value)) + if average: + timedif, value = get_average("brocade_fcport.%s.%s.avg" % (what, item), this_time, value, average) + perfdata.append( ("%s_avg" % what, value) ) # E R R O R C O U N T E R S # handle levels on error counters

13 years, 1 month

Check_MK Git: check_mk: Fix Apache/WATO-Bug (plugins dir missing)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6cbcb37825acc798c1e05e9698d53a4c6410775 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6cbcb37825acc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 14:41:58 2011 +0200 Fix Apache/WATO-Bug (plugins dir missing) --- web/htdocs/wato.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4805038..5f5f259 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1850,9 +1850,10 @@ extra_buttons = [ # Load all wato plugins plugins_path = defaults.web_dir + "/plugins/wato" -for fn in os.listdir(plugins_path): - if fn.endswith(".py"): - execfile(plugins_path + "/" + fn) +if os.path.exists(plugins_path): + for fn in os.listdir(plugins_path): + if fn.endswith(".py"): + execfile(plugins_path + "/" + fn) if defaults.omd_root: local_plugins_path = defaults.omd_root + "/local/share/check_mk/web/plugins/wato"

13 years, 1 month

Check_MK Git: check_mk: brocade_fcport: inventory handles invalid data better

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6952d9a44d6d35508e9d003edec13481d7bf97fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6952d9a44d6d35… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 14:24:46 2011 +0200 brocade_fcport: inventory handles invalid data better --- ChangeLog | 1 + checks/brocade_fcport | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06e639c..b46672e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) + * brocade_fcport: inventory handles invalid data better Multisite: * Introduced basic infrastructure for multilanguage support in Multisite diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 52f6cf8..56d09a9 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -74,10 +74,13 @@ def inventory_brocade_fcport(checkname, info): for item in info[0]: if len(item) == 14: - index = int(item[0]) - phystate = int(item[1]) - opstate = int(item[2]) - admstate = int(item[3]) + try: + index = int(item[0]) + phystate = int(item[1]) + opstate = int(item[2]) + admstate = int(item[3]) + except: # missing vital data. Skipping this port + continue portname = item[13] is_isl = item[0] in isl_ports

13 years, 1 month

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4379c8b099d0284737c31a1a872a2943f8e5eaeb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4379c8b099d028… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 08:27:14 2011 +0200 Updated bug entries --- .bugs/281 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/281 b/.bugs/281 new file mode 100644 index 0000000..f53aed7 --- /dev/null +++ b/.bugs/281 @@ -0,0 +1,12 @@ +Title: Make visibility of Views in Snapin customizable +Component: multisite +Benefit: 3 +State: open +Cost: 3 +Date: 2011-05-23 08:25:51 +Class: feature + +We could add a button "Customize". When you press it, then next to +each view in the sidebar snapin "Views" a checkbox appears. With +that you can select those views that should be visible. That should +be persistet per user.

13 years, 1 month

Check_MK Git: check_mk: Reserved 30 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1bec888f4ceae09e4b52125733727d84d2f3ae0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bec888f4ceae0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 23 08:25:44 2011 +0200 Reserved 30 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 1473a88..b661fff 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -281 +311

13 years, 1 month

← Newer
1
2
3
4
5
6
7
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011