Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Fix formatting for ntp error output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: efd4561568b3a8a64d5fefc3eccfa509504dbb0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efd4561568b3a8… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 10:37:10 2012 +0200 Fix formatting for ntp error output --- checks/ntp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/ntp b/checks/ntp index efb24d0..2fa39ae 100644 --- a/checks/ntp +++ b/checks/ntp @@ -105,7 +105,7 @@ def check_ntp_server_state(line, params): maxstratum, warn, crit = params if abs(offset) >= crit: - return (2, "critical offset " + infotext, offset, jitter) + return (2, "critical offset" + " " + infotext, offset, jitter) elif state in [ "falsetick" ]: return (2, infotext, offset, jitter) elif stratum >= maxstratum: @@ -119,7 +119,7 @@ def check_ntp_server_state(line, params): # return (3, "response due since %d secs%s" % (when - poll, infotext), offset, jitter) elif abs(offset) >= warn: - return (1, "offset too high" + infotext, offset, jitter) + return (1, "offset too high" + " " + infotext, offset, jitter) else: return (0, infotext, offset, jitter)

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: 23ac4f011796052dabeb80e3786a3b7d24287da5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23ac4f01179605… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 11:47:20 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Change capitalization of MySQL before everyone inventorizes it

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 34fbfb4b75ba0fdfadfb5d75ca2240234d0cc06f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34fbfb4b75ba0f… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 5 11:07:09 2012 +0200 Change capitalization of MySQL before everyone inventorizes it --- checks/mysql | 4 ++-- checks/mysql_capacity | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/mysql b/checks/mysql index c3c6e34..377205e 100644 --- a/checks/mysql +++ b/checks/mysql @@ -121,7 +121,7 @@ def check_mysql_sessions(_no_item, params, info): check_info['mysql.sessions'] = { "check_function" : check_mysql_sessions, "inventory_function" : inventory_mysql, - "service_description" : "MYSQL Sessions", + "service_description" : "MySQL Sessions", "has_perfdata" : True, "group" : "mysql_sessions", } @@ -150,7 +150,7 @@ check_info['mysql.innodb_io'] = { "includes" : [ "diskstat.include" ], "check_function" : check_mysql_iostat, "inventory_function" : inventory_mysql_iostat, - "service_description" : "MYSQL InnoDB IO", + "service_description" : "MySQL InnoDB IO", "has_perfdata" : True, "group" : "mysql_innodb_io", } diff --git a/checks/mysql_capacity b/checks/mysql_capacity index 66b7081..51c5914 100644 --- a/checks/mysql_capacity +++ b/checks/mysql_capacity @@ -53,7 +53,7 @@ def check_mysql_capacity(item, params, info): check_info['mysql_capacity'] = { "check_function" : check_mysql_capacity, "inventory_function" : inventory_mysql_capacity, - "service_description" : "MYSQL Capacity %s", + "service_description" : "MySQL Capacity %s", "has_perfdata" : True, "group" : "filesystem", "default_levels_variable" : "filesystem_default_levels",

12 years, 3 months

Check_MK Git: check_mk: Fix possible bug when rulegroup has no help

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4eee21cdfabc0532ad802e7129aaafc57b721c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4eee21cdfabc0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 5 10:57:42 2012 +0200 Fix possible bug when rulegroup has no help --- web/htdocs/wato.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d73a59d..15cfd7e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9242,9 +9242,10 @@ def mode_rulesets(phase): if not only_host: render_folder_path(keepvarnames = ["mode", "local", "group"]) - help = "".join(help.split("\n", 1)[1:]).strip() - if help: - html.help(help) + if help != None: + help = "".join(help.split("\n", 1)[1:]).strip() + if help: + html.help(help) if only_local and not only_host: all_rulesets = {}

12 years, 3 months

Check_MK Git: check_mk: postgres_stat_database.size: New check for PostgreSQL database size

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff7d8054ab0021646867611ea97bc3cf67290ce5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff7d8054ab0021… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 20:34:04 2012 +0200 postgres_stat_database.size: New check for PostgreSQL database size --- ChangeLog | 1 + agents/plugins/mk_postgres | 3 ++- checks/postgres_stat_database | 22 ++++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65cea20..4228009 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * mysql_capacity: New check for used/free capacity of MySQL databases * postgres_sessions: New check for PostgreSQL number of sessions * postgres_stat_database: New check for PostgreSQL database statistics + * postgres_stat_database.size: New check for PostgreSQL database size 1.2.0b6: Multisite: diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index 225690f..722f9dd 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -4,5 +4,6 @@ if id postgres >/dev/null ; then echo '<<<postgres_sessions>>>' echo "select current_query = '<IDLE>', count(*) from pg_stat_activity group by (current_query = '<IDLE>');" | su - postgres -c "psql -A -t -F' '" echo '<<<postgres_stat_database>>>' - echo 'select * from pg_stat_database' | su - postgres -c "psql -A -F' '" | sed '$d' + echo 'select *, pg_database_size(datname) "datsize" from pg_stat_database;' \ + | su - postgres -c "psql -A -F' '" | sed '$d' fi diff --git a/checks/postgres_stat_database b/checks/postgres_stat_database index c151f81..86ffc44 100644 --- a/checks/postgres_stat_database +++ b/checks/postgres_stat_database @@ -103,11 +103,29 @@ def check_postgres_stat_database(item, params, info): return (status, nagios_state_names[status] + " - " + ", ".join(infos), perfdata) - check_info['postgres_stat_database'] = { "check_function" : check_postgres_stat_database, "inventory_function" : inventory_postgres_stat_database, - "service_description" : "PostgreSQL Statistics", + "service_description" : "PostgreSQL Statistics %s", "has_perfdata" : True, "group" : "postgres_stat_database", } + + +def check_postgres_stat_database_size(item, _no_params, info): + parsed = parse_postgres_stat(info) + if item not in parsed: + return (3, "UNKNOWN - Database not found") + stats = parsed[item] + size = stats["datsize"] + + return (0, "OK - Size is %s" % get_bytes_human_readable(size), [("size", size)]) + + +check_info['postgres_stat_database.size'] = { + "check_function" : check_postgres_stat_database_size, + "inventory_function" : inventory_postgres_stat_database, + "service_description" : "PostgreSQL Database Size %s", + "has_perfdata" : True, +} +

12 years, 3 months

Check_MK Git: check_mk: Fix WATO template for new postgres stats check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83b2e9c3d9b0f66d4b8bee7232ef1622c8a9017f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83b2e9c3d9b0f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 20:14:40 2012 +0200 Fix WATO template for new postgres stats check --- web/plugins/wato/check_parameters.py | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 84de09b..96227fe 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1063,32 +1063,32 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, - "postgres_stat_database"m + "postgres_stat_database", _("PostgreSQL Database Statistics"), Dictionary( help = _("This check monitors how often database objects in a PostgreSQL Database are accessed"), elements = [ ( "blocks_read", Tuple( - title = _("disk blocks read"), + title = _("Blocks read"), elements = [ - Float(title = "warning at", unit = _("bytes/s")), - Float(title = "critical at", unit = _("bytes/s")), + Float(title = "warning at", unit = _("blocks/s")), + Float(title = "critical at", unit = _("blocks/s")), ], ), ), ( "xact_commit", Tuple( - title = _("Commited transactions / subtransactions"), + title = _("Commits"), elements = [ - Float(title = "warning at", unit = _("bytes/s")), - Float(title = "critical at", unit = _("bytes/s")), + Float(title = "warning at", unit = _("/s")), + Float(title = "critical at", unit = _("/s")), ], ), ), ( "tup_fetched", Tuple( - title = _("Database Fetches"), + title = _("Fetches"), elements = [ Float(title = "warning at", unit = _("/s")), Float(title = "critical at", unit = _("/s")), @@ -1097,7 +1097,7 @@ checkgroups.append(( ), ( "tup_deleted", Tuple( - title = _("Tuple Deletes"), + title = _("Deletes"), elements = [ Float(title = "warning at", unit = _("/s")), Float(title = "critical at", unit = _("/s")), @@ -1106,7 +1106,7 @@ checkgroups.append(( ), ( "tup_updated", Tuple( - title = _("Tuple Updates"), + title = _("Updates"), elements = [ Float(title = "warning at", unit = _("/s")), Float(title = "critical at", unit = _("/s")), @@ -1115,7 +1115,7 @@ checkgroups.append(( ), ( "tup_inserted", Tuple( - title = _("Tuple Inserts"), + title = _("Inserts"), elements = [ Float(title = "warning at", unit = _("/s")), Float(title = "critical at", unit = _("/s")), @@ -1124,7 +1124,9 @@ checkgroups.append(( ), ], ), - None, + TextAscii( + title = _("Database name"), + allow_empty = False), None)) checkgroups.append((

12 years, 3 months

Check_MK Git: check_mk: postgres_stat_database: New check for PostgreSQL database statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a507bea84f2b193aa719fde28277476e08453d49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a507bea84f2b19… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 20:07:11 2012 +0200 postgres_stat_database: New check for PostgreSQL database statistics --- ChangeLog | 1 + agents/plugins/mk_postgres | 2 + checks/postgres_stat_database | 113 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f19d22e..65cea20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * mysql.innodb_io: New check for Disk-IO of InnoDB * mysql_capacity: New check for used/free capacity of MySQL databases * postgres_sessions: New check for PostgreSQL number of sessions + * postgres_stat_database: New check for PostgreSQL database statistics 1.2.0b6: Multisite: diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index 3dc2840..225690f 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -3,4 +3,6 @@ if id postgres >/dev/null ; then echo '<<<postgres_sessions>>>' echo "select current_query = '<IDLE>', count(*) from pg_stat_activity group by (current_query = '<IDLE>');" | su - postgres -c "psql -A -t -F' '" + echo '<<<postgres_stat_database>>>' + echo 'select * from pg_stat_database' | su - postgres -c "psql -A -F' '" | sed '$d' fi diff --git a/checks/postgres_stat_database b/checks/postgres_stat_database new file mode 100644 index 0000000..c151f81 --- /dev/null +++ b/checks/postgres_stat_database @@ -0,0 +1,113 @@ +#!/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. + + +# <<<postgres_stat_database>>> +# datid datname numbackends xact_commit xact_rollback blks_read blks_hit tup_returned tup_fetched tup_inserted tup_updated tup_deleted +# 1 template1 0 0 0 0 0 0 0 0 0 0 +# 11563 template0 0 0 0 0 0 0 0 0 0 0 +# 11564 postgres 2 568360 17 811 8855508 157949341 879922 0 0 0 +# 16385 foobardb 7 43619118 262 3589 838098632 854602076 441785363 8298 602481 2806 + + +# Create a check for all databases that have seen at least +# one commit in their live. +def inventory_postgres_stat_database(info): + parsed = parse_postgres_stat(info) + return [ (k, {}) for k in parsed.keys() + if parsed[k]["xact_commit"] > 0 ] + +def parse_postgres_stat(info): + if len(info) == 0: + return {} + + def s(x): + try: + return int(x) + except: + return x + + parsed = {} + headers = info[0] + for line in info[1:]: + row = dict(zip(headers, map(s, line))) + parsed[row["datname"]] = row + + return parsed + + +def check_postgres_stat_database(item, params, info): + parsed = parse_postgres_stat(info) + if item not in parsed: + return (3, "UNKNOWN - Database not found") + stats = parsed[item] + + status = 0 + infos = [] + perfdata = [] + this_time = time.time() + one_wrapped = False + for what, title in [ + ( "blks_read", "Blocks Read" ), + ( "tup_fetched", "Fetches" ), + ( "xact_commit", "Commits" ), + ( "tup_deleted", "Deletes" ), + ( "tup_updated", "Updates" ), + ( "tup_inserted", "Inserts" ), ]: + counter = stats[what] + counter_name = "postgres_stat_database.%s.%s" % (item, what) + try: + timedif, rate = get_counter(counter_name, this_time, counter) + except MKCounterWrapped, e: + one_wrapped = e + continue + + infos.append("%s: %.2f/s" % (title, rate)) + if what in params: + warn, crit = params[what] + if rate >= crit: + status = 2 + infos[-1] += '(!!)' + elif rate >= warn: + status = max(status, 1) + infos[-1] += '(!)' + else: + warn, crit = None, None + perfdata.append((what, rate, warn, crit)) + + if one_wrapped: + raise one_wrapped + + return (status, nagios_state_names[status] + " - " + ", ".join(infos), perfdata) + + +check_info['postgres_stat_database'] = { + "check_function" : check_postgres_stat_database, + "inventory_function" : inventory_postgres_stat_database, + "service_description" : "PostgreSQL Statistics", + "has_perfdata" : True, + "group" : "postgres_stat_database", +}

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: 9a312480f66b99d47fe4c4c5f08718e532527d1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a312480f66b99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 4 20:07:21 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: WATO config for PostgreSQL stat_database

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36f22269b7e176961c3eb255a892f16b4209868d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f22269b7e176… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jun 4 20:06:49 2012 +0200 WATO config for PostgreSQL stat_database --- web/plugins/wato/check_parameters.py | 66 ++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f7b9543..84de09b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1063,6 +1063,72 @@ checkgroups.append(( checkgroups.append(( subgroup_applications, + "postgres_stat_database"m + _("PostgreSQL Database Statistics"), + Dictionary( + help = _("This check monitors how often database objects in a PostgreSQL Database are accessed"), + elements = [ + ( "blocks_read", + Tuple( + title = _("disk blocks read"), + elements = [ + Float(title = "warning at", unit = _("bytes/s")), + Float(title = "critical at", unit = _("bytes/s")), + ], + ), + ), + ( "xact_commit", + Tuple( + title = _("Commited transactions / subtransactions"), + elements = [ + Float(title = "warning at", unit = _("bytes/s")), + Float(title = "critical at", unit = _("bytes/s")), + ], + ), + ), + ( "tup_fetched", + Tuple( + title = _("Database Fetches"), + elements = [ + Float(title = "warning at", unit = _("/s")), + Float(title = "critical at", unit = _("/s")), + ], + ), + ), + ( "tup_deleted", + Tuple( + title = _("Tuple Deletes"), + elements = [ + Float(title = "warning at", unit = _("/s")), + Float(title = "critical at", unit = _("/s")), + ], + ), + ), + ( "tup_updated", + Tuple( + title = _("Tuple Updates"), + elements = [ + Float(title = "warning at", unit = _("/s")), + Float(title = "critical at", unit = _("/s")), + ], + ), + ), + ( "tup_inserted", + Tuple( + title = _("Tuple Inserts"), + elements = [ + Float(title = "warning at", unit = _("/s")), + Float(title = "critical at", unit = _("/s")), + ], + ), + ), + ], + ), + None, + None)) + +checkgroups.append(( + subgroup_applications, "win_dhcp_pools", _("Windows DHCP Pool"), Tuple(

12 years, 3 months

Check_MK Git: check_mk: Man page for MySQL capacity

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 819eb77e38e7274803c311f6e5ee07df36ce8cde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=819eb77e38e727… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jun 4 19:51:02 2012 +0200 Man page for MySQL capacity --- checkman/mysql_capacity | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/checkman/mysql_capacity b/checkman/mysql_capacity new file mode 100644 index 0000000..80c4602 --- /dev/null +++ b/checkman/mysql_capacity @@ -0,0 +1,20 @@ +title: Capacity check for MySQL tablespaces +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check verifies the space used and available for MySQL databases as + returned from MySQL. + +inventory: + The check generates one item per Database found. + Internal MySQL databases are ignored. + + +[configuration] + The check is configured like the {df} check for filesystems including trend reporting. + + +perfdata: + See {df} man page for performance data.

12 years, 3 months

← Newer
1
...
21
22
23
24
25
26
27
...
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