Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed broken software package search

by Lars Michelsen

Module: check_mk Branch: master Commit: 7b3443da85ea69012380c4afb668316788bae015 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b3443da85ea69… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 11:02:19 2015 +0100 Fixed broken software package search --- web/plugins/views/inventory.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 7932fa9..06f6260 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -633,7 +633,7 @@ def inv_multisite_table(dsname, columns, add_headers, only_sites, limit, filters header = filt.filter(dsname) if not header.startswith("Sites:"): filter_code += header - host_columns = [ "host_name" ] + filter(lambda c: c.startswith("host_"), columns) + host_columns = list(set([ "host_name" ] + filter(lambda c: c.startswith("host_"), columns))) html.live.set_only_sites(only_sites) html.live.set_prepend_site(True) @@ -665,7 +665,7 @@ def inv_multisite_table(dsname, columns, add_headers, only_sites, limit, filters site = row[0] hostname = row[1] hostrow = dict(zip(headers, row)) - if dsname == "invswpac": + if dsname == "invswpacs": subrows = create_swpac_rows(hostname) else: subrows = create_hist_rows(hostname, columns)

9 years, 5 months

Check_MK Git: check_mk: #1884 FIX Fixed exception in virtual host tree snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 2c2cb7e07a80193ea3ad2a11bcd015117c161ca4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c2cb7e07a8019… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:50:53 2015 +0100 #1884 FIX Fixed exception in virtual host tree snapin --- .werks/1884 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/1884 b/.werks/1884 new file mode 100644 index 0000000..2726a0d --- /dev/null +++ b/.werks/1884 @@ -0,0 +1,10 @@ +Title: Fixed exception in virtual host tree snapin +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422611436 + + diff --git a/ChangeLog b/ChangeLog index 7872af5..4b279a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,7 @@ * 1871 FIX: Site filter is only shown as host related filter now... * 1872 FIX: View editor hides filter selection for object types which have no filter to choose... * 1876 FIX: User sorting of views can now be disabled again + * 1884 FIX: Fixed exception in virtual host tree snapin WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d9d10f9..06e90d7 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1497,7 +1497,7 @@ def render_tag_tree(): tree_conf = {"tree": tree_conf, "cwd":{}} # convert from old style - choices = enumerate([v[0] for v in config.virtual_host_trees]) + choices = [ (str(i), v[0]) for i, v in enumerate(config.virtual_host_trees)] html.begin_form("vtree") # Give chance to change one level up, if we are in a subtree @@ -1506,7 +1506,7 @@ def render_tag_tree(): upurl = "javascript:virtual_host_tree_enter(%r)" % "|".join(cwd[:-1]) html.icon_button(upurl, _("Go up one tree level"), "back") - html.select("vtree", choices, tree_conf["tree"], onchange = 'virtual_host_tree_changed(this)') + html.select("vtree", choices, str(tree_conf["tree"]), onchange = 'virtual_host_tree_changed(this)') html.write("<br>") html.end_form() html.final_javascript(virtual_host_tree_js)

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2270

by Lars Michelsen

Module: check_mk Branch: master Commit: ba1f159d68172836ce8220d77971c2fabae8d171 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba1f159d681728… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:50:25 2015 +0100 Updated bug entries #2270 --- .bugs/2270 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/2270 b/.bugs/2270 index df3eedc..6d7cade 100644 --- a/.bugs/2270 +++ b/.bugs/2270 @@ -5,4 +5,4 @@ Date: 2015-01-22 14:45:46 Targetversion: 1.2.5i1 Class: bug -There is a commit (0470292ef) that needs to be reverted. +There is a commit (0470292ef?) that needs to be reverted.

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2270

by Lars Michelsen

Module: check_mk Branch: master Commit: 77f1c8941cbe3e7e259db00a0c861f7ce5f3ee42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77f1c8941cbe3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:28:53 2015 +0100 Updated bug entries #2270 --- .bugs/2270 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/2270 b/.bugs/2270 index aa7346c..df3eedc 100644 --- a/.bugs/2270 +++ b/.bugs/2270 @@ -5,4 +5,4 @@ Date: 2015-01-22 14:45:46 Targetversion: 1.2.5i1 Class: bug -There is a commit that needs to be reverted. +There is a commit (0470292ef) that needs to be reverted.

9 years, 5 months

Check_MK Git: check_mk: Fix typo in English text in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: fa8f5f9e0c1308a5d1a65bf0fde646826a3a7283 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa8f5f9e0c1308… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jan 30 10:40:42 2015 +0100 Fix typo in English text in WATO --- mkeventd/web/plugins/wato/mkeventd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 235e330..4d81d70 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -122,7 +122,7 @@ vs_mkeventd_actions = \ ( "disabled", Checkbox( title = _("Disable"), - label = _("Current disable execution of this action"), + label = _("Currently disable execution of this action"), ) ), ( "hidden",

9 years, 5 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Lutz Helwing

Module: check_mk Branch: master Commit: d9f7a564005a9de54ef253efe2139de2df684a04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9f7a564005a9d… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Fri Jan 30 10:29:00 2015 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index bba5da1..6f137db 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1958 +1968

9 years, 5 months

Check_MK Git: check_mk: added check for smoke sensors on expansion boards daisy chained to AKCP securityProbe

by Lutz Helwing

Module: check_mk Branch: master Commit: ee77995ef2761218815eee44b0c44c0a15a92dbf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee77995ef27612… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Fri Jan 30 10:26:44 2015 +0100 added check for smoke sensors on expansion boards daisy chained to AKCP securityProbe --- checkman/akcp_daisy_smoke | 12 ++++++++ checks/akcp_daisy_smoke | 71 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/checkman/akcp_daisy_smoke b/checkman/akcp_daisy_smoke new file mode 100644 index 0000000..fa61c1d --- /dev/null +++ b/checkman/akcp_daisy_smoke @@ -0,0 +1,12 @@ +title: AKCP daisySmoke Sensor +agents: snmp +catalog: hw/envirnoment/akcp +license: GPL +distribution: check_mk +description: + This check monitors the state of smoke sensors on all expansion boards which are daisy chained to an AKCP securityProbe 5E. + If the sensors's state is 'normal' the check results in OK. The sensor states 'no status', 'relay on' or 'relay off' lead + to an UNKN result. When the sensor state is one of 'high critical', 'low critical' or 'sensor error' the check results in CRIT. + +inventory: + All smoke sensors are automatically detected. Each one is defined by its description. diff --git a/checks/akcp_daisy_smoke b/checks/akcp_daisy_smoke new file mode 100644 index 0000000..50fab9e --- /dev/null +++ b/checks/akcp_daisy_smoke @@ -0,0 +1,71 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# Example for contents of info +# description state +# ['Port 4 Rauchmelder USV Raum A', '2'], +# ['Port 5 Rauchmelder USV Raum B', '2'], +# ['Port 5 Rauchmelder Warmgang links', '2'], +# ['Port 4 Rauchmelder Warmgang rechts', '2'], +# ['Port 6 Rauchmelder RZ Klima', '2'] + + +def inventory_akcp_daisy_smoke(info): + for line in info: + yield line[0], None + + +def check_akcp_daisy_smoke(item, _no_param, info): + # States as they are defined in corresponding MIB: SPAGENT-MIB + states = { + '1' : (3, 'no status' ), + '2' : (0, 'normal' ), + '4' : (2, 'high critical' ), + '6' : (2, 'low critical' ), + '7' : (2, 'sensor error' ), + '8' : (3, 'relay on' ), + '9' : (3, 'relay off' ), + } + + for sensor_description, state_id in info: + if item == sensor_description: + state, state_name = states[state_id] + return state, 'State: %s' % state_name + + +check_info['akcp_daisy_smoke'] = { + 'check_function' : check_akcp_daisy_smoke, + 'inventory_function' : inventory_akcp_daisy_smoke, + 'service_description' : 'Smoke %s', + 'snmp_scan_function' : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [ + '.1.3.6.1.4.1.3854.1.2.2.1.1', + '.1.3.6.1.4.1.3854.1' + ], + 'snmp_info' : ( '.1.3.6.1.4.1.3854.2.3.14.1', [ + 2, # SPAGENT-MIB:sensorSmokeDescription + 6, # SPAGENT-MIB:sensorSmokeStatus + ] ), +}

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2273

by Lars Michelsen

Module: check_mk Branch: master Commit: 9b3d02714214554773f687f862368ac0f15c2480 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b3d0271421455… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:13:19 2015 +0100 Updated bug entries #2273 --- .bugs/2273 | 7 +++++-- .bugs/2293 | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.bugs/2273 b/.bugs/2273 index c0db44b..96c7ca9 100644 --- a/.bugs/2273 +++ b/.bugs/2273 @@ -1,8 +1,11 @@ Title: Wato rule editor: loosing context after cloning a rule Component: wato -State: open +Class: bug +State: done Date: 2014-12-09 10:08:45 Targetversion: 1.2.5i1 -Class: bug After cloning a rule the context to the service is missing (if comming from wato service view) + +2015-01-30 10:13:01: changed state open -> done +Fixed diff --git a/.bugs/2293 b/.bugs/2293 index b6744f5..2a12ee0 100644 --- a/.bugs/2293 +++ b/.bugs/2293 @@ -1,11 +1,7 @@ Title: datasource and service discovery check Component: checks Class: bug -<<<<<<< HEAD State: closed -======= -State: works4me ->>>>>>> 956ea68eae1dc6834d58d730da0a40f3a3eb7197 Date: 2015-01-30 09:10:34 Targetversion: 1.2.5i1

9 years, 5 months

Check_MK Git: check_mk: #1883 FIX Fixed lossing service context when cloning a rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 3e7001c64308136418804d9eff604602d35eeaa4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e7001c6430813… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:12:33 2015 +0100 #1883 FIX Fixed lossing service context when cloning a rule --- .werks/1883 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/1883 b/.werks/1883 new file mode 100644 index 0000000..6d3f48e --- /dev/null +++ b/.werks/1883 @@ -0,0 +1,10 @@ +Title: Fixed lossing service context when cloning a rule +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1422609138 + + diff --git a/ChangeLog b/ChangeLog index ee3ea26..7872af5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -168,6 +168,7 @@ * 1816 FIX: Fixed garbled output on "rename host" result page * 1879 FIX: Not showing "only show permitted hosts/services" option for users not having "see all" permissions... * 1922 FIX: Fix exception in saving of hosttags if hosttag has at least one auxiliary tag + * 1883 FIX: Fixed lossing service context when cloning a rule Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c74f62..ad8d710 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14441,6 +14441,8 @@ def rule_button(action, help=None, folder=None, rulenr=0): vars.append(("rule_folder", html.var("rule_folder"))) if html.var("host"): vars.append(("host", html.var("host"))) + if html.var("item"): + vars.append(("item", html.var("item"))) url = make_action_link(vars) html.icon_button(url, help, action)

9 years, 5 months

Check_MK Git: check_mk: Updated bug entries #2169

by Lars Michelsen

Module: check_mk Branch: master Commit: ee6963d71eab0affa96d9f73c56d829102653001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee6963d71eab0a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jan 30 10:08:26 2015 +0100 Updated bug entries #2169 --- .bugs/2169 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/2169 b/.bugs/2169 index 15255e0..f36077d 100644 --- a/.bugs/2169 +++ b/.bugs/2169 @@ -1,9 +1,12 @@ Title: Passive checks in multisite show "Active check" enabled/disabled icons Component: multisite -State: open +Class: bug +State: works4me Date: 2014-12-15 13:38:37 Targetversion: future -Class: bug Setting active checks enabled/disabled for a -passive- check will show the corresponding active check icon, e.g. a green check mark, on the passive check. + +2015-01-30 10:05:00: changed state open -> works4me +Works as expected.

9 years, 5 months

← Newer
1
2
3
4
5
6
7
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015