Checkmk git commits June 2011

checkmk-commits@lists.checkmk.com

2 participants
128 discussions

Check_MK Git: check_mk: WATO: improved search dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7877bbf28d92830beaf1cac451595f2ae1238d89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7877bbf28d9283… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 17:00:18 2011 +0200 WATO: improved search dialog --- web/htdocs/check_mk.css | 8 ++++++-- web/htdocs/wato.py | 13 +++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8c73694..2ea3954 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1629,11 +1629,15 @@ table.add_snapin i { position: relative;*/ } +.wato table.form td.legend { + border-right-style: none; +} + .wato table.form td.checkbox { width: 40px; height: 40px; - vertical-align: middle; - text-align: center; + vertical-align: top; + text-align: right; border: 1px solid white; border-left-style: none; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d06f0ce..1036139 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -849,12 +849,6 @@ def mode_search(phase): html.begin_form("search") html.write("<table class=form>") - # Wether to search only in this folder - html.write("<tr><td class=legend></td><td colspan=2 class=content>") - html.checkbox("onlyhere", True) - html.write(_(" Search only in the folder <b>%s</b> and below") % g_folder["title"]) - html.write("</td></tr>") - # host name html.write("<tr><td class=legend>" + _("Hostname") + "</td><td class=content></td><td class=content>") html.text_input("host") @@ -866,9 +860,12 @@ def mode_search(phase): # Button html.write('<tr><td class="buttons" colspan=3>') - html.button("save", _("Search"), "submit") + html.button("_global", _("Search globally"), "submit") + html.button("_local", _("Search in %s") % g_folder["title"], "submit") html.write("</td></tr>\n") + + html.write("</table>\n") html.hidden_fields() html.end_form() @@ -882,7 +879,7 @@ def mode_search(phase): crit.update(collect_attributes(do_validate = False)) html.write("<h3>" + _("Search results:") + "</h3>") - if html.var("onlyhere"): + if html.has_var("_local"): folder = g_folder else: folder = g_root_folder

13 years, 3 months

Check_MK Git: check_mk: WATO: new feature: customizable attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 80cad14dd878ec6149a44c4e9188fe04c30f73f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80cad14dd878ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 31 14:08:10 2011 +0200 WATO: new feature: customizable attributes --- web/htdocs/check_mk.css | 3 +- web/htdocs/htmllib.py | 15 +- web/htdocs/js/wato.js | 12 + web/htdocs/views.py | 2 +- web/htdocs/wato.py | 671 +++++++++++++++++++------------- web/plugins/wato/builtin_attributes.py | 11 +- 6 files changed, 435 insertions(+), 279 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=80cad14dd8…

13 years, 3 months

Check_MK Git: check_mk: WATO: custom attributes now inheritable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fcef9816cdc0a6b2984c251b64302e533afc89d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcef9816cdc0a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 31 18:12:03 2011 +0200 WATO: custom attributes now inheritable --- web/htdocs/check_mk.css | 32 ++- web/htdocs/htmllib.py | 8 + web/htdocs/js/wato.js | 14 +- web/htdocs/wato.py | 495 +++++++++++++++++++------------- web/plugins/wato/builtin_attributes.py | 4 +- 5 files changed, 340 insertions(+), 213 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fcef9816cd…

13 years, 3 months

Check_MK Git: check_mk: WATO: bulk cleanup of attributes, several fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57eb026c6b64906582059dc7978e2986466a3f35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57eb026c6b6490… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 1 11:16:02 2011 +0200 WATO: bulk cleanup of attributes, several fixes --- web/htdocs/check_mk.css | 5 +- web/htdocs/htmllib.py | 15 ++- web/htdocs/wato.py | 241 +++++++++++++++++++++++++++++++++++----------- 3 files changed, 197 insertions(+), 64 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=57eb026c6b…

13 years, 3 months

Check_MK Git: check_mk: WATO: convert to attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7874b0f7fd1f9779269b6bd64a2a5b1b9970f2a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7874b0f7fd1f97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 18:38:44 2011 +0200 WATO: convert to attributes --- modules/check_mk.py | 1 + web/htdocs/htmllib.py | 17 ++- web/htdocs/wato.py | 214 +++++++++++++++++++++++++++---- web/plugins/wato/builtin_attributes.py | 31 +++++ 4 files changed, 230 insertions(+), 33 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7874b0f7fd…

13 years, 3 months

Check_MK Git: check_mk: WATO: fix translation problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a00aecc5f4a5c4b192d1f59508371a77a503cf4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a00aecc5f4a5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 30 18:39:34 2011 +0200 WATO: fix translation problem --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 41921b1..2744df0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2095,7 +2095,7 @@ def interactive_progress(items, title, stats, finishvars, timewait): html.write("</table>") html.write("</center>") json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) - html.javascript('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");' % + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");') % (html.var('mode'), html.makeuri([]), json_items, html.makeuri(finishvars))) # +----------------------------------------------------------------------+

13 years, 3 months

Check_MK Git: check_mk: updates

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01eda1125c9f5d37804dbed9e110ad8418c07b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01eda1125c9f5d… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 10 15:56:50 2011 +0200 updates --- checkman/f5_bigip_temp | 2 +- checks/f5_bigip_temp | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/checkman/f5_bigip_temp b/checkman/f5_bigip_temp index 62805f9..0a401d3 100644 --- a/checkman/f5_bigip_temp +++ b/checkman/f5_bigip_temp @@ -18,4 +18,4 @@ inventory: perfdata: - the check does not (yet) generate performance data. + It generates performance data for the current, warning and critical temperaturs and graphs those. diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 48c21fb..9579384 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -61,7 +61,7 @@ def f5_bigip_temp_genitem(info): def inventory_f5_bigip_temp(checkname, info): inventory = [] for sensor in f5_bigip_temp_genitem(info): - inventory.append([sensor[0], nom_temp]) + inventory.append([sensor[0], sensor[2]]) return inventory @@ -70,14 +70,19 @@ def check_f5_bigip_temp(item, params, info): for sensor in f5_bigip_temp_genitem(info): if item == sensor[0]: - tmpdiff = sensor[1] - sensor[2] - msgtxt = " - Temperature is %dC" % (sensor[1]) - if 5 >= tmpdiff: - return (0, "OK" + msgtxt) - elif tmpdiff > 15: - return (2, "CRIT" + msgtxt + "!!") - elif tmpdiff > 10: - return (1, "WARN" + msgtxt + "!") + cur_temp = sensor[1] + nom_temp = sensor[2] + # allow some increase in temperature to avoid false alarms + warn = nom_temp + 9 + crit = nom_temp + 18 + msgtxt = " - Temperature is %dC, Levels at %d/%d" % (cur_temp, warn, crit) + perfdata = [ ("temp", cur_temp, warn, crit) ] + if warn >= cur_temp: + return (0, "OK" + msgtxt, perfdata) + elif crit <= cur_temp: + return (2, "CRIT" + msgtxt + "!!", perfdata) + elif warn < cur_temp: + return (1, "WARN" + msgtxt + "!", perfdata) else: return (3, "UNKNOWN - unable to read Temperature") @@ -91,7 +96,7 @@ snmp_info["f5_bigip_temp"] = \ ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] -check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 0, inventory_f5_bigip_temp ) +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 1, inventory_f5_bigip_temp ) # Get ID and Speed from the CPU and chassis fan tables

13 years, 3 months

Check_MK Git: check_mk: New check: f5_bigip_temp - Temperature Monitoring for F5 Big/IP

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 036635c49c3eb712258823403c9beafad99fb05b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=036635c49c3eb7… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 10 13:47:42 2011 +0200 New check: f5_bigip_temp - Temperature Monitoring for F5 Big/IP Fixes: f5_bigip_fans - Typo / case corrections --- checkman/f5_bigip_fans | 2 +- checkman/f5_bigip_temp | 21 ++++++++++ checks/f5_bigip_fans | 2 +- checks/f5_bigip_temp | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 2 deletions(-) diff --git a/checkman/f5_bigip_fans b/checkman/f5_bigip_fans index 23d5698..dda7328 100644 --- a/checkman/f5_bigip_fans +++ b/checkman/f5_bigip_fans @@ -5,7 +5,7 @@ license: GPL distribution: check_mk description: The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the - status of builtin fan. It will alert if the rotational speed falls to lower-than-normal levels. + status of builtin fans. It will alert if the rotational speed falls to lower-than-normal levels. It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 devices. diff --git a/checkman/f5_bigip_temp b/checkman/f5_bigip_temp new file mode 100644 index 0000000..62805f9 --- /dev/null +++ b/checkman/f5_bigip_temp @@ -0,0 +1,21 @@ +title: Check status of temperature sensors on F5 Big-IP +agents: snmp +author: Florian Heigl <fh(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + The check queries the MIB tables of F5 BIG-IP loadbalancers (local traffic managers) for the + status of the builtin fans. It will alert if the temperature levels rise above a "normal" level that is set according to the average of the systems we had data on. + + It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 + devices. + + + +inventory: + The check gathers a list of internal hardware sensors. + It labels them as either chassis or CPU sensors. + + +perfdata: + the check does not (yet) generate performance data. diff --git a/checks/f5_bigip_fans b/checks/f5_bigip_fans index e27aa52..d46dc94 100644 --- a/checks/f5_bigip_fans +++ b/checks/f5_bigip_fans @@ -81,7 +81,7 @@ snmp_info["f5_bigip_fans"] = \ ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 3 ]), ] -check_info["f5_bigip_fans"] = (check_f5_bigip_fans, "Fan %s", 0, inventory_f5_bigip_fans ) +check_info["f5_bigip_fans"] = (check_f5_bigip_fans, "FAN %s", 0, inventory_f5_bigip_fans ) # Get ID and Speed from the CPU and chassis fan tables diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp new file mode 100644 index 0000000..48c21fb --- /dev/null +++ b/checks/f5_bigip_temp @@ -0,0 +1,99 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + + +# Agent / MIB output +# F5-BIGIP-SYSTEM-MIB::sysChassisTempNumber +# 1.3.6.1.4.1.3375.2.1.3.2.2.1.0 1 +# 1.3.6.1.4.1.3375.2.1.3.2.2.2.1.1.101 101 +# 1.3.6.1.4.1.3375.2.1.3.2.2.2.1.2.101 1 +# 1.3.6.1.4.1.3375.2.1.3.2.3.1.0 2 +# F5-BIGIP-SYSTEM-MIB::sysCpuTemperature +# 1.3.6.1.4.1.3375.2.1.3.1.2.1.1.1 1 +# 1.3.6.1.4.1.3375.2.1.3.1.2.1.2.1 54 + + + + +def f5_bigip_temp_genitem(info): + sensors = [] + # parse all detected sensors and name them according to the mib section they came from. + # we will assign a base "nominal" temperature here based on sample MIB data + for chassis_sensor in info[0]: + id = chassis_sensor[0] + type = "Chassis" + cur_temp = int(chassis_sensor[1]) + nom_temp = 49 + sensors.append([ ("%s %s" % (id, type)), cur_temp, nom_temp ]) + for cpu_sensor in info[1]: + id = cpu_sensor[0] + type = "CPU" + cur_temp = int(cpu_sensor[1]) + nom_temp = 55 + sensors.append([ ("%s %s" % (id, type)), cur_temp, nom_temp ]) + + return sensors + + +def inventory_f5_bigip_temp(checkname, info): + inventory = [] + for sensor in f5_bigip_temp_genitem(info): + inventory.append([sensor[0], nom_temp]) + + return inventory + + +def check_f5_bigip_temp(item, params, info): + + for sensor in f5_bigip_temp_genitem(info): + if item == sensor[0]: + tmpdiff = sensor[1] - sensor[2] + msgtxt = " - Temperature is %dC" % (sensor[1]) + if 5 >= tmpdiff: + return (0, "OK" + msgtxt) + elif tmpdiff > 15: + return (2, "CRIT" + msgtxt + "!!") + elif tmpdiff > 10: + return (1, "WARN" + msgtxt + "!") + else: + return (3, "UNKNOWN - unable to read Temperature") + + + + return (3, "UNKNOWN - item not found in SNMP output") + + +snmp_info["f5_bigip_temp"] = \ + [ (".1.3.6.1.4.1.3375.2.1.3.2.3.2.1", [ 1, 2 ]), + ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] + + +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 0, inventory_f5_bigip_temp ) + + +# Get ID and Speed from the CPU and chassis fan tables +snmp_scan_functions["f5_bigip_temp"] = \ + lambda oid: '.1.3.6.1.4.1.3375.2' in oid(".1.3.6.1.2.1.1.2.0") and "big-ip" in oid(".1.3.6.1.4.1.3375.2.1.4.1.0").lower()

13 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c20da00c18666ae737eb5be75e3e6f40a920344 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c20da00c18666… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 10 15:53:53 2011 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

13 years, 3 months

Check_MK Git: check_mk: Allow Debian 6. 0 als compile reference compile platform

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3f6db5bbdd0e0dc9ad2ecd02a176d9f1a4ead6a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f6db5bbdd0e0d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 10 11:14:52 2011 +0200 Allow Debian 6.0 als compile reference compile platform --- Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ca7bfe6..3061287 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,8 @@ mk-livestatus: version: [ "$$(head -c 12 /etc/issue)" = "Ubuntu 10.10" \ - -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" ] \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 11.04" \ + -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ if [ -n "$$newversion" ] ; then $(MAKE) NEW_VERSION=$$newversion setversion ; fi

13 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2011