Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64149 discussions

Check_MK Git: check_mk: FIX: fix typo in permissions page

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9bc9c6f3d64c2af8dec67ed4e946a5aec654f6cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bc9c6f3d64c2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 12:32:01 2011 +0200 FIX: fix typo in permissions page --- web/htdocs/permissions.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index cfd25cd..1c5bb28 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -69,7 +69,7 @@ def page_edit_permissions(h): config.save_permissions(permissions) config.load_permissions() - html.message("Permissions have beend saved.") + html.message("Permissions have been saved.") html.begin_form("permissions")

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 62bb065dee91b3b030b5286dc75b6e3f5087d60a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=62bb065dee91b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 12:25:39 2011 +0200 Updated bug entries --- .bugs/223 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/223 b/.bugs/223 new file mode 100644 index 0000000..c77bb2c --- /dev/null +++ b/.bugs/223 @@ -0,0 +1,12 @@ +Title: Service search and PNP search should be linked +Component: multisite +Benefit: 3 +State: open +Cost: 2 +Date: 2011-03-31 12:24:42 +Class: feature + +When you make service service and find some services, +then you should be able to press a button and go to +the view with the PNP search - that way viewing the +graphs of the found services.

13 years, 5 months

Check_MK Git: check_mk: lnx_if: new check for linuc nics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36f0377032303e29e9c1704482b71062f292842f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f0377032303e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 20:37:41 2011 +0200 lnx_if: new check for linuc nics --- ChangeLog | 6 +- agents/check_mk_agent.linux | 12 +++ checkman/if | 2 +- checkman/lnx_if | 142 +++++++++++++++++++++++++++++++++++ checkman/netctr.combined | 4 + checkman/netif.link | 12 +++ checkman/netif.params | 13 +++ checks/lnx_if | 142 +++++++++++++++++++++++++++++++++++ checks/netctr | 4 + checks/netif | 3 + pnp-rraconf/check_mk-lnx_if.rra.cfg | 1 + pnp-templates/check_mk-if.php | 2 +- pnp-templates/check_mk-lnx_if.php | 1 + web/plugins/perfometer/check_mk.py | 3 +- 14 files changed, 342 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=36f0377032…

13 years, 5 months

Check_MK Git: check_mk: if/if64: also output performance data if operstate not as expected

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24823706dd48a40141882264e467427f68c37cbb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24823706dd48a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:16:19 2011 +0200 if/if64: also output performance data if operstate not as expected --- ChangeLog | 1 + checks/if.include | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd3cd13..58d78af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ a reboot is needed after updates have been installed. * lnx_if: new check for Linux NICs compatible with if/if64 replacing netif.* and netctr. + * if/if64: also output performance data if operstate not as expected 1.1.10: diff --git a/checks/if.include b/checks/if.include index 358e650..01429f5 100644 --- a/checks/if.include +++ b/checks/if.include @@ -119,8 +119,10 @@ def check_if_common(item, params, info): elif len(params) == 6: err_warn, err_crit, targetspeed, bw_warn, bw_crit, allowed_operstates = params - for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, inucast, inmcast, inbcast, ifInDiscards, \ - ifInErrors, ifOutOctets, outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, ifOutQLen, ifAlias in info: + for ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus, ifInOctets, \ + inucast, inmcast, inbcast, ifInDiscards, ifInErrors, ifOutOctets, \ + outucast, outmcast, outbcast, ifOutDiscards, ifOutErrors, \ + ifOutQLen, ifAlias in info: ifDescr = cleanup_if_strings(ifDescr) ifAlias = cleanup_if_strings(ifAlias) @@ -128,7 +130,8 @@ def check_if_common(item, params, info): # Display port number or alias in infotext if that is not part # of the service description anyway - if item == ifIndex and (item == ifAlias or ifAlias == '') and (item == ifDescr or ifDescr == ''): # description trivial + if item == ifIndex and (item == ifAlias or ifAlias == '') \ + and (item == ifDescr or ifDescr == ''): # description trivial infotext = "" elif item != ifAlias and ifAlias != '': # alias useful infotext = "[%s] " % ifAlias @@ -137,21 +140,24 @@ def check_if_common(item, params, info): else: infotext = "[%s] " % ifIndex + state = 0 + operstatus = if_statename(str(ifOperStatus)) if targetstate and \ (ifOperStatus != targetstate - and not (type(targetstate) == list and ifOperStatus in targetstate)): - return (2, "CRIT - %soperstatus: %s (CRIT)" % (infotext, operstatus)) - infotext += "(%s) " % operstatus + and not (type(targetstate) == list and ifOperStatus in targetstate)): + state = 2 + infotext += "(%s!!) " % operstatus + else: + infotext += "(%s) " % operstatus - state = 0 # Check speed speed = saveint(ifSpeed) infotext += get_nic_speed_human_readable(speed) if not targetspeed is None and speed != targetspeed: infotext += " (wrong speed! expected: %s)" % get_nic_speed_human_readable(targetspeed) - state = 1 + state = max(state, 1) # convert percentages to absolute values and vice verca - if possible if speed:

13 years, 5 months

Check_MK Git: check_mk: if/if64: add Perf-O-Meter in case of unknown bandwidth

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1701043f44134d0edda9dab0c102e8a5ec256e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1701043f44134… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 21:02:00 2011 +0200 if/if64: add Perf-O-Meter in case of unknown bandwidth --- .bugs/36 | 10 +++++++--- web/plugins/perfometer/check_mk.py | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.bugs/36 b/.bugs/36 index b5bc62c..c37bba2 100644 --- a/.bugs/36 +++ b/.bugs/36 @@ -1,13 +1,17 @@ Title: Linux-NICs: Check kompatibel zu if/if64 machen Component: core +State: done +Class: cleanup +Date: 2010-12-21 20:52:24 Benefit: 2 -State: open Cost: 2 -Date: 2010-12-21 20:52:24 -Class: cleanup +Fun: 0 Man könnte das doch evtl. kompatibel mit if machen. Und dann evtl auch die Ausgabe noch kompatibel. Man monitort dann nur die verwendeten NICs. Und man bau eine neue Sektion <<<nics>>>, welche die Ausgaben von ethtool und /proc/net/dev kombiniert, damit man einen Check bauen kann, der wirklich 100% kompatibel zu if ist (dann klappen auch die Network Wethermaps) + +2011-03-30 20:39:22: changed state open -> done +New check named lnx_if diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index da05504..c8bb4e2 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -189,8 +189,8 @@ perfometers["check_mk-ipmi_sensors"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-nvidia.temp"] = perfometer_check_mk_ipmi_sensors def performeter_check_mk_if(row, check_command, perf_data): - # return str(perf_data), "" txt = [] + have_bw = True h = '<table><tr>' for name, perf, color in [ ("in", perf_data[0], "#0e6"), @@ -200,7 +200,8 @@ def performeter_check_mk_if(row, check_command, perf_data): if bw > 0.0: rrate = bytes / bw else: - return 'unknown bandwidth', '<table></table>' + have_bw = False + break drate = max(0.02, rrate ** 0.5 ** 0.5) rperc = 100 * rrate dperc = 100 * drate @@ -211,8 +212,18 @@ def performeter_check_mk_if(row, check_command, perf_data): else: h += a + b # color right, white left txt.append("%.1f%%" % rperc) - h += '</tr></table>' - return "   ".join(txt), h + if have_bw: + h += '</tr></table>' + return "   ".join(txt), h + + # make logarithmic perf-o-meter + in_bytes = savefloat(perf_data[0][1]) + out_bytes = savefloat(perf_data[5][1]) + MB = 1000000.0 + text = "%.1fM/s %.1fM/s" % (in_bytes/MB, out_bytes/MB) + + return text, perfometer_logarithmic_dual( + in_bytes, "#0e6", out_bytes, "#2af", 1000000, 10) perfometers["check_mk-if"] = performeter_check_mk_if perfometers["check_mk-if64"] = performeter_check_mk_if

13 years, 5 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: 10c3ae15e0ad120a14c90c1f01b8a17365ec3320 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10c3ae15e0ad12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:25:47 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 5 months

Check_MK Git: check_mk: if/if64: also show perf-o-meter if speed is unknown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4fedf1ce91192ecdfa0473589e8740c35a91692 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4fedf1ce91192… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 31 09:25:43 2011 +0200 if/if64: also show perf-o-meter if speed is unknown --- ChangeLog | 7 ++++--- web/plugins/perfometer/check_mk.py | 5 +++-- web/plugins/views/perfometer.py | 12 ++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d78af..6b2c7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,12 +36,13 @@ * FIX: mk_logwatch: improve implementation in order to save RAM * FIX: mk_oracle: Updated tablespace query to use 'used blocks' instead of 'user blocks' * FIX: bluecoat_sensors: Using scale parameter provided by the host for reported values + * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions + * FIX: decru_*: added snmp scan functions * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * printer_supply: Skipping inventory of supplies which have current value and maxlevel both set to -2. * cisco_locif: The check has been removed. Please switch to if/if64 - * if/if64: scan function now also detects devices where the first port has not the index 1 * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning with index 1 @@ -50,8 +51,6 @@ * printer_alerts: Added new check for monitoring alert states reported by printers using the PRINTER-MIB * diskstat: rewritten check: now show different devices, r+w in one check - * FIX: fjdarye60_devencs, fjdarye60_disks.summary: added snmp scan functions - * FIX: decru_*: added snmp scan functions * canon_pages: Added new check for monitoring processed pages on canon printer/multi-function devices * strem1_sensors: added check to monitor sensors attached to Sensatorinc EM1 devices @@ -61,6 +60,8 @@ * lnx_if: new check for Linux NICs compatible with if/if64 replacing netif.* and netctr. * if/if64: also output performance data if operstate not as expected + * if/if64: scan function now also detects devices where the first port + * if/if64: also show perf-o-meter if speed is unknown 1.1.10: diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index c8bb4e2..454170e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -220,10 +220,11 @@ def performeter_check_mk_if(row, check_command, perf_data): in_bytes = savefloat(perf_data[0][1]) out_bytes = savefloat(perf_data[5][1]) MB = 1000000.0 - text = "%.1fM/s %.1fM/s" % (in_bytes/MB, out_bytes/MB) + text = "%s/s   %s/s" % ( + number_human_readable(in_bytes), number_human_readable(out_bytes)) return text, perfometer_logarithmic_dual( - in_bytes, "#0e6", out_bytes, "#2af", 1000000, 10) + in_bytes, "#0e6", out_bytes, "#2af", 1000000, 5) perfometers["check_mk-if"] = performeter_check_mk_if perfometers["check_mk-if64"] = performeter_check_mk_if diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 2fdac40..f05040f 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -89,6 +89,18 @@ def perfometer_logarithmic_dual(value_left, color_left, value_right, color_right return result + '</tr></table>' +def number_human_readable(n): + n = float(n) + if abs(n) > 1024 * 1024 * 1024: + return "%.1fG" % (n / (1024.0 * 1024 * 1024)) + elif abs(n) > 1024 * 1024: + return "%.1fM" % (n / (1024.0 * 1024)) + elif abs(n) > 1024: + return "%.fK" % (n / 1024.0) + else: + return "%.1fB" % n + + perfometer_plugins_dir = defaults.web_dir + "/plugins/perfometer" for fn in os.listdir(perfometer_plugins_dir): if fn.endswith(".py"):

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7bd67f7882fd6611205f6bc60aa7a1762c1828a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7bd67f7882fd6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 28 08:36:38 2011 +0200 Updated bug entries --- .bugs/180 | 8 +++++++- .bugs/184 | 4 ++-- .bugs/config | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.bugs/180 b/.bugs/180 index 784e9ac..5999b5c 100644 --- a/.bugs/180 +++ b/.bugs/180 @@ -1,7 +1,7 @@ Title: PING service of ping only hosts shown no 'perfdata' icon in multisite Component: core Benefit: 4 -State: open +State: wontfix Cost: 2 Date: 2011-03-16 11:29:45 Class: bug @@ -18,3 +18,9 @@ Plus the process_perfdata 0 line need to be removed. In fact the data is gathered in the host check but the missing link seems to confuse the users since the check generates performance data. + +Resolution: wontfix. This is per design. The PING-services on PING-only +hosts does not process performance data since this is already done +in the host check itself. It would be a bad idea to store this data +twice. Also on all other hosts the PING data is at the host check. +So putting it here on the PING would not be consistent. diff --git a/.bugs/184 b/.bugs/184 index 8336635..f2a25db 100644 --- a/.bugs/184 +++ b/.bugs/184 @@ -1,8 +1,8 @@ Title: if/if64 problem when using description as item when having duplicate descr Component: checks -Benefit: 6 +Benefit: 2 State: open -Cost: 3 +Cost: 2 Date: 2011-03-25 09:39:07 Class: bug diff --git a/.bugs/config b/.bugs/config index 1728f54..bc9ba69 100644 --- a/.bugs/config +++ b/.bugs/config @@ -1,7 +1,8 @@ states = { - "open" : tty_blue, - "done" : tty_green, - "closed" : tty_normal, + "open" : tty_blue, + "done" : tty_green, + "closed" : tty_normal, + "wontfix" : tty_magenta, } components = [

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7beb5ce72b8c00afc6145a0fd8a477a16a7b2f53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7beb5ce72b8c00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 29 17:47:33 2011 +0200 Updated bug entries --- .bugs/23 | 10 +++++++--- .bugs/46 | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.bugs/23 b/.bugs/23 index a425a8d..5925edb 100644 --- a/.bugs/23 +++ b/.bugs/23 @@ -1,10 +1,14 @@ Title: Gemeinsamen Code der df-Checks auslagern in df.include Component: checks +State: closed +Class: cleanup +Date: 2010-12-21 16:27:39 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-21 16:27:39 -Class: cleanup +Fun: 0 z.B. das mit der Magic-Number. Der df-spezifische Code kann dann aus check_mk_base.py ganz raus. + +2011-03-28 08:37:54: changed state open -> closed +This has already been done in 1.1.10. diff --git a/.bugs/46 b/.bugs/46 index dc7a2c3..49cd147 100644 --- a/.bugs/46 +++ b/.bugs/46 @@ -15,3 +15,7 @@ verhindert, dass in den RRDs nach einem Reboot utopische Werte stehen (z.B. für die Kernel counter). (3) Da in den Performancedaten bereits eine Rate steht, können auch Tools wie NagVis dafür eine Visualisierung machen. + +Kernel (Context switches) und diskstat ist bereits umgestellt. +Unklar, was noch fehlt. Aktuell fällt mir z.B. die Linux-NICS +ein. Winperf auch?

13 years, 5 months

Check_MK Git: check_mk: Agent simulator: also work in simulation mode

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ffe92bd943a13fdb18af290a841844e0231a6840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffe92bd943a13f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 30 17:37:48 2011 +0200 Agent simulator: also work in simulation mode --- modules/check_mk_base.py | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9667140..31c0aba 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -358,9 +358,6 @@ def get_realhost_info(hostname, ipaddress, checkname, max_cache_age): elif len(output) < 16: raise MKAgentError("Too short output from agent: '%s'" % output) - if agent_simulator: - output = agent_simulator_process(output) - lines = [ l.strip() for l in output.split('\n') ] info = parse_info(lines) store_cached_hostinfo(hostname, info) @@ -414,25 +411,26 @@ def write_cache_file(relpath, output): # In that case it will be looked up if needed. Also caching will # be handled here def get_agent_info(hostname, ipaddress, max_cache_age): - result = read_cache_file(hostname, max_cache_age) - if result: - return result - - # Try to contact every host only once - if hostname in g_broken_agent_hosts: - raise MKAgentError("") + output = read_cache_file(hostname, max_cache_age) + if not output: + # Try to contact every host only once + if hostname in g_broken_agent_hosts: + raise MKAgentError("") + + # If the host ist listed in datasource_programs the data from + # that host is retrieved by calling an external program (such + # as ssh or rsy) instead of a TCP connect. + commandline = get_datasource_program(hostname, ipaddress) + if commandline: + output = get_agent_info_program(commandline) + else: + output = get_agent_info_tcp(hostname, ipaddress) - # If the host ist listed in datasource_programs the data from - # that host is retrieved by calling an external program (such - # as ssh or rsy) instead of a TCP connect. - commandline = get_datasource_program(hostname, ipaddress) - if commandline: - output = get_agent_info_program(commandline) - else: - output = get_agent_info_tcp(hostname, ipaddress) + # Got new data? Write to cache file + write_cache_file(hostname, output) - # Got new data? Write to cache file - write_cache_file(hostname, output) + if agent_simulator: + output = agent_simulator_process(output) return output

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits