Checkmk git commits February 2011

checkmk-commits@lists.checkmk.com

3 participants
186 discussions

Check_MK Git: check_mk: FIX: inventory check on mixed hosts ignored TCP checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3561c34b9abac78f17bd96c896f7f6bca8cdd17f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3561c34b9abac7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 17 11:36:47 2011 +0100 FIX: inventory check on mixed hosts ignored TCP checks --- ChangeLog | 1 + modules/check_mk.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9433df..8afea28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ (needed for Shinken) * FIX: read *.include files before checks. Fixes df_netapp not finding its check function + * FIX: inventory checks on SNMP+TCP hosts ignored new TCP checks Checks & Agents: * ucd_cpu_load: new check for CPU load via UCD SNMP agent diff --git a/modules/check_mk.py b/modules/check_mk.py index ff165dd..a98a40d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1798,15 +1798,19 @@ def check_inventory(hostname): newchecks = [] newitems = [] total_count = 0 - only_snmp = is_snmp_host(hostname) + is_snmp = is_snmp_host(hostname) + is_tcp = is_tcp_host(hostname) check_table = get_check_table(hostname) hosts_checktypes = set([ ct for (ct, item), params in check_table.items() ]) try: for ct in inventorable_checktypes("all"): - if only_snmp and not check_uses_snmp(ct): - continue # No TCP checks on SNMP-only hosts + if check_uses_snmp(ct) and not is_snmp: + continue # Skip SNMP checks on non-SNMP hosts elif check_uses_snmp(ct) and ct not in hosts_checktypes: - continue # Do not look for new SNMP services (why?) + continue # Do not look for new SNMP services (maybe change in future) + elif not check_uses_snmp(ct) and not is_tcp: + continue # Skip TCP checks on non-TCP hosts + new = make_inventory(ct, [hostname], True) newitems += new count = len(new)

13 years, 4 months

Check_MK Git: check_mk: Fix hr_fs (was broken due to df.include)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3bc6fa223f0b9e0ea0b4ec5c12a661f2bcd643e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc6fa223f0b9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 17 11:07:42 2011 +0100 Fix hr_fs (was broken due to df.include) --- checkman/hr_fs | 8 ++++++++ checks/hr_fs | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/checkman/hr_fs b/checkman/hr_fs index 4396e10..dc0d54a 100644 --- a/checkman/hr_fs +++ b/checkman/hr_fs @@ -11,6 +11,14 @@ description: For configuration parameters and examples please refer to the man page of {df}. + Please note, that due to the fact that Linux usually reserves 5% of + the filesystem for root, the amount of used space output by this + check and the native {df} check of Linux differs by up to 5%. The + {df} check accounts the reserved space as used, as this is a safer + assumption. Whereas the SNMP agent accounts it as free. There is no + way to get the information about the reserved space via SNMP, so + there is no way to fix this, unfortunately. + item: The description of the filesystem as in {hrStorageDescr}. For Linux SNMP agents this is the mount point. diff --git a/checks/hr_fs b/checks/hr_fs index 5f11d47..86601aa 100644 --- a/checks/hr_fs +++ b/checks/hr_fs @@ -47,7 +47,7 @@ def check_hr_fs(item, params, info): used_mb = used / 1048576.0 avail_mb = size_mb - used_mb - return df_check_filesystem(g_hostname, item, size_mb, avail_mb, params) + return df_check_filesystem(g_hostname, item, size_mb, avail_mb, params) return (3, "UNKNOWN - Filesystem not found")

13 years, 4 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: 6c199738d33bee6ca33fc5bc1abc655082e7aca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c199738d33bee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 17 11:07:47 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 4 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8115420edb8dabe25117fb6b6f6d439c02494a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8115420edb8da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 16 17:49:23 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: .bugs/132 ---

13 years, 4 months

Check_MK Git: check_mk: When trends are enabled but trend counters wrap or are initialized the regular df perfdata is suppressed now to prevent rrds with not enough rows

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 15e11ffcb534a065f807b261a0d79be2fe2f7d78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15e11ffcb534a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 16 10:05:34 2011 +0100 When trends are enabled but trend counters wrap or are initialized the regular df perfdata is suppressed now to prevent rrds with not enough rows --- .bugs/132 | 9 +++++++++ checks/df.include | 6 +++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/.bugs/132 b/.bugs/132 new file mode 100644 index 0000000..8073213 --- /dev/null +++ b/.bugs/132 @@ -0,0 +1,9 @@ +Title: logwatch_max_filesize is missing in 'config variables' doku +Component: doku +Benefit: 5 +State: open +Cost: 6 +Date: 2011-02-11 11:20:58 +Class: todo + +The parameter logwatch_max_filesize is not mentioned on the config variable page. diff --git a/checks/df.include b/checks/df.include index 5be7223..21a97d4 100644 --- a/checks/df.include +++ b/checks/df.include @@ -214,7 +214,11 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): except MKCounterWrapped: - pass # need more data for computing a trend + # need more data for computing a trend + + # In this case erase all perfdata to prevent an rrd file which has no space + # for the trend information + perfdata = [] if used_mb >= crit_mb:

13 years, 4 months

Check_MK Git: check_mk: Code cleanups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30e683b8d3d12c5c4599744ada7269475c3d5459 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30e683b8d3d12c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 16 17:50:15 2011 +0100 Code cleanups --- pnp-templates/check_mk-df.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 17326a7..afd8276 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -72,9 +72,9 @@ if (isset($DS[2])) { $def[2] .= "CDEF:growth_pos=growth,0,MAX "; $def[2] .= "CDEF:growth_neg=growth,0,MIN "; $def[2] .= "HRULE:0#c0c0c0 "; - $def[2] .= "AREA:growth_pos#3060f0:'Grow' "; - $def[2] .= "AREA:growth_neg#30f060:\"Shrink\" "; - $def[2] .= "LINE1:trend#000000:\"Trend \" "; + $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; + $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; + $def[2] .= "LINE1:trend#000000:\"Trend \" "; if ($WARN[3]) $def[2] .= "LINE1:$WARN[3]#ffff00:\"Warning at $WARN[3]MB/$range\" "; if ($CRIT[3])

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 88f5d2275b477ba0536a52623dcf37a30608cd44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88f5d2275b477b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 16 17:13:12 2011 +0100 Updated bug entries --- .bugs/145 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/145 b/.bugs/145 new file mode 100644 index 0000000..92c99cb --- /dev/null +++ b/.bugs/145 @@ -0,0 +1,10 @@ +Title: import files in conf.d/*.mk in sorted order +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-16 17:12:01 +Class: feature + +Simple do a sort() of the globbed files. That way users have a way +to force a certain order of execution. And write that into the documentation.

13 years, 4 months

Check_MK Git: check_mk: df: fix bugs in df.include

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd879269acc8607a2e5ea12bafcac953c813bda4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd879269acc860… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 16 16:24:28 2011 +0100 df: fix bugs in df.include --- checks/df.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/df.include b/checks/df.include index 5be7223..d364bad 100644 --- a/checks/df.include +++ b/checks/df.include @@ -69,7 +69,7 @@ def get_filesystem_levels(host, mountpoint, size_gb, params): if type(filesystem_default_levels) == dict: levels = filesystem_default_levels.copy() else: - levels = { "levels": filesystem_default_magic[:2] } + levels = { "levels": filesystem_default_levels[:2] } if len(filesystem_default_levels) == 2: levels["magic"] = None else: @@ -152,7 +152,7 @@ def df_check_filesystem(hostname, mountpoint, size_mb, avail_mb, params): MB = 1024 * 1024.0 - if levels["trend_range"]: + if levels.get("trend_range"): try: range = levels["trend_range"] # in hours range_sec = range * 3600.0

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: be644a0ccda5ac500fba8e1aa6204ef5bb094684 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be644a0ccda5ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 16 17:07:07 2011 +0100 Updated bug entries --- .bugs/144 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/144 b/.bugs/144 new file mode 100644 index 0000000..a603c03 --- /dev/null +++ b/.bugs/144 @@ -0,0 +1,10 @@ +Title: WATO services does not display manually configured checks +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-16 16:26:02 +Class: bug + +If you add checks with checks +=, then WATO should display +them, but does not. Problem seems to ly in check_mk --automation try-inventory.

13 years, 4 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 07f8ec2300b0f4079899e4b8cb090c074a03d6e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=07f8ec2300b0f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 16 15:42:30 2011 +0100 Updated bug entries --- .bugs/141 | 10 ++++++++++ .bugs/142 | 9 +++++++++ .bugs/143 | 11 +++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/.bugs/141 b/.bugs/141 new file mode 100644 index 0000000..a8a1169 --- /dev/null +++ b/.bugs/141 @@ -0,0 +1,10 @@ +Title: Action limit similar to query limit +Component: multisite +Benefit: 2 +State: open +Cost: 1 +Date: 2011-02-16 11:17:57 +Class: feature + +Similar to soft_query_limit could we implement a limit on +the maximum number of Nagios commands performed at once. diff --git a/.bugs/142 b/.bugs/142 new file mode 100644 index 0000000..af025d8 --- /dev/null +++ b/.bugs/142 @@ -0,0 +1,9 @@ +Title: Customlinks snapin does not persists folding any more +Component: multisite +Benefit: 2 +State: open +Cost: 1 +Date: 2011-02-16 11:49:44 +Class: bug + +Somehow this feature is broken. diff --git a/.bugs/143 b/.bugs/143 new file mode 100644 index 0000000..b6186ef --- /dev/null +++ b/.bugs/143 @@ -0,0 +1,11 @@ +Title: Hosttags: admin should be able to force selection +Component: wato +Benefit: 1 +State: open +Cost: 1 +Date: 2011-02-16 15:41:09 +Class: feature + +We could let the admin choose to force the user +to do a selection of a tag. That way he cannot +just save and use the defaults but must think first.

13 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2011