Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: openvpn_clients: new check for OpenVPN connections

by Mathias Kettner

Module: check_mk Branch: master Commit: 73c5f8a9806b1032abce97c6298d26dd24407a87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73c5f8a9806b10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 12:50:30 2013 +0100 openvpn_clients: new check for OpenVPN connections --- ChangeLog | 1 + agents/check_mk_agent.linux | 6 ++ checkman/openvpn_clients | 27 +++++++++++ checks/openvpn_clients | 70 ++++++++++++++++++++++++++++ pnp-templates/check_mk-openvpn_clients.php | 45 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 10 ++++ 6 files changed, 159 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33d673e..f5c11d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ systems to retrieve monitoring information for this or other machines. * sap.dialog: Monitors SAP dialog statistics like the response time * sap.value: Simply processes information provided by SAP to Nagios + * openvpn_clients: new check for OpenVPN connections BI: * Integrated availability computing, including nifty time warp feature diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 27dc5d9..c5ebbfe 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -350,6 +350,12 @@ if type VBoxControl > /dev/null 2>&1 ; then [ ${PIPESTATUS[0]} = 0 ] || echo "ERROR" fi +# OpenVPN Clients. Currently we assume that the configuration # is in +# /etc/openvpn. We might find a safer way to find the configuration later. +if [ -e /etc/openvpn/openvpn-status.log ] ; then + echo '<<<openvpn_clients:sep(44)>>>' + sed -n -e '/CLIENT LIST/,/ROUTING TABLE/p' < /etc/openvpn/openvpn-status.log | sed -e 1,3d -e '$d' +fi if type ntpq > /dev/null 2>&1 ; then echo '<<<ntp>>>' diff --git a/checkman/openvpn_clients b/checkman/openvpn_clients new file mode 100644 index 0000000..a44489e --- /dev/null +++ b/checkman/openvpn_clients @@ -0,0 +1,27 @@ +title: Check status of OpenVPN client connection +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check uses the status file created by OpenVPN in order + to check the state of the client connections and also to measure + the inbound and outbound traffic. The traffic is measured raw - + i.e. including keepalive packages and headers - not just the payload. + + Currently the linux agent is expecting the status file at + {/etc/openvpn/openvpn-status.log}. You can specify the path where + OpenVPN should create this file with the directive {status =} in you + {openvpn.conf}. + +item: + The name of the OpenVPN connection (first column in the status file). + +perfdata: + Two variables: the number of bytes per second inbound and outbound traffic. + Note: the check output, PNP template and Perf-O-Meter convert this to MBit/sec. + +inventory: + One service per active connection will be created. Please use + {ignored_services} if you want to restrict this. + diff --git a/checks/openvpn_clients b/checks/openvpn_clients new file mode 100644 index 0000000..26eb2d2 --- /dev/null +++ b/checks/openvpn_clients @@ -0,0 +1,70 @@ +#!/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: +# <<<openvpn_clients:sep(44)>>> +# wilhelmshilfe-hups1,84.161.206.33:58371,11267978,8134524,Sun Mar 10 14:02:27 2013 +# wilhelmshilfe-hups365,84.161.206.33:59737,924198,809268,Sun Mar 10 13:59:14 2013 +# wilhelmshilfe-bartenbach-redu,78.43.52.102:40411,492987861,516066364,Sun Mar 10 03:55:01 2013 +# wilhelmshilfe-hups3,84.161.206.33:58512,8224815,6189879,Sun Mar 10 11:32:40 2013 +# wilhelmshilfe-heiningen,46.5.209.251:3412,461581486,496901007,Fri Mar 8 10:02:38 2013 +# wilhelmshilfe-hups5,84.161.206.33:60319,721646,336190,Sun Mar 10 14:23:30 2013 +# wilhelmshilfe-suessen,92.198.38.212:3077,857194558,646128778,Fri Mar 8 10:02:38 2013 +# wilhelmshilfe-hups6,84.161.206.33:61410,3204103,2793366,Sun Mar 10 11:59:13 2013 +# wilhelmshilfe-gw-fau1,217.92.99.180:55683,109253134,96735180,Sun Mar 10 10:11:44 2013 +# wilhelmshilfe-bendig,78.47.146.190:34475,5787319,19395097,Sat Mar 9 10:02:52 2013 +# wilhelmshilfe-ursenwang,46.223.206.6:47299,747919254,922426625,Fri Mar 8 10:02:38 2013 +# vpn-wilhelmshilfe.access.lihas.de,79.204.249.30:59046,12596972,31933023,Sun Mar 10 09:32:22 2013 +# wilhelmshilfe-karlshof,92.198.38.214:3078,810996228,716994592,Fri Mar 8 10:02:39 2013 + +def inventory_openvpn_clients(info): + return [ (l[0], None) for l in info ] + +def check_openvpn_clients(item, _no_params, info): + for line in info: + if line[0] == item: + infos = [ "Channel is up" ] + perfdata = [] + name, address, inbytes, outbytes, date = line + this_time = time.time() + for what, val in [ + ( "in", int(inbytes) ), + ( "out", int(outbytes) )]: + countername = "openvpn_clients.%s.%s" % (item, what) + timedif, bytes_per_sec = get_counter(countername, this_time, val) + infos.append("%s: %s/sec" % (what, get_bytes_human_readable(bytes_per_sec))) + perfdata.append((what, bytes_per_sec)) + return 0, "OK - " + ", ".join(infos), perfdata + + return 3, "UNKNOWN - Client connection not found" + +check_info["openvpn_clients"] = { + "check_function" : check_openvpn_clients, + "inventory_function" : inventory_openvpn_clients, + "service_description" : "OpenVPN Client %s", + "has_perfdata" : True, +} + diff --git a/pnp-templates/check_mk-openvpn_clients.php b/pnp-templates/check_mk-openvpn_clients.php new file mode 100644 index 0000000..8b6feff --- /dev/null +++ b/pnp-templates/check_mk-openvpn_clients.php @@ -0,0 +1,45 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$parts = explode("_",$servicedesc); +$channel = $parts[2]; + +$opt[1] = "--vertical-label \"MBit per secound\" -X0 -l0 --title \"VPN-Traffic (raw) $hostname / $channel\" "; + +$def[1] = "DEF:in=$RRDFILE[1]:$DS[1]:MAX " ; +$def[1] .= "DEF:out=$RRDFILE[2]:$DS[2]:MAX " ; +$def[1] .= "CDEF:mb_out=out,131072,/ " ; +$def[1] .= "CDEF:mb_out_n=mb_out,-1,* " ; +$def[1] .= "CDEF:mb_in=in,131072,/ " ; +$def[1] .= "AREA:mb_in#30d050:\"Inbound \" " ; +$def[1] .= "GPRINT:mb_in:LAST:\"%6.2lf MBit/s last\" " ; +$def[1] .= "GPRINT:mb_in:AVERAGE:\"%6.2lf MBit/s avg\" " ; +$def[1] .= "GPRINT:mb_in:MAX:\"%6.2lf MBit/s max\\n\" "; +$def[1] .= "AREA:mb_out_n#0060c0:\"Outbound \" " ; +$def[1] .= "GPRINT:mb_out:LAST:\"%6.2lf MBit/s last\" " ; +$def[1] .= "GPRINT:mb_out:AVERAGE:\"%6.2lf MBit/s avg\" " ; +$def[1] .= "GPRINT:mb_out:MAX:\"%6.2lf MBit/s max\\n\" " ; +?> + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index b0ca714..a8ea017 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -397,6 +397,16 @@ perfometers["check_mk-winperf_phydisk"] = perfometer_check_mk_diskstat perfometers["check_mk-hpux_lunstats"] = perfometer_check_mk_diskstat perfometers["check_mk-mysql.innodb_io"] = perfometer_check_mk_diskstat +def perfometer_in_out_mb_per_sec(row, check_command, perf_data): + read_mbit = float(perf_data[0][1]) / 131072 + write_mbit = float(perf_data[1][1]) / 131072 + + text = "%-.2fMb/s %-.2fMb/s" % (read_mbit, write_mbit) + + return text, perfometer_logarithmic_dual( + read_mbit, "#30d050", write_mbit, "#0060c0", 100, 10) +perfometers["check_mk-openvpn_clients"] = perfometer_in_out_mb_per_sec + def perfometer_check_mk_printer_supply(row, check_command, perf_data): left = savefloat(perf_data[0][1])

11 years, 6 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 128372c369af326435a00cb6a3aebbf5e3993fdb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=128372c369af32… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 12:36:27 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 6 months

Check_MK Git: check_mk: New option auth_by_http_header to use the value of a HTTP header variable for authentication (Useful in reverse proxy environments)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0e24304a1458e3725927b34fba74c64f83538ee1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e24304a1458e3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 12:36:14 2013 +0100 New option auth_by_http_header to use the value of a HTTP header variable for authentication (Useful in reverse proxy environments) --- ChangeLog | 2 ++ web/htdocs/config.py | 3 +++ web/htdocs/login.py | 24 ++++++++++++++++++------ web/htdocs/sidebar.py | 2 +- web/plugins/wato/check_mk_configuration.py | 23 +++++++++++++++++++++++ 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33d673e..c5e27bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Multisite: * New availability view for arbitrary host/service collections + * New option auth_by_http_header to use the value of a HTTP header + variable for authentication (Useful in reverse proxy environments) Event Console: * New rule feature: automatically delete event after actions diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 6e94a1f..bf8c5b0 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -561,6 +561,9 @@ def load_default_values(into): # Maximum livetime of unmodified selections into["selection_livetime"] = 3600 + # Configure HTTP header to read usernames from + into["auth_by_http_header"] = False + # ____ ___ # | __ )_ _| # | _ \| | diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 8af8b71..4c4d7b6 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -91,6 +91,14 @@ def set_auth_cookie(username, serial): def get_cookie_value(): return auth_cookie_value(config.user_id, load_serial(config.user_id)) +def renew_cookie(cookie_name, username, serial): + # Do not renew if: + # a) The _ajaxid var is set + # b) A logout is requested + if (html.req.myfile != 'logout' or html.has_var('_ajaxid')) \ + and cookie_name == site_cookie_name(): + set_auth_cookie(username, serial) + def check_auth_cookie(cookie_name): username, issue_time, cookie_hash = html.cookie(cookie_name, '::').split(':', 2) @@ -110,12 +118,7 @@ def check_auth_cookie(cookie_name): raise MKAuthException(_('Invalid credentials')) # Once reached this the cookie is a good one. Renew it! - # Do not renew if: - # a) The _ajaxid var is set - # b) A logout is requested - if (html.req.myfile != 'logout' or html.has_var('_ajaxid')) \ - and cookie_name == site_cookie_name(): - set_auth_cookie(username, serial) + renew_cookie(cookie_name, username, serial) # Return the authenticated username return username @@ -135,6 +138,15 @@ def check_auth(): if html.var("_secret"): return check_auth_automation() + # When http header auth is enabled, try to read the username from the var + # and when there is some available, set the auth cookie (for other addons) and proceed. + if config.auth_by_http_header: + username = html.req.headers_in.get(config.auth_by_http_header, None) + if username: + serial = load_serial(username) + renew_cookie(site_cookie_name(), username, serial) + return username + for cookie_name in html.get_cookie_names(): if cookie_name.startswith('auth_'): try: diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 473521c..fb990f5 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -142,7 +142,7 @@ def sidebar_foot(): html.icon_button("user_profile.py", _("Edit your personal settings, change your password"), "sidebar_settings", target="main") # html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) - if config.may("general.logout"): + if config.may("general.logout") and not config.auth_by_http_header: html.icon_button("logout.py", _("Log out"), "sidebar_logout", target="_top") # html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) html.write('</ul>') diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index bd20672..b0e4c4c 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -297,6 +297,29 @@ register_configvar(group, "details for each executed compilation.")), domain = "multisite") +register_configvar(group, + "auth_by_http_header", + Optional( + TextAscii( + label = _("HTTP Header Variable"), + help = _("Configure the name of the environment variable to read " + "from the incoming HTTP requests"), + default_value = 'REMOTE_USER', + ), + title = _("Authenticate users by incoming HTTP requests"), + label = _("Activate HTTP header authentication (Warning: Only activate " + "in trusted environments, see help for details)"), + help = _("If this option is enabled, multisite reads the configured HTTP header " + "variable from the incoming HTTP request and simply takes the string " + "in this variable as name of the authenticated user. " + "Be warned: Only allow access from trusted ip addresses " + "(Apache <tt>Allow from</tt>), like proxy " + "servers, to this webpage. A user with access to this page could simply fake " + "the authentication information. This option can be useful to " + " realize authentication in reverse proxy environments.") + ), + domain = "multisite") + # .----------------------------------------------------------------------. # | _ _ __ __ _ | # | | | | |___ ___ _ __ | \/ | __ _ _ __ ___ | |_ |

11 years, 6 months

Check_MK Git: check_mk: Debug output when piggy files are outdated

by Mathias Kettner

Module: check_mk Branch: master Commit: c6129da6201ed022ec667c464859e836c4e60980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6129da6201ed0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 12:13:21 2013 +0100 Debug output when piggy files are outdated --- modules/check_mk_base.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7fd93c1..aa3d5de 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -414,6 +414,9 @@ def get_piggyback_info(hostname): file_path = dir + "/" + sourcehost if cachefile_age(file_path) > piggyback_max_cachefile_age: + if opt_debug: + sys.stderr.write("Piggyback file %s is outdated by %d seconds. Deleting it.\n" % + (file_path, cachefile_age(file_path) - piggyback_max_cachefile_age)) os.remove(file_path) continue

11 years, 6 months

Check_MK Git: check_mk: Convert piggyback cache setting to ValueSpec Age

by Mathias Kettner

Module: check_mk Branch: master Commit: f04b272acc95f1e2ab6f6f45091fce7a658530c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04b272acc95f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 12:10:59 2013 +0100 Convert piggyback cache setting to ValueSpec Age --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index bd20672..9b04e8f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -654,10 +654,10 @@ register_configvar(group, register_configvar(group, "piggyback_max_cachefile_age", - Integer(title = _("Maximum age for piggyback files"), - label = _("seconds"), - help = _("The number of seconds a piggyback file may be old to be valid for monitoring. " - "Older files are deleted before processing them.")), + Age(title = _("Maximum age for piggyback files"), + help = _("The maximum age for piggy back data from another host to be valid for monitoring. " + "Older files are deleted before processing them. Please make sure that this age is " + "at least as large as you normal check interval for piggy hosts.")), need_restart = True)

11 years, 6 months

Check_MK Git: check_mk: Fix bug with missing rrd_path

by Mathias Kettner

Module: check_mk Branch: master Commit: b6444a5815a523299d3f68d261f06234253f2928 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6444a5815a523… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 11:47:51 2013 +0100 Fix bug with missing rrd_path --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index d065b01..a7ec05e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -112,7 +112,7 @@ nagios_binary = '/usr/sbin/nagios' nagios_config_file = '/etc/nagios/nagios.cfg' logwatch_notes_url = "/nagios/logwatch.php?host=%s&file=%s" rrdcached_socket = None # used by prediction.py -rrd_path = none # used by prediction.py +rrd_path = None # used by prediction.py def verbose(t): if opt_verbose:

11 years, 6 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: fd4a72e37856c0e8e41399abefc6fa12dcd7c6b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd4a72e37856c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 10:22:58 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 6 months

Check_MK Git: check_mk: Changed sidebar snapin reload to a global interval (option: sidebar_update_interval), defaults to 30 seconds

by Lars Michelsen

Module: check_mk Branch: master Commit: bb081d47ed94fed440cfa30c8bb1549a53d6d80a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb081d47ed94fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 25 10:22:00 2013 +0100 Changed sidebar snapin reload to a global interval (option: sidebar_update_interval), defaults to 30 seconds Sidebar snapins are now bulk updated with one HTTP request each interval Conflicts: ChangeLog --- ChangeLog | 3 + web/htdocs/config.py | 3 + web/htdocs/js/checkmk.js | 21 +++++++- web/htdocs/js/sidebar.js | 68 +++++++++++++------------- web/htdocs/sidebar.py | 73 ++++++++++++++++++---------- web/plugins/pages/shipped.py | 1 - web/plugins/sidebar/nagvis_maps.py | 2 +- web/plugins/sidebar/shipped.py | 16 +++--- web/plugins/wato/check_mk_configuration.py | 17 ++++++- 9 files changed, 129 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bb081d47ed…

11 years, 6 months

Check_MK Git: check_mk: Add code for getting data from RRDs

by Mathias Kettner

Module: check_mk Branch: master Commit: 74eebe828fbde0015af5fb4fcc68efb842366fa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74eebe828fbde0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 23 19:33:21 2013 +0100 Add code for getting data from RRDs --- modules/check_mk.py | 2 + modules/prediction.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 765e974..d065b01 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -111,6 +111,8 @@ nagios_startscript = '/etc/init.d/nagios' nagios_binary = '/usr/sbin/nagios' nagios_config_file = '/etc/nagios/nagios.cfg' logwatch_notes_url = "/nagios/logwatch.php?host=%s&file=%s" +rrdcached_socket = None # used by prediction.py +rrd_path = none # used by prediction.py def verbose(t): if opt_verbose: diff --git a/modules/prediction.py b/modules/prediction.py new file mode 100644 index 0000000..516cb49 --- /dev/null +++ b/modules/prediction.py @@ -0,0 +1,87 @@ +#!/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. + +# Code for predictive monitoring / anomaly detection + +# Export data from an RRD file. This requires an up-to-date +# version of the rrdtools. + +def rrd_export(filename, ds, fromtime, untiltime, rrdcached=None): + # rrdtool xport --json -s 1361554418 -e 1361640814 --step 60 DEF:x=/omd/sites/heute/X.rrd:1:AVERAGE XPORT:x:HIRNI + cmd = "rrdtool xport --json -s %d -e %d --step 60 " % (fromtime, untiltime) + if rrdcached: + cmd += "--daemon '%s' " % rrdcached + cmd += " DEF:x=%s:%s:AVERAGE XPORT:x 2>&1" % (filename, ds) + if opt_debug: + sys.stderr.write("Running %s\n" % cmd) + f = os.popen(cmd) + output = f.read() + exit_code = f.close() + if exit_code: + raise MKGeneralException("Cannot fetch RRD data: %s" % output) + # Parse without json module (this is not always available) + # Our data begins at "data: [..." + begin = output.index("data:") + data_part = output[begin + 5:-2] + data = eval(data_part, { "null" : None }) + # rrdtool xport create a list for each datapoint (because you + # can fetch several value at once) + return [ x[0] for x in data ] + +def pnp_cleanup(s): + return s \ + .replace(' ', '_') \ + .replace(':', '_') \ + .replace('/', '_') \ + .replace('\\', '_') + +def get_rrd_data(hostname, service_description, varname, fromtime, untiltime): + global rrdcached_socket + rrd_file = "%s/%s/%s_%s.rrd" % ( + rrd_path, pnp_cleanup(hostname), pnp_cleanup(service_description), pnp_cleanup(varname)) + if omd_root and not rrdcached_socket: + rrdcached_socket = omd_root + "/tmp/run/rrdcached.sock" + return rrd_export(rrd_file, 1, fromtime, untiltime, rrdcached_socket) + + +### TEST CODE +import os, time, sys, pprint +class MKGeneralException(Exception): + def __init__(self, reason): + self.reason = reason + def __str__(self): + return self.reason +omd_root = os.getenv("OMD_ROOT") +rrdcached_socket = None +execfile(omd_root + "/etc/check_mk/defaults") +opt_debug = True +data = get_rrd_data("test_1", "Check_MK", "execution_time", time.time() - 86400, time.time()) +pprint.pprint(data) + +# HINWEISE für nicht-OMD-Nutzer +# - RRD_STORAGE_TYPE muss MULTIPLE sein - single wird nicht unterstützt. Sonst +# müssten wir noch das XML-File auswerten. +# - rrdcached_socket muss in main.mk definiert werden, wenn rrdcached verwendet wird.

11 years, 6 months

Check_MK Git: check_mk: Cleaned up doc/ directory

by Mathias Kettner

Module: check_mk Branch: master Commit: 0bdff927b655fd01aa853a6a600ab7ae081dfd8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bdff927b655fd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Feb 23 13:23:03 2013 +0100 Cleaned up doc/ directory --- doc/{ => agents}/README.OpenVMS | 0 doc/check_mk.css | 116 -- doc/check_mk.png | Bin 0 -> 53695 bytes doc/{overview.svg => check_mk.svg} | 303 ++-- doc/{overview2.svg => checking.svg} | 0 doc/{ => drafts}/LIESMICH.cookieauth | 0 doc/overview.eps | 3396 ---------------------------------- doc/overview.png | Bin 218108 -> 0 bytes doc/overview.xcf | Bin 514734 -> 0 bytes doc/overview_600.png | Bin 41685 -> 0 bytes doc/overview_600.trans.png | Bin 34549 -> 0 bytes doc/screenshot1.png | Bin 76758 -> 0 bytes 12 files changed, 174 insertions(+), 3641 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0bdff927b6…

11 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013