Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

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: 54373d419a247707d28652e0a8b14d291a50dfdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54373d419a2477… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 27 09:30:19 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Added simple apc powerswitch check, no config yet

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d01ea40aed9024ddbb0079ef460fe9478e22291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d01ea40aed902… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jun 26 20:55:47 2012 +0200 Added simple apc powerswitch check, no config yet --- checks/apc_powerswitch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/checks/apc_powerswitch b/checks/apc_powerswitch new file mode 100644 index 0000000..c5298d3 --- /dev/null +++ b/checks/apc_powerswitch @@ -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 inventory_apc_powerswitch(info): + return [(x[0],saveint(line[2])) for x in info] + +def check_apc_powerswitch(item, params, info): + state = { + 1 : 'on', + 2 : 'off', + } + for line in info: + if line[0] == item: + return(0, 'OK - Port %s has status %s' % (line[1], state[saveint(line[2])])) + + return False + + + +check_info['apc_powerswitch'] = { + 'check_function' : check_apc_powerswitch, + 'inventory_function' : inventory_apc_powerswitch, + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3.4.5"), + 'service_description' : 'Power Outlet Port %s', + 'snmp_info' : ( '.1.3.6.1.4.1.318.1.1.12.3.5.1.1', [1, 2, 4] ), +}

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: 72f372b1abc0f8240cd0dbc2f610d18e98a48d3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72f372b1abc0f8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jun 26 20:56:01 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: count_ok: allow percentages, e.g. "count_ok!70%!50% "

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eed5a817bc1e59d20eb04149b3b0e17408ca0d4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eed5a817bc1e59… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 18:01:00 2012 +0200 count_ok: allow percentages, e.g. "count_ok!70%!50%" --- ChangeLog | 1 + web/htdocs/bi.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b182927..5f2eb05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * New logical datatable for aggregations that have the same name as a host. Converted view "BI Boxes" to this new table. This allows for Host-Aggregations containing data of other hosts as well. + * count_ok: allow percentages, e.g. "count_ok!70%!50%" 1.2.0p1: Core: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 000d8ca..c758b95 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -888,12 +888,23 @@ def aggr_best(nodes, n = 1, worst_state = CRIT): config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best +def aggr_countok_convert(num, count): + if num.endswith('%'): + return int(num[:-1]) / 100.0 * count + else: + return int(num) + def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): states = [ i[0]["state"] for i in nodes ] num_ok = len([s for s in states if s == 0 ]) - if num_ok >= int(needed_for_ok): + + # counts can be specified as integer (e.g. '2') or + # as percentages (e.g. '70%'). + + + if num_ok >= aggr_countok_convert(needed_for_ok, len(states)): return { "state" : 0, "output" : "" } - elif num_ok >= int(needed_for_warn): + elif num_ok >= aggr_countok_convert(needed_for_warn, len(states)): return { "state" : 1, "output" : "" } else: return { "state" : 2, "output" : "" }

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0779

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3dd823a882211a262743f0fb5664e57f1ffbb43b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dd823a882211a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 17:55:06 2012 +0200 Updated bug entries #0779 --- .bugs/779 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/779 b/.bugs/779 new file mode 100644 index 0000000..e6dd858 --- /dev/null +++ b/.bugs/779 @@ -0,0 +1,9 @@ +Title: BI cannot assume UP host state +Component: bi +State: open +Date: 2012-06-26 17:54:41 +Targetversion: 1.2.0 +Class: bug + +You can assume OK as service state but not UP +as host state (just DOWN and UNREACH).

12 years, 3 months

Check_MK Git: check_mk: remove obsolete ORACLE checks where no agent plugins where available

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dca71884b0e9384bdeb39206a1a2b017ccc513d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dca71884b0e938… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 17:39:24 2012 +0200 remove obsolete ORACLE checks where no agent plugins where available --- ChangeLog | 1 + checkman/oracle_asm_dg | 10 -- checkman/oracle_asm_disk | 10 -- checkman/oracle_inst | 10 -- checkman/oracle_tbs | 10 -- checks/oracle_asm_dg | 58 ----------- checks/oracle_asm_disk | 53 ---------- checks/oracle_asm_diskgroup | 50 ---------- checks/oracle_inst | 119 ----------------------- checks/oracle_tbs | 89 ----------------- pnp-templates/check_mk-oracle_asm_diskgroup.php | 1 - pnp-templates/check_mk-oracle_inst.php | 35 ------- 12 files changed, 1 insertions(+), 445 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dca71884b0…

12 years, 3 months

Check_MK Git: check_mk: mk_logwatch on Linux: new options regex and iregex for file selection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cefbefd75b85e157cd921eaf1d2a45ca4b814673 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cefbefd75b85e1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 17:13:57 2012 +0200 mk_logwatch on Linux: new options regex and iregex for file selection --- ChangeLog | 1 + agents/plugins/mk_logwatch | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 474f9db..57a6075 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ database - and using uncached direct SQL output. * ORACLE agent: fix handling of EXCLUDE, new variable ONLY_SIDS for explicitely listing SIDs to monitor + * mk_logwatch on Linux: new options regex and iregex for file selection Multisite: * Show number of rows and number of selected rows in header line diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index e4d86e3..beb19e9 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -240,6 +240,8 @@ for filenames, patterns in config: # Initialize options with default values opt_maxlines = None opt_maxtime = None + opt_regex = None + opt_iregex = None opt_overflow = 'C' opt_overflow_level = 2 try: @@ -254,6 +256,10 @@ for filenames, patterns in config: raise Exception("Invalid value %s for overflow. Allowed are C, I and W" % value) opt_overflow = value opt_overflow_level = {'C':2, 'W':1, 'I':0}[value] + elif key == 'regex': + opt_regex = re.compile(value) + elif key == 'iregex': + opt_iregex = re.compile(value, re.I) else: raise Exception("Invalid option %s" % key) except Exception, e: @@ -265,6 +271,8 @@ for filenames, patterns in config: if '=' in glob: continue logfiles = [ l.strip() for l in os.popen("ls %s 2>/dev/null" % glob).readlines() ] + if opt_regex: + logfiles = [ f for f in logfiles if opt_regex.search(f) ] if len(logfiles) == 0: print '[[[%s:missing]]]' % glob else:

12 years, 3 months

Check_MK Git: check_mk: simulation_mode: avoid active checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4309419edb0732a28c608e91e47dde7f4c678476 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4309419edb0732… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 16:10:35 2012 +0200 simulation_mode: avoid active checks --- ChangeLog | 4 ++++ modules/check_mk.py | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cef007..474f9db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.0p2: + Core: + * simulation_mode: legacy_checks, custom_checks and active_checks + are replaced with dummy checks always being OK + Checks & Agents: * FIX: Fixed syntax errors in a bunch of man pages * if_lancom: silently ignore Point-To-Point interfaces diff --git a/modules/check_mk.py b/modules/check_mk.py index 539f143..2c5725a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1789,7 +1789,7 @@ define service { check_command\t\t\t%s active_checks_enabled\t\t1 %s} -""" % (template, hostname, description, command, extraconf)) +""" % (template, hostname, description, simulate_command(command), extraconf)) # legacy checks via active_checks actchecks = [] @@ -1822,15 +1822,16 @@ define service { template = has_perfdata and "check_mk_perf," or "" extraconf = extra_service_conf_of(hostname, description) + command = "check_mk_active-%s!%s" % (acttype, args) outfile.write(""" define service { use\t\t\t\t%scheck_mk_default host_name\t\t\t%s service_description\t\t%s - check_command\t\t\tcheck_mk_active-%s!%s + check_command\t\t\t%s active_checks_enabled\t\t1 %s} -""" % (template, hostname, description, acttype, args, extraconf)) +""" % (template, hostname, description, simulate_command(command), extraconf)) # Legacy checks via custom_checks @@ -1876,15 +1877,16 @@ define service { template = has_perfdata and "check_mk_perf," or "" extraconf = extra_service_conf_of(hostname, description) + command = "%s!%s" % (command_name, command_line) outfile.write(""" define service { use\t\t\t\t%scheck_mk_default host_name\t\t\t%s service_description\t\t%s - check_command\t\t\t%s!%s + check_command\t\t\t%s active_checks_enabled\t\t%d %s} -""" % (template, hostname, description, command_name, command_line, +""" % (template, hostname, description, simulate_command(command), command_line and 1 or 0, extraconf)) @@ -1899,6 +1901,12 @@ define service { """ % (pingonly_template, check_icmp_arguments(hostname), extra_service_conf_of(hostname, "PING"), hostname)) +def simulate_command(command): + if simulation_mode: + custom_commands_to_define.add("check-mk-simulation") + return "check-mk-simulation!echo 'Simulation mode - cannot execute real check'" + else: + return command def create_nagios_config_hostgroups(outfile): if define_hostgroups:

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: 1c247c239237424846e16f5092f587f4184bb3fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c247c23923742… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 15:44:54 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: New logical datatable for aggregations that have the same name as a host

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 212f754744d8f78b1aef9813eba11225afda7539 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=212f754744d8f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 15:44:51 2012 +0200 New logical datatable for aggregations that have the same name as a host --- ChangeLog | 3 ++ web/htdocs/bi.css | 2 +- web/htdocs/bi.py | 56 +++++++++++++++++++++------------- web/plugins/views/bi.py | 13 +++++++- web/plugins/views/builtin.py | 68 +++++++++++++++++++++++++++++++++++++++++- 5 files changed, 118 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=212f754744…

12 years, 3 months

← Newer
1
2
3
4
5
6
7
...
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