Checkmk git commits July 2013

checkmk-commits@lists.checkmk.com

4 participants
235 discussions

Check_MK Git: check_mk: win_netstat: New check for Windows for checking TCP /UDP connections

by Mathias Kettner

Module: check_mk Branch: master Commit: 16493666950d8a8e3518816c3e7e918611227efe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16493666950d8a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 18:22:38 2013 +0200 win_netstat: New check for Windows for checking TCP/UDP connections --- ChangeLog | 2 + checks/win_netstat | 118 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 68 ++++++++++++++------ 3 files changed, 167 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4528939..829ce94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,8 @@ * esx_vsphere_object: make check state configurable * mk_logwatch: support continuation lines with 'A'. Please refer to docu. * mk_oracle: Added plugin for solaris + * win_netstat: New check for Windows for checking the existance of a UDP/TCP + connection or listener Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checks/win_netstat b/checks/win_netstat new file mode 100644 index 0000000..76876c2 --- /dev/null +++ b/checks/win_netstat @@ -0,0 +1,118 @@ +#!/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. + + +# Example output from agent (German Windows XP) +# <<<win_netstat>>> +# +# Aktive Verbindungen +# +# Proto Lokale Adresse Remoteadresse Status +# TCP 0.0.0.0:135 0.0.0.0:0 ABHREN +# TCP 0.0.0.0:445 0.0.0.0:0 ABHREN +# TCP 0.0.0.0:2869 0.0.0.0:0 ABHREN +# TCP 0.0.0.0:6556 0.0.0.0:0 ABHREN +# TCP 10.1.1.99:139 0.0.0.0:0 ABHREN +# TCP 10.1.1.99:445 10.1.1.123:52820 HERGESTELLT +# TCP 10.1.1.99:6556 10.1.1.50:43257 WARTEND +# TCP 10.1.1.99:6556 10.1.1.50:43288 WARTEND +# TCP 10.1.1.99:6556 10.1.1.50:43309 WARTEND +# TCP 127.0.0.1:1029 127.0.0.1:5354 HERGESTELLT +# TCP 127.0.0.1:1030 0.0.0.0:0 ABHREN +# TCP 127.0.0.1:1040 127.0.0.1:27015 HERGESTELLT +# TCP 127.0.0.1:5354 0.0.0.0:0 ABHREN +# TCP 127.0.0.1:5354 127.0.0.1:1029 HERGESTELLT +# TCP 127.0.0.1:27015 0.0.0.0:0 ABHREN +# TCP 127.0.0.1:27015 127.0.0.1:1040 HERGESTELLT +# UDP 0.0.0.0:445 *:* +# UDP 0.0.0.0:500 *:* +# UDP 127.0.0.1:1042 *:* +# UDP 127.0.0.1:1900 *:* + +win_netstat_states = { + "ABH\x99REN" : "LISTEN", + "HERGESTELLT" : "ESTABLISHED", + "WARTEND" : "TIME_WAIT", + # Add further states in any required language here. Sorry, Windows + # has no "unset LANG" ;-) +} + + +def parse_win_netstat(info): + connections = [] + for line in info: + if line[0] == "TCP": + proto, local, remote, connstate = line + elif line[0] == "UDP": + proto, local, remote = line + connstate = "LISTEN" + else: + continue + connections.append( (proto, local.split(":"), remote.split(":"), + win_netstat_states.get(connstate, connstate)) ) + return connections + +# Item is a user defined identifier of the connection. +# Example for params: +# { +# "proto" : "UDP", +# "local_ip" : "10.1.1.99", +# "remote_port" : 5665, +# "state" : "ESTABLISHED", +# } +# Other keys: local_port, remote_ip. Missing entries do not care. + + +def check_win_netstat(item, params, info): + connections = parse_win_netstat(info) + found = 0 + for proto, (local_ip, local_port), (remote_ip, remote_port), connstate in connections: + # Beware: port numbers are strings here. + match = True + for k, v in [ + ( "local_ip", local_ip ), + ( "local_port", local_port ), + ( "remote_ip", remote_ip ), + ( "remote_port", remote_port ), + ( "proto", proto ), + ( "state", connstate )]: + if k in params and str(params[k]) != v: + match = False + break + if match: + found += 1 + + if found: + state = 0 + else: + state = 2 + return state, "Found %d matching entries" % found + +check_info["win_netstat"] = { + 'check_function' : check_win_netstat, + 'service_description' : "TCP Connection %s", + 'group' : "tcp_connections", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 186b2ae..5cc95d5 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1028,27 +1028,6 @@ register_check_parameters( None ) -register_check_parameters( - subgroup_networking, - "tcp_conn_stats_win", - ("TCP connection stats (Windows)"), - Dictionary( - elements = [ - ( "ESTABLISHED", - Tuple( - title = _("ESTABLISHED"), - help = _("connection up and passing data"), - elements = [ - Integer(title = _("Warning at"), label = _("connections")), - Integer(title = _("Critical at"), label = _("connections")) - ] - ) - ) - ] - ), - None, - "first" -) register_check_parameters( subgroup_networking, @@ -1180,6 +1159,53 @@ register_check_parameters( "first" ) + +register_check_parameters( + subgroup_networking, + "tcp_connections", + _("Monitor specific TCP/UDP connections and listeners"), + Dictionary( + help = _("This rule allows to monitor the existance of specify TCP connections or " + "TCP/UDP listeners."), + elements = [ + ( "proto", + DropdownChoice( + title = _("Protocol"), + choices = [ ("TCP", _("TCP")), ("UDP", _("UDP")) ], + default_value = "TCP", + ), + ), + ( "state", + DropdownChoice( + title = _("State"), + choices = [ + ( "ESTABLISHED", "ESTABLISHED" ), + ( "SYN_SENT", "SYN_SENT" ), + ( "SYN_RECV", "SYN_RECV" ), + ( "LAST_ACK", "LAST_ACK" ), + ( "CLOSE_WAIT", "CLOSE_WAIT" ), + ( "TIME_WAIT", "TIME_WAIT" ), + ( "CLOSED", "CLOSED" ), + ( "CLOSING", "CLOSING" ), + ( "FIN_WAIT1", "FIN_WAIT1" ), + ( "FIN_WAIT2", "FIN_WAIT2" ), + ( "BOUND", "BOUND" ), + ] + ), + ), + ( "local_ip", IPv4Address(title = _("Local IP address"))), + ( "local_port", Integer(title = _("Local port number"), minvalue = 1, maxvalue = 65535, )), + ( "remote_ip", IPv4Address(title = _("Remote IP address"))), + ( "remote_port", Integer(title = _("Local port number"), minvalue = 1, maxvalue = 65535, )), + ] + ), + TextAscii(title = _("Connection name"), help = _("Specify an arbitrary name of this connection here"), allow_empty = False), + "dict", + has_inventory = False, +) + + + register_check_parameters( subgroup_applications, "msx_queues",

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 017b0dad8d5b9e34458a94ba8efc0cdf3bf9cd8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=017b0dad8d5b9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 17:10:00 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Fixed AIX manpage

by Mathias Kettner

Module: check_mk Branch: master Commit: e59b658f051ddfbbb7a3a08e1a0e38f73a484784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e59b658f051ddf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 17:09:58 2013 +0200 Fixed AIX manpage --- checkman/vmstat_aix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/checkman/vmstat_aix b/checkman/vmstat_aix index 0856210..d5905bd 100644 --- a/checkman/vmstat_aix +++ b/checkman/vmstat_aix @@ -1,21 +1,13 @@ -title: CPU usage +title: CPU utilization agents: aix catalog: os/kernel license: GPL distribution: check_mk description: - Get CPU usage (user, system, idle, IO-Wait) on an AIX system. + Get CPU utilization (user, system, idle, IO-Wait) on an AIX system. Only performance data is written. Alerting is not implemented (returns always {OK} if input data is valid). perfdata: Four variables: The percentage of time spent in {user}, {system}, {idle} and {wait} -inventory: - Not implemented. - -[parameters] -None. - -[configuration] -None.

11 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0947

by Lars Michelsen

Module: check_mk Branch: master Commit: 49621648b23d763660e56a40025610a97249d9f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49621648b23d76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:05:13 2013 +0200 Updated bug entries #0947 --- .bugs/947 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/947 b/.bugs/947 index efd1f9e..cbb0120 100644 --- a/.bugs/947 +++ b/.bugs/947 @@ -1,10 +1,13 @@ Title: localization not working share/ Component: multisite -State: open +Class: bug +State: works4me Date: 2013-07-01 17:00:52 Targetversion: 1.2.3 -Class: bug In OMD localization seems only to workin local/share, not directlyh in share. The languages are seen by Multisite, but not used by gettext. + +2013-07-02 15:01:10: changed state open -> works4me +works with current versions. no problem.

11 years, 2 months

Check_MK Git: check_mk: Added option to enable an (ugly)

by Lars Michelsen

scrollbar in multisite sidebar Message-ID: <51d2ec85.VDmATXnfnlKcirgE%lm(a)mathias-kettner.de> 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: d98d32cc73bb3134cc5832a6d5e55e33c5778fcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d98d32cc73bb31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:05:52 2013 +0200 Added option to enable an (ugly) scrollbar in multisite sidebar --- ChangeLog | 2 ++ web/htdocs/sidebar.css | 8 +++++++- web/htdocs/sidebar.py | 6 +++++- web/plugins/config/builtin.py | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ce77e..4528939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,8 @@ Display current date in dashboard * LDAP: Using asynchronous searches / added optional support for paginated searches (Can be enabled in connection settings) + * Added option to enable browser scrollbar to the multisite sidebar (only + via "sidebar_show_scrollbar = True" in multisite.mk WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b11f718..2ff7a15 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -84,7 +84,13 @@ body.side { height: 500px; overflow: hidden; color: #000000; - padding-top: 55px; + padding-top: 5px; + position: absolute; + top: 50px; +} + +#side_content.scroll { + overflow-y: scroll; } /* The footer of the sidebar */ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 1522de1..5898259 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -163,7 +163,11 @@ def page_side(): refresh_snapins = [] restart_snapins = [] - html.write('<div id="side_content">') + scrolling = '' + if config.sidebar_show_scrollbar: + scrolling = ' class=scroll' + + html.write('<div id="side_content"%s>' % scrolling) for name, state in user_config: if not name in sidebar_snapins or not config.may("sidesnap." + name): continue diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c1abc51..be85e05 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -148,6 +148,9 @@ reschedule_timeout = 10.0 # Interval of snapin updates in seconds sidebar_update_interval = 30.0 +# It is possible (but ugly) to enable a scrollbar in the sidebar +sidebar_show_scrollbar = False + # Number of columsn in "Filter" form filter_columns = 2

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b882f0eb1fd8b6ae06276544f75374274cfb616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b882f0eb1fd8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:06:14 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: prediction: Fixed several problems with incomplete RRDs

by Mathias Kettner

Module: check_mk Branch: master Commit: 2dc44c24d1a66d669b5767b3309800cf9eff6cc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dc44c24d1a66d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:41:12 2013 +0200 prediction: Fixed several problems with incomplete RRDs --- modules/prediction.py | 8 +++++--- web/htdocs/prediction.py | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index 8d9a741..bf114d3 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -182,9 +182,11 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn # print "PUNKT %d --------------------------------------" % i point_line = [] for from_time, scale, data in slices: - d = data[int(i / float(scale))] - if d != None: - point_line.append(d) + idx = int(i / float(scale)) + if idx < len(data): + d = data[idx] + if d != None: + point_line.append(d) # else: # date_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(fr + ((un - fr) * i / float(num_points)))) # print "Keine Daten fur %s / %d/%s/ %.2f " % (date_str, i, float(scale),i/float(scale)) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 2574961..534bce4 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -203,13 +203,20 @@ def swap_and_compute_levels(tg_data, tg_info): row = dict(zip(columns, step)) for k, v in row.items(): swapped[k].append(v) - upper, lower = compute_levels(tg_info, row["average"], row["stdev"]) - if upper[0] != None: - swapped.setdefault("upper_warn", []).append(upper[0]) - swapped.setdefault("upper_crit", []).append(upper[1]) - if lower[0] != None: - swapped.setdefault("lower_warn", []).append(lower[0]) - swapped.setdefault("lower_crit", []).append(lower[1]) + if row["average"] != None and row["stdev"] != None: + upper, lower = compute_levels(tg_info, row["average"], row["stdev"]) + if upper[0] != None: + swapped.setdefault("upper_warn", []).append(upper[0]) + swapped.setdefault("upper_crit", []).append(upper[1]) + if lower[0] != None: + swapped.setdefault("lower_warn", []).append(lower[0]) + swapped.setdefault("lower_crit", []).append(lower[1]) + else: + swapped.setdefault("upper_warn", []).append(0) + swapped.setdefault("upper_crit", []).append(0) + swapped.setdefault("lower_warn", []).append(0) + swapped.setdefault("lower_crit", []).append(0) + return swapped def stack(apoints, bpoints, scale): @@ -243,8 +250,8 @@ def compute_levels(params, ref_value, stdev): def compute_vertical_range(swapped): mmin, mmax = 0.0, 0.0 for name, points in swapped.items(): - mmax = max(mmax, max(points)) - mmin = min(mmin, min(points)) + mmax = max(mmax, max(points)) or 0.0 # convert None into 0.0 + mmin = min(mmin, min(points)) or 0.0 return mmin, mmax def create_graph(name, size, range, v_range, legend):

11 years, 2 months

Check_MK Git: check_mk: Honor --debug within check_levels

by Mathias Kettner

Module: check_mk Branch: master Commit: 43315a4f630745951244b9914f46cf34d3096513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43315a4f630745… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:22:48 2013 +0200 Honor --debug within check_levels --- modules/check_mk_base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 465aae6..cd11d07 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1489,6 +1489,8 @@ def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=Fa else: infotext += "no reference for prediction yet" except Exception, e: + if opt_debug: + raise return 3, "%s" % e, [] if ref_value:

11 years, 2 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: bfd6abd3b5e7736cf7e2c69ca1f6659c78acf9e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd6abd3b5e773… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:01:22 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Better i18n of some texts

by Mathias Kettner

Module: check_mk Branch: master Commit: fd93b11941ea98c3c898eb6a6367e9c3839349de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd93b11941ea98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:01:20 2013 +0200 Better i18n of some texts --- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 09b50bc..63974db 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1233,7 +1233,7 @@ class ListChoice(ValueSpec): def validate_value(self, value, varprefix): if not self._allow_empty and not value: - raise MKUserError(varprefix, _('You have not selected any connector. You have to select at least one.')) + raise MKUserError(varprefix, _('You have to select at least one element.')) ValueSpec.custom_validate(self, value, varprefix) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bf73fe4..f808789 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10797,8 +10797,10 @@ def mode_edit_rule(phase, new = False): else: return "edit_ruleset" - return ("edit_ruleset", _("%s rule in ruleset '%s' in folder %s") % - (new and _("Created new") or _("Edited"), rulespec["title"], new_rule_folder["title"])) + return ("edit_ruleset", + (new and _("Created new rule in ruleset '%s' in folder %s") + or _("Editor rule in ruleset '%s' in folder %s")) % + (rulespec["title"], new_rule_folder["title"])) if rulespec.get("help"): html.write("<div class=info>" + rulespec["help"] + "</div>")

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2013