Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64140 discussions

Check_MK Git: check_mk: FIX: webservice: suppress livestatus errors in multi-site setups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c919e9b7fa190e45f24d894f9615110b2513eb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c919e9b7fa190… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 16:10:32 2011 +0200 FIX: webservice: suppress livestatus errors in multi-site setups --- ChangeLog | 1 + web/htdocs/views.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dbf430..b765fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * --debug now implies -v Multisite: + * FIX: webservice: suppress livestatus errors in multi-site setups * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 53458fd..27dbd14 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1189,8 +1189,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru play_alarm_sounds() # In multi site setups error messages of single sites do not block the - # output and raise now exception. We simply print error messages here: - if config.show_livestatus_errors: + # output and raise now exception. We simply print error messages here. + # In case of the web service we show errors only on single site installations. + if config.show_livestatus_errors and (html.output_format == "html" or not config.is_multisite()): for sitename, info in html.live.deadsites.items(): html.show_error("<b>%s - Livestatus error</b><br>%s" % (info["site"]["alias"], info["exception"]))

13 years, 5 months

Check_MK Git: check_mk: BI: new aggregation function "running_on"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cba3ad40dba5d99316c2569efba33bc88eea96e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cba3ad40dba5d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 18:30:31 2011 +0200 BI: new aggregation function "running_on" --- web/htdocs/bi.py | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index c26725d..1f615e8 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -717,6 +717,30 @@ def aggr_best(nodes, n = 1, worst_state = CRIT): config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best +import re + +def aggr_running_on(nodes, regex): + first_check = nodes[0] + + # extract hostname we run on + mo = re.match(regex, first_check[3]) + + # if not found, then do normal aggregation with 'worst' + if not mo or len(mo.groups()) == 0: + state, text = aggregation_functions['worst'](nodes[1:]) + return state, text + ", running nowhere" + + running_on = mo.groups()[0] + for host_node in nodes[1:]: + if host_node[2] == running_on: + return host_node[0], (host_node[3] + ", running on %s" % running_on) + + # host we run on not found. Strange... + return 3, "running on unknown host '%s'" % running_on + +config.aggregation_functions['running_on'] = aggr_running_on + + # ____ # | _ \ __ _ __ _ ___ ___ # | |_) / _` |/ _` |/ _ \/ __|

13 years, 5 months

Check_MK Git: check_mk: FIX: cisco_temp_perf: handle sensors without names correctly

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d30b24d248fab154b1decd2be3f5d47d84bcfbdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d30b24d248fab1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:01:57 2011 +0200 FIX: cisco_temp_perf: handle sensors without names correctly --- ChangeLog | 1 + checks/cisco_temp_perf | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0994c75..4833744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ * FIX: fc_brocade_port_detailed: fix PNP template in MULTIPLE mode * FIX: ad_replication.bat only generates output on domain controllers now. This is useful to prevent checks on non DC hosts (Thanks to Alex Greenwood) + * FIX: cisco_temp_perf: handle sensors without names correctly * 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 diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf index aa042ae..e441a1d 100644 --- a/checks/cisco_temp_perf +++ b/checks/cisco_temp_perf @@ -56,11 +56,17 @@ cisco_temp_perf_envmon_states = { } def inventory_cisco_temp_perf(checkname, info): - return [ (line[0], None) for line in info if len(line) == 4 ] + inventory = [] + for line in info: + name = line[0] + if name == "": + name = line[4] + inventory.append((name, None)) + return inventory def check_cisco_temp_perf(item, params, info): for line in info: - if line[0] == item: + if line[0] == item or line[4] == item: temp = saveint(line[1]) if temp != 0: perfdata = [("temp", temp)] @@ -81,8 +87,8 @@ def check_cisco_temp_perf(item, params, info): return (2, "CRIT - state is %s%s" % (statename, temptext), perfdata) return (3, "UNKNOWN - Item %s not found in SNMP data" % item) -check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "%s", 1, inventory_cisco_temp_perf) -snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6 ] ) # CISCO-SMI +check_info['cisco_temp_perf'] = (check_cisco_temp_perf, "Temperature %s", 1, inventory_cisco_temp_perf) +snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3, 4, 6, OID_END ] ) # CISCO-SMI snmp_scan_functions['cisco_temp_perf'] = \ lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \ oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None

13 years, 5 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e642efa051cf5d4b48374976d39231984244f168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e642efa051cf5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 10:48:20 2011 +0200 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index 4fc233b..1473a88 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -261 +281

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6ca02ff362e83ac761986904794e9917e467b8f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ca02ff362e83a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:01:18 2011 +0200 Updated bug entries --- .bugs/261 | 13 +++++++++++++ .bugs/262 | 10 ++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/.bugs/261 b/.bugs/261 new file mode 100644 index 0000000..21fb7e5 --- /dev/null +++ b/.bugs/261 @@ -0,0 +1,13 @@ +Title: unifiy all temperature checks +Component: checks +Benefit: 2 +State: open +Cost: 2 +Date: 2011-04-20 10:48:22 +Class: cleanup + +There are already a lot of temperature checks. *Each* of them +uses a different scheme for the service description. Make +all checks use "Temperature %s". Also use a common PNP-template +that handles a missing WARN/CRIT. Maybe use a common code base, +if this makes sense. diff --git a/.bugs/262 b/.bugs/262 new file mode 100644 index 0000000..0921779 --- /dev/null +++ b/.bugs/262 @@ -0,0 +1,10 @@ +Title: Speed up use of stored snmpwalks +Component: core +Benefit: 1 +State: open +Cost: 1 +Date: 2011-04-20 10:50:15 +Class: feature + +For large walks it takes almost for ever to make an inventory. +Use an in-memory cache.

13 years, 5 months

Check_MK Git: check_mk: FIX: install missing example icons in web/htdocs/ images/icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a79dbabacd85a7350a881a96a367e203842b4ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a79dbabacd85a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 14:12:00 2011 +0200 FIX: install missing example icons in web/htdocs/images/icons --- ChangeLog | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f71416a..6dbf430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * --debug now implies -v Multisite: + * FIX: install missing example icons in web/htdocs/images/icons * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar * FIX: ignore case when sorting groups in ...groups snapin diff --git a/Makefile b/Makefile index 567195d..86ffc02 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ dist: mk-livestatus mkdir -p $(DISTNAME) tar czf $(DISTNAME)/checks.tar.gz $(TAROPTS) -C checks $$(cd checks ; ls) tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) - tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) + tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web $$(cd web ; ls htdocs/images/icons/*.png htdocs/*/*.{wav,jpg,png,gif,ico,js} htdocs/*.{py,css} plugins/*/*.py) tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) tar czf $(DISTNAME)/pnp-templates.tar.gz $(TAROPTS) -C pnp-templates $$(cd pnp-templates ; ls *.php) tar czf $(DISTNAME)/pnp-rraconf.tar.gz $(TAROPTS) -C pnp-rraconf $$(cd pnp-rraconf ; ls *.rra.cfg README.rra)

13 years, 5 months

Check_MK Git: check_mk: FIX: cmk -D: drop obsolete (and always empty) Notification:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bb7c5b71deef7fd4ef39f75082750440c8a6626d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb7c5b71deef7f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:54:04 2011 +0200 FIX: cmk -D: drop obsolete (and always empty) Notification: --- ChangeLog | 1 + modules/check_mk.py | 2 -- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee32a22..f71416a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: cmk -D: drop obsolete (and always empty) Notification: * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging * FIX: fix detection of missing OIDs (led to empty lines) diff --git a/modules/check_mk.py b/modules/check_mk.py index aaa3b31..847a6c1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2919,8 +2919,6 @@ def dump_host(hostname): print tty_yellow + "Parents: " + tty_normal + ", ".join(parents_list) print tty_yellow + "Host groups: " + tty_normal + ", ".join(hostgroups_of(hostname)) print tty_yellow + "Contact groups: " + tty_normal + ", ".join(host_contactgroups_of([hostname])) - notperiod = (host_extra_conf(hostname, host_notification_periods) + [""])[0] - print tty_yellow + "Notification: " + tty_normal + notperiod agenttype = "TCP (port: %d)" % agent_port if is_snmp_host(hostname): credentials = snmp_credentials_of(hostname)

13 years, 5 months

Check_MK Git: check_mk: FIX: local: fixed search for custom templates PNP template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e48fa815441715e759e918e71fb4ce5dec91094 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e48fa81544171… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 11:41:14 2011 +0200 FIX: local: fixed search for custom templates PNP template --- ChangeLog | 1 + pnp-templates/check_mk-local.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4833744..ee32a22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: local: fixed search for custom templates PNP template * FIX: if/if64: always generate unique items (in case ifAlias is used) * FIX: ipmi: fix ugly ouput in case of warning and error * FIX: vms_df: fix, was completely broken due to conversion to df.include diff --git a/pnp-templates/check_mk-local.php b/pnp-templates/check_mk-local.php index 1f3914f..9e55712 100644 --- a/pnp-templates/check_mk-local.php +++ b/pnp-templates/check_mk-local.php @@ -25,7 +25,7 @@ // try to find template matching a prefix of the service // description first. Slashes are replaced by underscores. -$template_dirs = array('.'); +$template_dirs = array('templates'); if (isset($this->config->conf['template_dirs'])) { $template_dirs = $this->config->conf['template_dirs']; }

13 years, 5 months

Check_MK Git: check_mk: FIX: better handling of broken checks returning empty services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: deb064d6fca7512417a5853c8c2ca8c08187da41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb064d6fca751… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 20 10:40:26 2011 +0200 FIX: better handling of broken checks returning empty services --- ChangeLog | 1 + modules/check_mk.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f092ce..0994c75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.1.11i1: Core, Setup, etc.: + * FIX: better handling of broken checks returning empty services * FIX: fix computation of weight when averaging * FIX: fix detection of missing OIDs (led to empty lines) * SNMP scan functions can now call oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") diff --git a/modules/check_mk.py b/modules/check_mk.py index 917db22..aaa3b31 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -989,7 +989,7 @@ def extra_summary_service_conf_of(hostname, description): def extra_conf_of(confdict, hostname, service): result = "" for key, conflist in confdict.items(): - if service: + if service != None: values = service_extra_conf(hostname, service, conflist) else: values = host_extra_conf(hostname, conflist) @@ -1763,6 +1763,12 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals item, comment, paramstring = entry description = service_description(checkname, item) + # make sanity check + if len(description) == 0: + sys.stderr.write("%s: Check %s returned empty service description - ignoring it.\n" % + (hostname, checkname)) + continue + # Find logical host this check belongs to. The service might belong to a cluster. hn = host_of_clustered_service(hostname, description)

13 years, 5 months

Check_MK Git: check_mk: check_default_levels: fix initializiation problem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 395778b1c096e268a7dd5a9e80c57f9185213d20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=395778b1c096e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 20:28:23 2011 +0200 check_default_levels: fix initializiation problem --- checks/brocade_fcport | 113 ++++++++++++++++++++++++------------------------- modules/check_mk.py | 8 ++++ 2 files changed, 64 insertions(+), 57 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=395778b1c0…

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