Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: usewalk_hosts: set ip to 127.0.0.1 only if SNMP

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 918532444ca2268e58bbe4e874fa091a4410dd58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918532444ca226… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:42:12 2011 +0100 usewalk_hosts: set ip to 127.0.0.1 only if SNMP --- ChangeLog | 6 ++++++ modules/check_mk_base.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bfaee1..307a5bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ 1.1.10b1: + Core, Setup, etc.: + * FIX: do not assume 127.0.0.1 as IP address for usewalk_hosts if + they are not SNMP hosts. + Checks & Agents: * FIX: drbd now handles output of older version without an ep field + + 1.1.9i9: Core, Setup, etc.: * FIX: check_mk_templates.cfg: add missing check_period for hosts diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4c80f54..85ed85f 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -546,7 +546,8 @@ def lookup_ipaddress(hostname): if fake_dns: return fake_dns - elif simulation_mode or opt_use_snmp_walk or is_usewalk_host(hostname): + elif simulation_mode or opt_use_snmp_walk or \ + (is_usewalk_host(hostname) and is_snmp_host(hostname)): return "127.0.0.1" elif hostname in g_dns_cache: return g_dns_cache[hostname]

13 years, 6 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 mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 13cbee13e719861cf99bf9a8de6b57b7c7b4e83e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13cbee13e71986… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:32:53 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: akcp_sensor_temp: handle Fahrenheit and missing degreeraw

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d8641b4635b25362bb1d9e13338086715db5158 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d8641b4635b25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:32:21 2011 +0100 akcp_sensor_temp: handle Fahrenheit and missing degreeraw --- checks/akcp_sensor_temp | 22 ++++++++++++++-------- checks/decru_temps | 5 +---- modules/check_mk_base.py | 5 +++++ 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/checks/akcp_sensor_temp b/checks/akcp_sensor_temp index bc404b0..e9c3227 100644 --- a/checks/akcp_sensor_temp +++ b/checks/akcp_sensor_temp @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. # +------------------------------------------------------------------+ -# | This file has been contributed by: | +# | The initial version of this file has been contributed by: | # | | # | Michael Nieporte <Michael.Nieporte(a)uk-essen.de> | # +------------------------------------------------------------------+ @@ -37,23 +37,29 @@ def inventory_akcp_sensor_temp(checkname, info): inventory = [] for desc, degree, status, online, degreetype, degreeraw in info: if online == "1": - inventory.append( (desc, "", "akcp_sensor_temp_defaultlevels") ) + inventory.append( (desc, "akcp_sensor_temp_defaultlevels") ) return inventory def check_akcp_sensor_temp(item, params, info): for desc, degree, status, online, degreetype, degreeraw in info: - if degreetype == "0": - type = "F" - else: - type = "C" if desc == item: + if degreetype == "0": + type = "F" + else: + type = "C" warn, crit = params - inttemp = saveint(degreeraw) - temp = inttemp / 10.0 + if degreeraw != "": + temp = saveint(degreeraw) / 10.0 + else: + temp = float(degree) if status == "7": return (3, "UNKNOWN - Sensor Error") else: if online == "1": + # break temp down to celsius if it had been defined as Fahrenheit. + if type == "F": + temp = to_celsius(temp) + type = "C" infotext = "%.1f " % temp + type + " (warn/crit at %.1f/%.1f " % (warn, crit) + type + ")" perfdata = [ ( "temperature", temp, warn, crit ) ] if temp >= crit: diff --git a/checks/decru_temps b/checks/decru_temps index b9162ab..5cf9863 100644 --- a/checks/decru_temps +++ b/checks/decru_temps @@ -24,11 +24,8 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def to_celsius(f): - return int(round(float(f) - 32.0 ) * 5.0 / 9.0) - def inventory_decru_temps(checkname, info): - return [ (l[0], l[1] + " Fahrenheit", (to_celsius(int(l[1])) + 4.0, to_celsius(int(l[1])) + 8.0 ) ) for l in info ] + return [ (l[0], (int(to_celsius(int(l[1]))) + 4.0, int(to_celsius(int(l[1]))) + 8.0 ) ) for l in info ] def check_decru_temps(item, params, info): for temp in info: diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7bf3e35..4c80f54 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1035,3 +1035,8 @@ def get_nic_speed_human_readable(speed): pass return speed +# Convert Fahrenheit to Celsius +def to_celsius(f): + return round(float(f) - 32.0) * 5.0 / 9.0 + +

13 years, 6 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: 955dd01a85a28efafa072b82834544c26e602cb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=955dd01a85a28e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:08:21 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d295f6f3b7e2c111d5ac1da7c69402a471f2dbf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d295f6f3b7e2c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 25 17:08:19 2011 +0100 Updated bug entries --- .bugs/128 | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/.bugs/128 b/.bugs/128 index c955f96..e093fa5 100644 --- a/.bugs/128 +++ b/.bugs/128 @@ -6,4 +6,6 @@ Cost: 4 Date: 2011-02-10 09:45:24 Class: bug -After changing the trend_range to a larger time the check reports a peak value which is wrong. It might be needed to detect such a change and reset the values. +After changing the trend_range to a larger time the check reports a peak +value which is wrong. It might be needed to detect such a change and reset +the values.

13 years, 6 months

Check_MK Git: check_mk: Minor code formating

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1fa0c7897ca022f2d24b37379807d396421d28b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fa0c7897ca022… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:57:37 2011 +0100 Minor code formating --- web/htdocs/js/hover.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/hover.js b/web/htdocs/js/hover.js index 609619d..6ae87ce 100644 --- a/web/htdocs/js/hover.js +++ b/web/htdocs/js/hover.js @@ -78,8 +78,8 @@ function hoverShow(x, y, code) { _hoverMenu = document.createElement('div'); _hoverMenu.style.position = 'absolute'; _hoverMenu.style.width = 'auto'; - document.body.appendChild(_hoverMenu); - } + document.body.appendChild(_hoverMenu); + } _hoverMenu.innerHTML = code; // Change cursor to "hand" when displaying hover menu

13 years, 6 months

Check_MK Git: check_mk: Fixed growth in df trend graphs

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c47068c656fa2e4b1ca5cfcdfe95bd1f88c0bcec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c47068c656fa2e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:32:27 2011 +0100 Fixed growth in df trend graphs --- pnp-rraconf/check_mk-df.rra.cfg | 2 +- pnp-templates/check_mk-df.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pnp-rraconf/check_mk-df.rra.cfg b/pnp-rraconf/check_mk-df.rra.cfg index f701388..74019b8 120000 --- a/pnp-rraconf/check_mk-df.rra.cfg +++ b/pnp-rraconf/check_mk-df.rra.cfg @@ -1 +1 @@ -avg-max.rra.cfg \ No newline at end of file +avg-max-min.rra.cfg \ No newline at end of file diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 4c44a97..c28e4ac 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -66,10 +66,11 @@ if (isset($DS[2])) { $range = sprintf("%.1fh", $hours); $opt[2] = "--vertical-label '+/- MB / $range' -l -1 -u 1 --title '$hostname: Trend for $fstitle' "; - $def[2] = "DEF:growth=$RRDFILE[2]:$DS[2]:AVERAGE "; + $def[2] = "DEF:growth_max=$RRDFILE[2]:$DS[2]:MAX "; + $def[2] .= "DEF:growth_min=$RRDFILE[2]:$DS[2]:MIN "; $def[2] .= "DEF:trend=$RRDFILE[3]:$DS[3]:AVERAGE "; - $def[2] .= "CDEF:growth_pos=growth,0,MAX "; - $def[2] .= "CDEF:growth_neg=growth,0,MIN "; + $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; + $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; $def[2] .= "HRULE:0#c0c0c0 "; $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" ";

13 years, 6 months

Check_MK Git: check_mk: Perfometer shows no bandwidth given when there is no bandwidth

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e903baa64a4e0e99ee27eb04cbaa78c953934273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e903baa64a4e0e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:16:17 2011 +0100 Perfometer shows no bandwidth given when there is no bandwidth --- web/plugins/perfometer/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index c14877c..75dc7f2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -198,7 +198,7 @@ def performeter_check_mk_if(row, check_command, perf_data): if bw > 0.0: rrate = bytes / bw else: - rrate = 0 + return 'No bandwidth given', '<table></table>' drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate

13 years, 6 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: a5d6a7f4e15eeaed626e0cb713c512a7bdc74282 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5d6a7f4e15eea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:02:24 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: Catching exceptions caused by unset bandwidth in interface perfometer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bbc542fa8c237a8558346d62457bee12ddbc143c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbc542fa8c237a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 25 16:01:55 2011 +0100 Catching exceptions caused by unset bandwidth in interface perfometer --- ChangeLog | 1 + web/htdocs/lib.py | 6 ++++++ web/plugins/perfometer/check_mk.py | 9 ++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38a100e..6bfaee1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * FIX: PNP timerange painter option field takes selected value as default now * FIX: Fixed perfometer styling in single dataset layouts * FIX: Tooltips work in group headers now + * FIX: Catching exceptions caused by unset bandwidth in interface perfometer WATO: * FIX: fix problem with vanishing services on Windows. Affected were services diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index e50e883..a085a2d 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -87,3 +87,9 @@ def create_user_file(path, mode): def write_settings_file(path, content): create_user_file(path, "w").write(pprint.pformat(content) + "\n") + +def savefloat(f): + try: + return float(f) + except: + return 0.0 diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 28deb9c..ee5b8a2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -193,9 +193,12 @@ def performeter_check_mk_if(row, check_command, perf_data): for name, perf, color in [ ("in", perf_data[0], "#0e6"), ("out", perf_data[5], "#2af") ]: - bytes = float(perf[1]) - bw = float(perf[6]) - rrate = bytes / bw + bytes = savefloat(perf[1]) + bw = savefloat(perf[6]) + if bw > 0.0: + rrate = bytes / bw + else: + rrate = 0 drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits