Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: hwg_temp: Changed parameters from int to float

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: beb5aa9c924c7f8f98e30389d6bcc8f9f1525d82 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=beb5aa9c924c7f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 11 09:12:00 2012 +0200 hwg_temp: Changed parameters from int to float --- checks/hwg_temp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index 7a779d3..639eaff 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -46,7 +46,7 @@ def check_hwg_temp(item, params, info): for line in info: if line[0] == item: descr, status, current, current_m, unit = line[1:] - current_state = saveint(current_m)/10 + current_state = savefloat(current_m)/10 state = 0 if current_state >= crit:

12 years, 3 months

Check_MK Git: check_mk: Fixed typo

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d8cec5189c71794f45cb83b1a575d47a55f9002b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8cec5189c7179… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 11 09:05:55 2012 +0200 Fixed typo --- web/plugins/wato/check_parameters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7f3de57..9754928 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -36,7 +36,7 @@ group = "checkparams" subgroup_networking = _("Networking") # subgroup_windows = _("Windows") subgroup_storage = _("Storage, Filesystems and Files") -subgroup_os = _("Operating System Ressources") +subgroup_os = _("Operating System Resources") # subgroup_time = _("Time synchronization") subgroup_printing = _("Printers") subgroup_environment = _("Temperature, Humidity, etc.")

12 years, 3 months

Check_MK Git: check_mk: Avoid compiler warning when using diet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa6f7f5cbc1d60a700274d845ddeb09f42e4ed06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa6f7f5cbc1d60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 10 22:22:42 2012 +0200 Avoid compiler warning when using diet --- livestatus/src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 8567cc2..5c99976 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -54,7 +54,7 @@ livestatus_so_SOURCES = \ if HAVE_DIET livecheck: livecheck.c strutil.cc check_icmp.c - diet -v $(CC) $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ + diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ endif livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef6c72fc936698c23328434a53e5656f3bcc5f7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef6c72fc936698… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 9 12:06:21 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Show number of (selected) rows in heading

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03cfbc15e04e547e61e141f73e33f22a2d90b46a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03cfbc15e04e54… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 9 12:06:18 2012 +0200 Show number of (selected) rows in heading --- ChangeLog | 5 +++++ web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 28 ++++++++++++++++++++++++++++ web/htdocs/pages.css | 4 ++++ web/htdocs/views.py | 6 ++++++ web/htdocs/wato.py | 7 ++++++- 6 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cee16d5..8fd0cd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1.2.0p2: + Multisite: + * Show number of rows and number of selected rows in header line + (also for WATO hosts table) + 1.2.0p1: Core: * Added macros $DATE$, $SHORTDATETIME$ and $LONGDATETIME$' to diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b1bfe2d..4caab07 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -811,7 +811,7 @@ class html: self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % (_("Reloading..."), title)) - self.write('<td width=240 class=right>%s   %s' % + self.write('<td width=240 class=right>%s   %s' % (login_text, time.strftime("%H:%M"))) self.help_visible = config.load_user_file("help", False) # cache for later usage cssclass = self.help_visible and "active" or "passive" diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 707ca10..7d94a05 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -287,6 +287,15 @@ function makeuri(addvars) { // GUI styling // ---------------------------------------------------------------------------- +function update_headinfo(text) +{ + oDiv = document.getElementById("headinfo"); + if (oDiv) { + oDiv.innerHTML = text; + } +} + + function filter_activation(oSelect) { var usage = oSelect.value; @@ -938,6 +947,19 @@ function highlight_elem(elem, on) { remove_class(elem, "checkbox_hover"); } +function update_row_selection_information() { + var count = g_selected_rows.length; + var oDiv = document.getElementById("headinfo"); + if (oDiv) { + var current_text = oDiv.innerHTML; + if (current_text.indexOf('/') != -1) { + var parts = current_text.split('/'); + current_text = parts[1]; + } + oDiv.innerHTML = count + "/" + current_text; + } +} + function select_all_rows(elems, only_failed) { if (typeof only_failed === 'undefined') { only_failed = false; @@ -949,6 +971,7 @@ function select_all_rows(elems, only_failed) { g_selected_rows.push(elems[i].name); } } + update_row_selection_information(); } function remove_selected_rows(elems) { @@ -959,6 +982,7 @@ function remove_selected_rows(elems) { g_selected_rows.splice(row_pos, 1); row_pos = null; } + update_row_selection_information(); } function toggle_box(e, elem) { @@ -968,6 +992,7 @@ function toggle_box(e, elem) { } else { g_selected_rows.push(elem.name); } + update_row_selection_information(); } function toggle_row(e, elem) { @@ -1003,6 +1028,7 @@ function toggle_row(e, elem) { checkbox.checked = true; g_selected_rows.push(checkbox.name); } + update_row_selection_information(); if(e.stopPropagation) e.stopPropagation(); @@ -1212,6 +1238,8 @@ function table_init_rowselect(oTable) { }); } childs = null; + + update_row_selection_information(); } function init_rowselect() { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 5bc4414..2b0f2e7 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -128,6 +128,10 @@ body.main hr.header { color: #fff; } +#headinfo { + margin-right: 10px; +} + body.main div.urldebug { color: white; width: 100%; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6d92593..0b1a2a7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1325,6 +1325,7 @@ def render_view(view, rows, datasource, group_painters, painters, show_filter_form(filter_isopen, show_filters) # Actions + row_count = len(rows) if command_form: # If we are currently within an action (confirming or executing), then # we display only the selected rows (if checkbox mode is active) @@ -1358,6 +1359,11 @@ def render_view(view, rows, datasource, group_painters, painters, html.check_limit(rows, get_limit()) layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes and not html.do_actions()) + headinfo = "%d %s" % (row_count, row_count == 1 and _("row") or _("rows")) + if show_checkboxes and html.var("selected_rows"): + selected = get_selected_rows(view, rows, html.var("selected_rows")) + headinfo = "%d/%s" % (len(selected), headinfo) + html.javascript("update_headinfo('%s');" % headinfo) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 15c7162..3eed116 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1263,11 +1263,13 @@ def show_hosts(folder): odd = "odd" host_errors = validate_all_hosts(hostnames) + rendered_hosts = [] # Now loop again over all hosts and display them for hostname in hostnames: if search_text and (search_text.lower() not in hostname.lower()): continue + rendered_hosts.append(hostname) host = g_folder[".hosts"][hostname] effective = effective_attributes(host, g_folder) @@ -1370,8 +1372,11 @@ def show_hosts(folder): html.hidden_fields() html.end_form() + row_count = len(rendered_hosts) + headinfo = "%d %s" % (row_count, row_count == 1 and _("host") or _("hosts")) + html.javascript("update_headinfo('%s');" % headinfo) html.javascript('g_selected_rows = %s;\n' - 'init_rowselect();' % repr(["_c_%s" % h for h in hostnames])) + 'init_rowselect();' % repr(["_c_%s" % h for h in rendered_hosts])) return True move_to_folder_combo_cache_id = None

12 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: 706614e4bd230928c27bee343da80f09b103e3b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=706614e4bd2309… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 8 20:13:38 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Check manpage for tsm_storagepools

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 434a5fa93aa6c048512335a78498b9a9a6652037 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=434a5fa93aa6c0… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 8 20:13:15 2012 +0200 Check manpage for tsm_storagepools --- checkman/tsm_storagepools | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/checkman/tsm_storagepools b/checkman/tsm_storagepools new file mode 100644 index 0000000..af8701a --- /dev/null +++ b/checkman/tsm_storagepools @@ -0,0 +1,28 @@ +title: Report usage of storage pools in Tivoli TSM +agents: aix, linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check is used on servers running Tivoli storage manager to + get and track information about the capacity stored in storage pools. + It reports based on the LOGICAL_MB used field of the TSM database, but converts it to human-readable units. + + Since this check is mostly informational it always returns an OK state. + + +item: + The name of the storage pool. + + +inventory: + The check inventorizes all storage pools on the server, independent of their type. + + +[parameters] + There are no check parameters + + +[perfdata] + The used capacity in Megabytes. +

12 years, 3 months

Check_MK Git: check_mk: hpux_fchba: new check for monitoring FibreChannel HBAs und HP-UX

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3af368bac28fe3711ce7917cc526600eaf259458 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3af368bac28fe3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 19:50:03 2012 +0200 hpux_fchba: new check for monitoring FibreChannel HBAs und HP-UX --- ChangeLog | 1 + checks/hpux_fchba | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5de00c7..cee16d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ CRITICAL: "VERIFY-PAUSED", "VERIFYING", "REBUILDING" * New checks tsm_stagingpools, tsm_drive and tsm_storagepools Linux/UNIX + * hpux_fchba: new check for monitoring FibreChannel HBAs und HP-UX Multisite: * FIX: fix severe exception in all views on older Python versions diff --git a/checks/hpux_fchba b/checks/hpux_fchba new file mode 100644 index 0000000..8afe468 --- /dev/null +++ b/checks/hpux_fchba @@ -0,0 +1,101 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +# <<<hpux_fchba>>> +# /dev/fcd0 +# ISP Code version = 4.4.4 +# Topology = PTTOPT_FABRIC +# N_Port Port World Wide Name = 0x500143800252658a +# Switch Port World Wide Name = 0x200400051e6302d7 +# Driver state = ONLINE +# Hardware Path is = 0/0/1/1/0 +# Driver-Firmware Dump Available = NO +# /dev/fcd1 +# ISP Code version = 4.4.4 +# Topology = PTTOPT_FABRIC +# N_Port Port World Wide Name = 0x500143800252658c +# Switch Port World Wide Name = 0x200400051e5d1942 +# Driver state = ONLINE +# Hardware Path is = 1/0/12/1/0 +# Driver-Firmware Dump Available = NO + + +def parse_hpux_fchba(info): + hbas = {} + for line in info: + if line[0].startswith("/dev/"): + name = line[0][5:] + hba = { "name": name } + hbas[name] = hba + elif len(line) == 2: + hba[line[0].strip()] = line[1].strip() + return hbas + +def inventory_hpux_fchba(info): + parsed = parse_hpux_fchba(info) + return [ (name, None) for name, hba in parsed.items() + if hba["Driver state"] == "ONLINE" ] + +def check_hpux_fchba(item, _no_params, info): + parsed = parse_hpux_fchba(info) + if item not in parsed: + return (3, "UNKNOWN - HBA noch found") + + hba = parsed[item] + + state = 0 + infos = [] + + infos.append("Hardware Path: %s" % hba["Hardware Path is"]) + + infos.append("Driver State: %s" % hba["Driver state"]) + if hba["Driver state"] != "ONLINE": + state = 2 + infos[-1] += "(!!)" + + infos.append("Topology: %s" % hba.get("Topology", "(none)")) + if hba.get("Topology") not in [ + "PTTOPT_FABRIC", "PRIVATE_LOOP", "PUBLIC_LOOP", ]: + state = 2 + infos[-1] += "(!!)" + + if hba.get("Driver-Firmware Dump Available", "NO") != "NO": + infos.append("Driver-Firmware Dump Available(!!)") + state = 2 + + + + infotext = ", ".join(infos) + return state, nagios_state_names[state] + " - " + infotext + + +check_info['hpux_fchba'] = { + "check_function" : check_hpux_fchba, + "inventory_function" : inventory_hpux_fchba, + "service_description" : "FC HBA %s", + "has_perfdata" : False, +} +

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9bafb81ef4bef385cf3594b669393d68a6198202 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bafb81ef4bef3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jun 8 19:50:06 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Change separator

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1307c0c6382f69bec3a6437025450266ffe91602 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1307c0c6382f69… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jun 8 19:31:43 2012 +0200 Change separator --- agents/check_mk_agent.hpux | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 9edbcb6..0579338 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -113,7 +113,7 @@ fi # State of FC HBAs fcms_util=/opt/fcms/bin/fcdutil -echo '<<<hpux_hbahealth>>>' +echo '<<<hpux_hbahealth:sep(61)>>>' for hba in /dev/fcd* ; do echo "$hba" $fcms_util $hba | grep -e "Driver state" -e "Topology" -e "Dump Available"\

12 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012