Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 296dd04eca6caf02ba67159ec07104a1aaa095ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=296dd04eca6caf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 13:39:41 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: Add: mysql_connections - Monitor number of parallel connections to mysql daemon

by Lars Michelsen

Module: check_mk Branch: master Commit: 774399d55fe35f7925c388a05385f88a38ac37cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=774399d55fe35f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 13:39:32 2012 +0100 Add: mysql_connections - Monitor number of parallel connections to mysql daemon --- ChangeLog | 1 + agents/plugins/mk_mysql | 2 +- checks/mysql | 48 ++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 24 +++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b40fa7..f088cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * Add: sym_brightmail_queues - monitor the queue levels on Symantec Brightmail mail scanners. * Add: plesk_domains - List domains configured in plesk installations * Add: plesk_backups - Monitor backup spaces configured for domains in plesk + * Add: mysql_connections - Monitor number of parallel connections to mysql daemon * FIX: zfsget: fix exception on snapshot volumes (where available is '-') * FIX: loading notification scripts in local directory for real * FIX: oracle_version: return valid check result in case of missing agent info diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index e634149..de28d4c 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -31,5 +31,5 @@ then mysqladmin --defaults-extra-file=$MK_CONFDIR/mysql.cfg ping 2>&1 mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg -sN \ - -e "select '<<<mysql>>>' ; show global status; select '<<<mysql_capacity>>>' ; SELECT table_schema, sum( data_length + index_length ), sum( data_free ) FROM information_schema.TABLES GROUP BY table_schema;" + -e "select '<<<mysql>>>' ; show global status; show global variables; select '<<<mysql_capacity>>>' ; SELECT table_schema, sum( data_length + index_length ), sum( data_free ) FROM information_schema.TABLES GROUP BY table_schema;" fi diff --git a/checks/mysql b/checks/mysql index 6087d89..4fe957b 100644 --- a/checks/mysql +++ b/checks/mysql @@ -154,3 +154,51 @@ check_info['mysql.innodb_io'] = { "has_perfdata" : True, "group" : "mysql_innodb_io", } + +# .--Connections---------------------------------------------------------. +# | ____ _ _ | +# | / ___|___ _ __ _ __ ___ ___| |_(_) ___ _ __ ___ | +# | | | / _ \| '_ \| '_ \ / _ \/ __| __| |/ _ \| '_ \/ __| | +# | | |__| (_) | | | | | | | __/ (__| |_| | (_) | | | \__ \ | +# | \____\___/|_| |_|_| |_|\___|\___|\__|_|\___/|_| |_|___/ | +# | | +# +----------------------------------------------------------------------+ + +def inventory_mysql_connections(info): + values = parse_mysql(info) + if 'Max_used_connections' in values: + return [(None, {})] + +def check_mysql_connections(item, params, info): + values = parse_mysql(info) + # The maximum number of connections that have been in use simultaneously + # since the server started. + conn = float(values['Max_used_connections']) + # Maximum number of possible parallel connections + max_conn = float(values['max_connections']) + + perc_used = conn / max_conn * 100 + + status = 0 + status_txt = '' + if 'perc_used' in params: + if perc_used >= params['perc_used'][1]: + status = 2 + status_txt = ' (Threshold (%0.2f%%) for number of maximum parallel connections ' \ + 'has been reached at least once since program start' % params['perc_used'][1] + elif perc_used >= params['perc_used'][0]: + status = 1 + status_txt = ' (Threshold (%0.2f%%) for number of maximum parallel connections ' \ + 'has been reached at least once since program start)' % params['perc_used'][0] + + return (status, '%s - Max. parallel Connections: %d (Max.: %d): %0.2f%%%s' % + (nagios_state_names[status], conn, max_conn, perc_used, status_txt)) + + +check_info['mysql.connections'] = { + "check_function" : check_mysql_connections, + "inventory_function" : inventory_mysql_connections, + "service_description" : "MySQL Daemon Connections", + "has_perfdata" : True, + "group" : "mysql_connections", +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 4b0a20d..41326f4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1412,6 +1412,30 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, + "mysql_connections", + _("MySQL Connections"), + Dictionary( + elements = [ + ( "perc_used", + Tuple( + title = _("Max. parallel connections"), + help = _("Compares the the maximum number of connections that have been " + "in use simultaneously since the server started with the maximum parallel " + "connections allowed by the configuration of the server. This threshold " + "makes the check raises warning/critical states if the percentage is equal to " + "or above the configured levels."), + elements = [ + Percentage(title = _("Warning at")), + Percentage(title = _("Critical at")), + ] + ) + ), + ]), + None, + "dict")) + +checkgroups.append(( + subgroup_applications, "dbsize", _("Size of MySQL/PostgresQL databases"), Optional(

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 7e4ec2ae0b09331584d5db814ac855b509669c38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4ec2ae0b0933… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 12:49:21 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: apache_status: Fixed handling of PIDs with more than 4 numbers

by Lars Michelsen

Module: check_mk Branch: master Commit: adf3303bfdc282c9ba06c5dde7c65c2524a0f9cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adf3303bfdc282… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 12 12:48:47 2012 +0100 apache_status: Fixed handling of PIDs with more than 4 numbers --- ChangeLog | 1 + agents/plugins/apache_status | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 276a139..43c16e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * Linux Agent, mk_postgres: Fixed database stats query to be compatible with more versions of postgres * apache_status: Modified to be usable on python < 2.6 (eg RHEL 5.x) + * apache_status: Fixed handling of PIDs with more than 4 numbers * FIX: postgres_sessions: handle case of no active/no idle sessions * FIX: correct backslash representation of windows logwatch files * Add: New Check for Rittal CMC PSM-M devices diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index fae8a7c..beb1b56 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -40,8 +40,14 @@ def try_detect_servers(): pid, proc = parts[6].split('/') + procs = [ 'apache2', 'httpd', 'httpd2-prefork', 'httpd2-worker', 'httpd.worker' ] + # the pid/proc field length is limited to 19 chars. Thus in case of + # long PIDs, the process names are stripped of by that length. + # Workaround this problem here + procs = [ p[:19 - len(pid) - 1] for p in procs ] + # Skip unwanted processes - if proc not in [ 'apache2', 'httpd', 'httpd2-prefork', 'httpd2-worker', 'httpd.worker' ]: + if proc not in procs: continue # Add only the first found port of a single server process

11 years, 9 months

Check_MK Git: check_mk: FIX: apache_status: fixed bug with missing url, wrote man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 394aa76d09b16a8da2aef392193b6bc5619c8f71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=394aa76d09b16a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 22:26:12 2012 +0100 FIX: apache_status: fixed bug with missing url, wrote man page --- ChangeLog | 1 + agents/apache_status.cfg | 11 +++++++++++ agents/plugins/apache_status | 1 + checkman/apache_status | 36 ++++++++++++++++++++++++++++++++++++ checks/apache_status | 2 +- 5 files changed, 50 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e76326d..a87d677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * Add: plesk_backups - Monitor backup spaces configured for domains in plesk * FIX: zfsget: fix exception on snapshot volumes (where available is '-') * FIX: oracle_version: return valid check result in case of missing agent info + * FIX: apache_status: fixed bug with missing 'url', wrote man page Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/agents/apache_status.cfg b/agents/apache_status.cfg new file mode 100644 index 0000000..cd871d9 --- /dev/null +++ b/agents/apache_status.cfg @@ -0,0 +1,11 @@ +# Example for configuration for apache_status plugin +# Note: you need this file only if the autodetection fails +# or you do not want to contact all servers it detects + +# Note: Activate this only if the autodetection fails. +# servers = [ +# ('http', 'localhost', 80), +# ('https', 'localhost', 443), +# ('http', 'localhost', 8080), +# ] + diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index fae8a7c..295012b 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -77,6 +77,7 @@ if not servers: print '<<<apache_status>>>' for proto, address, port in servers: try: + url = '%s://%s:%s/server-status?auto' % (proto, address, port) # Try to fetch the status page for each server try: fd = urllib2.urlopen(url) diff --git a/checkman/apache_status b/checkman/apache_status new file mode 100644 index 0000000..9f0e772 --- /dev/null +++ b/checkman/apache_status @@ -0,0 +1,36 @@ +title: Check performance indicators of Apache web server +agents: linux +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check parses the information provided by the Apache status module. + If you have enabled that module (on Debian/Ubuntu this is the default), + then below the URL {/server-status} Apache show interesting information + about the number of connections and the like. The agent plugin {apache_status} + fetches that data and this check processes it. The status is always OK, + but it fetches interesting performance data. + + As a preparation you need to install the agent plugin {apache_status} + into you agent's plugins directory (usually {/usr/lib/check_mk_agent/plugins}). + The plugin tries to autodetect all running apache servers. If that fails + for some reason you need to create the configuration file + {/etc/check_mk/apache_status.cfg} and list your servers here. Write + a Python list of triples of protocol, servername and port. Here is + an example: {servers = [('http', 'localhost', 80),('https', 'localhost', 443)]}. + +inventory: + One service per Apache server will be created. + +item: + A string-combination of servername and port, e.g. {127.0.0.1:5000}. + +perfdata: + This check outputs lots of performance variables since this is the + purpose of the check. Please look at the shipped PNP template for + details. + + + + + diff --git a/checks/apache_status b/checks/apache_status index 5dd32db..af70ca9 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -88,7 +88,7 @@ def inventory_apache_status(info): inv.append((item, None)) return inv -def check_apache_status(item, params, info): +def check_apache_status(item, _no_params, info): all_data = apache_status_parse(info) if item not in all_data: return (3, 'UNKNOWN - Unable to find instance in agent output')

11 years, 9 months

Check_MK Git: check_mk: Icon to events of host links to view that has context button to host

by Mathias Kettner

Module: check_mk Branch: master Commit: 87c2cb3606963143e7c7f80085be296aafabf2d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87c2cb36069631… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 21:57:22 2012 +0100 Icon to events of host links to view that has context button to host --- ChangeLog | 1 + mkeventd/web/plugins/icons/mkeventd.py | 6 ++++- mkeventd/web/plugins/views/mkeventd.py | 38 ++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddbf7d4..e76326d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ via a new button in WATO. * Speedup access to event history by earlier filtering and prefiltering with grep * New builtin syslog server! Please refer to online docu for details. + * Icon to events of host links to view that has context button to host 1.2.1i3: Core: diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py index 9487d6b..62501df 100644 --- a/mkeventd/web/plugins/icons/mkeventd.py +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -79,7 +79,11 @@ def paint_mkeventd(what, row, tags, custom_vars): url_prefix = site['url_prefix'] + 'check_mk/' title = _('Events of Host %s') % (host) - url = 'view.py?view_name=ec_events_of_host&event_host=' + host + url = 'view.py?' + htmllib.urlencode_vars([ + ("view_name", "ec_events_of_monhost"), + ("site", row["site"]), + ("host", host), + ]) if len(args) >= 2: app = args[1].strip('\'') diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 766ce55..8dc44ee 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -828,6 +828,44 @@ if mkeventd_enabled: ], }) + multisite_builtin_views['ec_events_of_monhost'] = mkeventd_view({ + 'title': u'Events of Monitored Host', + 'description': u'Currently open events of a host that is monitored', + 'datasource': 'mkeventd_events', + 'layout': 'table', + 'hidden': True, + 'painters': [ + ('event_id', 'ec_event', ''), + ('event_icons', None, ''), + ('event_state', None, ''), + ('event_sl', None, ''), + ('event_rule_id', None, ''), + ('event_application', None, ''), + ('event_text', None, ''), + ('event_last', None, ''), + ('event_count', None, ''), + ], + 'show_filters': [ + 'event_id', + 'event_rule_id', + 'event_text', + 'event_application', + 'event_contact', + 'event_comment', + 'event_count', + 'event_phase', + 'event_state', + 'event_first', + 'event_last', + 'event_priority', + 'event_facility', + 'event_sl', + ], + 'hide_filters': [ + 'site', + 'host', + ], + }) multisite_builtin_views['ec_events_of_host'] = mkeventd_view({ 'title': u'Events of Host', 'description': u'Currently open events of one specific host',

11 years, 9 months

Check_MK Git: check_mk: FIX: oracle_version: return valid check result in case of missing agent info

by Mathias Kettner

Module: check_mk Branch: master Commit: e7741af2fc0aed5295d0c56425d96d0f8b15e846 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7741af2fc0aed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 16:52:34 2012 +0100 FIX: oracle_version: return valid check result in case of missing agent info --- ChangeLog | 1 + checks/oracle_version | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index aedb7dd..b5725b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * Add: plesk_domains - List domains configured in plesk installations * Add: plesk_backups - Monitor backup spaces configured for domains in plesk * FIX: zfsget: fix exception on snapshot volumes (where available is '-') + * FIX: oracle_version: return valid check result in case of missing agent info Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/checks/oracle_version b/checks/oracle_version index ea6f835..f899e76 100644 --- a/checks/oracle_version +++ b/checks/oracle_version @@ -40,6 +40,7 @@ def check_oracle_version(item, _no_params, info): return err return (0, 'OK - Version: ' + " ".join(line[1:])) + return (3, 'UNKNOWN - no version information, database might be stopped') check_info['oracle_version'] = { "check_function" : check_oracle_version,

11 years, 9 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: 5499d0cc291144907f68e4fa98b7f07e672d9e20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5499d0cc291144… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 11 16:52:37 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 8c8970566f49b88fd2c4400a58f1305a610df227 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c8970566f49b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 16:19:11 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 9 months

Check_MK Git: check_mk: apache_status agent plugin: working around problems with misconfigured apache servers

by Lars Michelsen

Module: check_mk Branch: master Commit: 6111ffb8c69763aeaf966f7fadd0df3ccea207db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6111ffb8c69763… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 11 16:16:26 2012 +0100 apache_status agent plugin: working around problems with misconfigured apache servers --- agents/plugins/apache_status | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index fd63734..fae8a7c 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -78,8 +78,17 @@ print '<<<apache_status>>>' for proto, address, port in servers: try: # Try to fetch the status page for each server - url = '%s://%s:%s/server-status?auto' % (proto, address, port) - fd = urllib2.urlopen(url) + try: + fd = urllib2.urlopen(url) + except urllib2.URLError, e: + if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e): + # HACK: workaround misconfigurations where port 443 is used for + # serving non ssl secured http + url = 'http://%s:%s/server-status?auto' % (address, port) + fd = urllib2.urlopen(url) + else: + raise + for line in fd.read().split('\n'): if not line.strip(): continue

11 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012