Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64357 discussions

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

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e32285dbf2f6d9607d446bfabf5bc33614843e18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e32285dbf2f6d9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 26 14:28:46 2012 +0200 Add new bug entry --- .bugs/714 | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/.bugs/714 b/.bugs/714 new file mode 100644 index 0000000..8e5adcf --- /dev/null +++ b/.bugs/714 @@ -0,0 +1,40 @@ +Title: PostgreSQL check breaks on version 9 output +Component: checks +State: open +Date: 2012-06-26 14:14:46 +Targetversion: 1.2.0 +Class: bug + +Currently we do not support output from version 9 PostgreSQL. +They send one more data field and our agent sends with " " as separator +Fix should detect output format and then also handle postgresql 9 + +>> On 06/15/2012 04:41 PM,alex(a)rar.gi <mailto:alex@rar.gi> wrote: +>> > File "/var/lib/check_mk/precompiled/XXXX", line 901, in +>> > get_bytes_human_readable +>> > +>> ^@|^L^@^Wf^B^@Sn^A^@^Ad^K^@d^L^@|^L^@^Wf^B^@Sq^G^@^Aq^G^@Wd^P^@S(^Q^@^@^@NR^D^B^@^@s^G^@^@^@commit=i^@^@^@^@s&^@^@^@OK +>> +>> > - mount options exactly as e +>> > xpecteds^K^@^@^@missing: %ss +>> > TypeError: unsupported operand type(s) for /: 'str' and 'float' +>> + + + + +Fix suggested by user: + +> Sorry that should be +> +> echo 'select datid, datname, numbackends, xact_commit, xact_rollback, +> blks_read, blks_hit, tup_returned, tup_fetched, tup_inserted, +> tup_updated, tup_deleted, conflicts, 'stats_reset::timestamp::date', +> pg_database_size(datname) "datsize" from pg_stat_database;' \ +> | su - postgres -c "psql -A -F' '" | sed '$d' +> + + +Methinks (flo) that we should + - not fetch the stats_reset timestamp at all since we dont need it + - not use -F' ' but -F'somethingelse'

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: 543be7386332f5741411d868d03aa755480b76d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=543be7386332f5… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jun 26 14:29:04 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: ORACLE agent: fix handling of EXCLUDE,

by git＠mathias-kettner.de

new variable ONLY_SIDS 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: 6a161c931103de630e676c9212c0332ee0708136 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a161c931103de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 12:18:47 2012 +0200 ORACLE agent: fix handling of EXCLUDE, new variable ONLY_SIDS --- ChangeLog | 2 ++ agents/plugins/mk_oracle | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60231ba..ef0789f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ is running. * oracle_version: new check outputting the version of an ORACLE database - and using uncached direct SQL output. + * ORACLE agent: fix handling of EXCLUDE, new variable ONLY_SIDS + for explicitely listing SIDs to monitor Multisite: * Show number of rows and number of selected rows in header line diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 2cca71e..b3b249d 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -52,7 +52,12 @@ then . $MK_CONFDIR/mk_oracle.cfg fi -# It is possible to filter SIDS totally. Just add the following to +# You can specify a list of SIDs to monitor. Those databases will +# only be handled, if they are found running, though! +# +# ONLY_SIDS="XE HIRN SEPP" +# +# It is possible to filter SIDS negatively. Just add the following to # the mk_oracle.cfg file: # # EXCLUDE_<sid>="ALL" @@ -66,7 +71,7 @@ fi # For example skip oracle_sessions and oracle_logswitches checks # for the instance "mysid". # -# EXCLUDE_mysid="oracle_sessions oracle_logswitches" +# EXCLUDE_mysid="sessions logswitches" # # # This check uses a cache file to prevent problems with long running @@ -88,6 +93,18 @@ function sqlplus () for SID in $SIDS; do + # Check if SID is listed in ONLY_SIDS if this is used + if [ "$ONLY_SIDS" ] ; then + SKIP=yes + for S in $ONLY_SIDS ; do + if [ "$S" = "$SID" ] ; then + SKIP= + break + fi + done + if [ "$SKIP" ] ; then continue ; fi + fi + EXCLUDE=EXCLUDE_$SID EXCLUDE=${!EXCLUDE} # SID filtered totally? @@ -96,7 +113,7 @@ for SID in $SIDS; do fi # Do Version-Check (use as a general login check) without caching - if [ "$EXCLUDE" = "${EXCLUDE/oracle_version/}" ]; then + if [ "$EXCLUDE" = "${EXCLUDE/version/}" ]; then echo '<<<oracle_version>>>' echo "select banner from v\$version where banner like 'Oracle%';" | sqlplus "$SID" fi @@ -139,17 +156,17 @@ for SID in $SIDS; do { # Only execute checks when not filtered - if [ "$EXCLUDE" = "${EXCLUDE/oracle_sessions/}" ]; then + if [ '$EXCLUDE' = '${EXCLUDE/sessions/}' ]; then echo '<<<oracle_sessions>>>' echo \"select count(1) from v\\\$session where status = 'ACTIVE';\" | sqlplus \"$SID\" fi - if [ "$EXCLUDE" = "${EXCLUDE/oracle_logswitches/}" ]; then + if [ '$EXCLUDE' = '${EXCLUDE/logswitches/}' ]; then echo '<<<oracle_logswitches>>>' echo \"select count(1) from v\\\$loghist where first_time > sysdate - 1/24;\" | sqlplus \"$SID\" fi - if [ "$EXCLUDE" = "${EXCLUDE/oracle_tablespaces/}" ]; then + if [ '$EXCLUDE' = '${EXCLUDE/tablespaces/}' ]; then echo '<<<oracle_tablespaces>>>' sqlplus "$SID" <<EOF | sed 's/READ ONLY/READONLY/g' select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE,

12 years, 3 months

Check_MK Git: check_mk: ORACLE: new version check, improve error handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0303480046ded1d372ee26c39e92a36dd457be32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0303480046ded1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 11:39:05 2012 +0200 ORACLE: new version check, improve error handling --- ChangeLog | 5 ++++ agents/plugins/mk_oracle | 58 ++++++++++++++++++++++++++++++++++---------- checkman/oracle_version | 19 ++++++++++++++ checks/oracle.include | 9 +++++++ checks/oracle_logswitches | 2 +- checks/oracle_sessions | 2 +- checks/oracle_version | 49 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 129 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0303480046…

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: 9c7e8b823b386f0062333f99a0bfcc8424ef4ed6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c7e8b823b386f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 26 11:39:07 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits