Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Temperature SMART: removed "SCSI_"

by git＠mathias-kettner.de

prefix from service description to create same format as with SATA disks ( "vendor_model_sn") User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bd5800149eb143241aebb8bc449ad18703a078b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd5800149eb143… Author: Raoul Gunnar Borenius <borenius(a)dfn.de> Date: Mon Oct 8 11:35:42 2012 +0200 Temperature SMART: removed "SCSI_" prefix from service description to create same format as with SATA disks ("vendor_model_sn") Signed-off-by: Raoul Gunnar Borenius <borenius(a)dfn.de> --- agents/plugins/smart | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index c9e6682..d5fd458 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -61,7 +61,7 @@ if which smartctl > /dev/null 2>&1 ; then [ "$a" == Current -a "$b" == Drive -a "$c" == Temperature: ] && echo TEMP=$d done` [ -n "$TEMP" ] && CMD="echo 194 Temperature_Celsius 0x0000 000 000 000 Old_age Always - $TEMP (0 0 0 0)" - DNAME="SCSI_${VEND}_${MODEL}_${SN}" + DNAME="${VEND}_${MODEL}_${SN}" else CMD="smartctl -d ata -v 9,raw48 -A $D" fi

11 years, 11 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: aab06211689e974cd6c0739efd7935e3d0663885 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aab06211689e97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 09:51:08 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 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: c2854a63159dad9e5b688156415e7b3dab0c178e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2854a63159dad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 09:52:12 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 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: b37f38b78e35df69b3038f96f3cec8d8e113c301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b37f38b78e35df… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 09:51:08 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Added example for checking event console performance

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ae7bfa254338a2e50ad7e94219a17f664cc91d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ae7bfa254338a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 11 09:51:05 2012 +0200 Added example for checking event console performance Thanks to Huber B. --- .../Event_Console/Eventconsole-Performance.py | 50 ++++++++++ doc/treasures/Event_Console/get_event_status | 95 ++++++++++++++++++++ 2 files changed, 145 insertions(+), 0 deletions(-) diff --git a/doc/treasures/Event_Console/Eventconsole-Performance.py b/doc/treasures/Event_Console/Eventconsole-Performance.py new file mode 100644 index 0000000..5ac498d --- /dev/null +++ b/doc/treasures/Event_Console/Eventconsole-Performance.py @@ -0,0 +1,50 @@ +#!/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. + + +def perfometer_get_event_status(row, check_command, perfdata): + busy = float(perfdata[2][1]) + warn = float(perfdata[2][3]) + crit = float(perfdata[2][4]) + if busy > crit: + color = "#ff0000" + elif busy > warn: + color = "#ffff00" + else: + color = "#00ff00" + if busy > 100: + busytd = 100 + freetd = 0 + else: + busytd = busy + freetd = 100 - busy + return "%.1f %% " % busy, \ + '<table><tr>' \ + + perfometer_td(busytd, color) \ + + perfometer_td(freetd, "#ffffff") \ + + '</tr></table>' + +perfometers["get_event_status"] = perfometer_get_event_status diff --git a/doc/treasures/Event_Console/get_event_status b/doc/treasures/Event_Console/get_event_status new file mode 100644 index 0000000..5597d85 --- /dev/null +++ b/doc/treasures/Event_Console/get_event_status @@ -0,0 +1,95 @@ +#!/usr/bin/python + +# This is an active check that retrieves current performance +# data of the Event Console (mkeventd). If you are running OMD, +# then no further arguments are necessary. Otherwise please +# use -H and specify either the path to the UNIX socket of +# the mkeventd ("status") or HOSTNAME:PORT and enable TCP +# access to the socket. + +# This check will currently report the average processing time +# per message and the number of processed messages per time. + +import os, socket, sys + +socket_path = os.getenv("OMD_ROOT") + "/tmp/run/mkeventd/status" + +def query(query, remote_host): + try: + if remote_host: + parts = remote_host.split(":") + host = parts[0] + if len(parts) == 2: + port = int(parts[1]) + else: + port = 6558 + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sock.settimeout(10) + sock.connect((host, port)) + else: + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + sock.settimeout(3) + sock.connect(socket_path) + + sock.send(query) + + response_text = "" + while True: + chunk = sock.recv(8192) + response_text += chunk + if not chunk: + break + + return eval(response_text) + except SyntaxError, e: + sys.stdout.write("UNKNOWN - Invalid answer from event daemon\n%s\nQuery was:\n%s\n" \ + % (e, query)) + sys.exit(3) + + except Exception, e: + if remote_host: + via = "TCP %s:%d" % (host, port) + else: + via = "UNIX socket %s" % socket_path + sys.stdout.write("UNKNOWN - Cannot connect to event daemon via %s: %s\n" % (via, e)) + sys.exit(3) + +try: + remote_host = None + if len(sys.argv) == 1: + remote_host = None + else: + if sys.argv[1] == '-H': + remote_host = sys.argv[2] + +except: + sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT]\n") + sys.exit(3) + +q = "GET status" +response = query(q, remote_host) +headers = response[0] +count = 0 +for line in response[1:]: + row = dict(zip(headers, line)) + #print headers + #sys.stdout.write("Ergebnis: %s\n" % (line)) + processing_time = row["status_average_processing_time"] + processing_time = processing_time * 1000 + processing_rate_av = row["status_average_message_rate"] + busy=processing_time * processing_rate_av / 10 + count += 1 + +exit_code=0 +if processing_rate_av > 800 or processing_time > 50 or busy > 70: + exit_code=1 +if processing_rate_av > 1000 or processing_time > 100 or busy > 100: + exit_code=2 + + +if count == 0: + sys.stdout.write("Error - no Status Information\n" ) + sys.exit(3) +else: + sys.stdout.write("Message Rate per sec: %d, Processing Time: %2.1f ms Busy: %2.1f %% | rate_sec=%d;800;1000;; processing_times=%2.1f""ms;50;100;; busy=%2.1f""%%;70;100;;\n" % (processing_rate_av, processing_time, busy, processing_rate_av, processing_time, busy) ) + sys.exit(exit_code)

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0802

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e3971a50525dda842d9323f8bf68f727dbe9c6b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3971a50525dda… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 17:21:33 2012 +0200 Updated bug entries #0802 --- .bugs/802 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/802 b/.bugs/802 index 1674986..f269fe6 100644 --- a/.bugs/802 +++ b/.bugs/802 @@ -1,12 +1,15 @@ Title: BI simulated states only show on top aggregation for BI Boxes Component: bi -State: open +Class: nastiness +State: done Date: 2012-09-20 18:17:19 Targetversion: future -Class: nastiness If you add a simulated state for a given service (using foldable) it will be reflected on the top-level, but not on the nodes. So you see a lot of green items and but the main state stays as configured to be simulated it's very irritating, since the correct subaggrs and services are in fact displayed, just not with their simulated states. + +2012-10-10 17:21:29: changed state open -> done +Fixed representation of assumed state in boxed layout

11 years, 11 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: a55eae43817344a432c0f2e05810e2571b5398b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a55eae43817344… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 17:20:44 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: BI: corrected representation of assumed state in boxed layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ae7afa849c60476490139e3b06c1c4611638e33c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae7afa849c6047… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 10 17:20:41 2012 +0200 BI: corrected representation of assumed state in boxed layout --- ChangeLog | 1 + web/plugins/views/bi.py | 33 +++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d005fe..07c0c6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * Added new config option bi_compile_log to collect statistics about aggregation compilations * Correct representation of (!), (!!) and (?) markers in check output + * Corrected representation of assumed state in box layout WATO: * Added progress indicator in single site WATO "Activate Changes" diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 7d2128b..5fd7b0f 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -231,10 +231,15 @@ def aggr_render_leaf(tree, show_host, bare = False): if show_host: content += '<a href="%s">%s</a><b class=bullet>&diams;</b>' % (host_url, host.replace(" ", " ")) + if tree[1] and tree[0] != tree[1]: + addclass = ' class="state assumed"' + else: + addclass = "" + if not service: - content += '<a href="%s">%s</a>' % (host_url, _("Host status")) + content += '<a href="%s"%s>%s</a>' % (host_url, addclass, _("Host status")) else: - content += '<a href="%s">%s</a>' % (service_url, service.replace(" ", " ")) + content += '<a href="%s"%s>%s</a>' % (service_url, addclass, service.replace(" ", " ")) if bare: return content @@ -242,17 +247,13 @@ def aggr_render_leaf(tree, show_host, bare = False): return aggr_render_node(tree, content, None, show_host) def aggr_render_node(tree, title, mousecode, show_host): - state = tree[0] - assumed_state = tree[1] - if assumed_state != None: - effective_state = assumed_state - else: - effective_state = state - - if (effective_state != state): + # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) + if tree[1] and tree[0] != tree[1]: addclass = " " + _("assumed") + effective_state = tree[1] else: addclass = "" + effective_state = tree[0] h = '<span class="content state state%d%s">%s</span>\n' \ % (effective_state["state"], addclass, render_bi_state(effective_state["state"])) @@ -314,6 +315,14 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): # Variant: BI-Boxes if boxes: + # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) + if tree[1] and tree[0] != tree[1]: + addclass = " " + _("assumed") + effective_state = tree[1] + else: + addclass = "" + effective_state = tree[0] + if is_leaf: leaf = "leaf" mc = "" @@ -323,8 +332,8 @@ def paint_aggr_tree_foldable(row, boxes, omit_root=True): omit = omit_root and len(path) == 1 if not omit: - h += '<span id="%d:%s" %s class="bibox_box %s %s state%s">' % ( - expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) + h += '<span id="%d:%s" %s class="bibox_box %s %s state state%s%s">' % ( + expansion_level, path_id, mc, leaf, is_open and "open" or "closed", effective_state["state"], addclass) if is_leaf: h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") else:

11 years, 11 months

Check_MK Git: check_mk: Linux agent: Allow for another variety of multipath device naming

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ccec2b6a4fd023dceb7932e708fa1245d97ee02e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccec2b6a4fd023… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 16:23:19 2012 +0200 Linux agent: Allow for another variety of multipath device naming --- checks/multipath | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/checks/multipath b/checks/multipath index 2eb1a40..f9006aa 100644 --- a/checks/multipath +++ b/checks/multipath @@ -120,6 +120,15 @@ # \_ 4:0:1:11 sdcf 69:48 [active][undef] # \_ 3:0:0:11 sdl 8:176 [active][undef] +# Just an underscore and a dash in the LUN name +# SDataCoreSANsymphony_DAT05-fscl dm-6 DataCore,SANsymphony +# [size=600G][features=0][hwhandler=0] +# \_ round-robin 0 [prio=-1][enabled] +# \_ 3:0:0:11 sdae 65:224 [active][undef] +# \_ round-robin 0 [prio=-1][enabled] +# \_ 4:0:0:11 sdt 65:48 [active][undef] + + def parse_multipath_output(info, only_uuid = None): # only_uuid --> look only for data of this uuid or alias @@ -136,7 +145,7 @@ def parse_multipath_output(info, only_uuid = None): (get_regex(r"^[a-zA-Z0-9_]+$"), 0, None), # 3. (get_regex(r"^([0-9a-z]{33}|[0-9a-z]{49})\s?dm.+$"), 1, None), # 4. (get_regex(r"^[a-zA-Z0-9_]+dm-.+$"), 0, None), # 5. Remove this line in 1.2.0 - (get_regex(r"^([a-zA-Z0-9_]+)\s?dm-.+$"), 1, None), # 6. + (get_regex(r"^([a-zA-Z0-9_-]+)\s?dm-.+$"), 1, None), # 6. and 7. ] reg_prio = get_regex("[[ ]prio=") @@ -147,6 +156,7 @@ def parse_multipath_output(info, only_uuid = None): group = {} numpaths = None for line in info: + print line # newer agent also output the device mapper table. # ignore those lines for now. if line[0] == "dm":

11 years, 11 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: 922038a83c4b81c36efc2ac5ad9f308fc531871a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922038a83c4b81… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 16:23:43 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012