Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Sven Panne

Module: check_mk Branch: master Commit: f702bfd89a3c0b462e21e6952d5f38da0ff031b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f702bfd89a3c0b… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 15 11:35:54 2016 +0100 Added werk 3193. --- .werks/3193 | 16 ++++++++++++++++ ChangeLog | 3 +++ web/plugins/views/commands.py | 5 ++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/3193 b/.werks/3193 new file mode 100644 index 0000000..89583ca --- /dev/null +++ b/.werks/3193 @@ -0,0 +1,16 @@ +Title: Fixed fake check results for hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455531955 + +Fake check results were handled in a slightly inconsistent way, now their +behavior exactly mirrors the processing of "real" check results, making the +resulting up/down host states less surprising. + +Note that submitting a "down" result does not necessarily imply a "down" +host state: Depending on the state of its parents, the host in question +could go to the "unreachable" state, too. diff --git a/ChangeLog b/ChangeLog index 3b3101e..c2ca75d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.9i1: + Core & Setup: + * 3193 FIX: Fixed fake check results for hosts... + Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index a518d55..0c19723 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -274,12 +274,11 @@ def render_fake_form(what): html.write("</td><td>") html.text_input("_fake_perfdata", "", size=50) html.write("</td></tr><tr><td>") - html.write(_("Set to:")) + html.write(_("Result:")) html.write("</td><td>") if what == "host": html.button("_fake_0", _("Up")) - html.button("_fake_1", _("Down")) - html.button("_fake_2", _("Unreachable")) + html.button("_fake_2", _("Down")) else: html.button("_fake_0", _("OK")) html.button("_fake_1", _("Warning"))

8 years, 4 months

#3060 FIX Folder properties: Fixed exception when a user has no alias set

by Lars Michelsen

Module: check_mk Branch: master Commit: 1505d23a22721163b5093c67dc7993c26722075d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1505d23a227211… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 11:35:21 2016 +0100 #3060 FIX Folder properties: Fixed exception when a user has no alias set The "Network Scan" property caused the page to break when at least one user had no alias set. --- .werks/3060 | 11 +++++++++++ ChangeLog | 3 +++ web/plugins/wato/builtin_attributes.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3060 b/.werks/3060 new file mode 100644 index 0000000..9ea1ab5 --- /dev/null +++ b/.werks/3060 @@ -0,0 +1,11 @@ +Title: Folder properties: Fixed exception when a user has no alias set +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455532388 + +The "Network Scan" property caused the page to break when at least one +user had no alias set. diff --git a/ChangeLog b/ChangeLog index d6ea0c8..3b3101e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,9 @@ Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices + WATO: + * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... + Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 95ca223..7c62661 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -141,7 +141,7 @@ register_hook('validate-host', validate_host_parents) class NetworkScanAttribute(ValueSpecAttribute): def __init__(self): def get_all_user_ids(): - return [ (user_id, "%s (%s)" % (user_id, user["alias"])) + return [ (user_id, "%s (%s)" % (user_id, user.get("alias", user_id))) for user_id, user in userdb.load_users(lock = False).items() ] ValueSpecAttribute.__init__(self, "network_scan",

8 years, 4 months

Reserved 10 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 5eedd397ddda4d76f1940587c486cd459828a673 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eedd397ddda4d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 15 11:24:31 2016 +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 bed5801..e4d7a32 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3193 +3203

8 years, 4 months

Generalized some mod_python specific code

by Lars Michelsen

Module: check_mk Branch: master Commit: c53cad3041e9d536eedac77dae22ebcd8561e7b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c53cad3041e9d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 17:53:21 2016 +0100 Generalized some mod_python specific code --- web/htdocs/mobile.py | 1 - web/htdocs/sidebar.py | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index 2916387..09b28ac 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -176,7 +176,6 @@ def page_login(): html.write('</div>') jqm_page_footer() mobile_html_foot() - return 0 # apache.OK def page_index(): diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 8319622..6b5a515 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -992,7 +992,4 @@ def search_open(): return url = search_url_tmpl(used_filters, matched_instances) - - html.set_http_header('Location', url) - from mod_python import apache - raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY + html.http_redirect(url)

8 years, 4 months

Removed unused import

by Lars Michelsen

Module: check_mk Branch: master Commit: 1e83bbad2d240bf7b49ef0839b8add7f639fd435 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e83bbad2d240b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 17:59:04 2016 +0100 Removed unused import --- web/plugins/pages/shipped.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 0c18ae5..bc01a31 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -26,7 +26,6 @@ # Import modules that contain the page functions -import config import main import logwatch import views

8 years, 4 months

Generalized some mod_python specific code

by Lars Michelsen

Module: check_mk Branch: master Commit: 423bc07dc75d038042d0bada811f3a6ce05a1a37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=423bc07dc75d03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 17:51:25 2016 +0100 Generalized some mod_python specific code --- web/htdocs/index.py | 2 +- web/htdocs/login.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index b125d6f..37c6f6f 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -32,7 +32,7 @@ import livestatus import modules import defaults, config, login from lib import * -from html_mod_python import * +from html_mod_python import html_mod_python, FinalizeRequest # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, fields = None, is_profiling = False): diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 99f5ee4..912d765 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -26,7 +26,7 @@ import defaults, config, userdb from lib import * -from mod_python import apache +from html_mod_python import FinalizeRequest import os, time try: @@ -289,8 +289,7 @@ def normal_login_page(called_directly = True): # When someone calls the login page directly and is already authed redirect to main page if html.myfile == 'login' and check_auth(): - html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') - return apache.OK + html.http_redirect(origtarget and origtarget or 'index.py') html.write('<div id="login">\n') html.write('<img id="login_window" src="images/login_window.png" />\n') @@ -325,7 +324,6 @@ def normal_login_page(called_directly = True): html.write("</div>\n") html.footer() - return apache.OK def page_logout(): # Remove eventual existing cookie @@ -338,7 +336,7 @@ def page_logout(): if not html.has_cookie('logout'): html.set_http_header('WWW-Authenticate', 'Basic realm="%s"' % defaults.nagios_auth_name) html.set_cookie('logout', '1') - raise apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED + raise FinalizeRequest(401) else: html.del_cookie('logout') html.http_redirect(defaults.url_prefix + 'check_mk/')

8 years, 4 months

#3059 FIX Fixed highlighting of availability timeline time slices

by Lars Michelsen

Module: check_mk Branch: master Commit: 67c772430b5250a90134966e643b9881fc2c68a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c772430b5250… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 09:56:14 2016 +0100 #3059 FIX Fixed highlighting of availability timeline time slices --- .werks/3059 | 10 ++++++++++ ChangeLog | 3 +++ web/htdocs/views.css | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3059 b/.werks/3059 new file mode 100644 index 0000000..f129ac9 --- /dev/null +++ b/.werks/3059 @@ -0,0 +1,10 @@ +Title: Fixed highlighting of availability timeline time slices +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455526552 + + diff --git a/ChangeLog b/ChangeLog index c80ab72..d6ea0c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... + Multisite: + * 3059 FIX: Fixed highlighting of availability timeline time slices + Event Console: * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... diff --git a/web/htdocs/views.css b/web/htdocs/views.css index a3aeee6..3168d25 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -636,7 +636,7 @@ div.timelinerange div.timelinechoord { table.timelineevents { width: 800px; } -table.timelineevents tr.hilite { +table.data.oddeven.timelineevents > tbody > tr.hilite { background-color: #6ab; color: white; }

8 years, 4 months

Updated bug entries #2419

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a71387f53d9627f359f9c2b11c14ff5cc2db5a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a71387f53d962… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 15 09:47:44 2016 +0100 Updated bug entries #2419 --- .bugs/2419 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/2419 b/.bugs/2419 index 6916b33..4ef7ea2 100644 --- a/.bugs/2419 +++ b/.bugs/2419 @@ -7,7 +7,7 @@ Class: bug 1. Create a new site in the CEE 2. omd config set CORE nagios -3. cmk -R --> missing contact group check-mk-notiry +3. cmk -R --> missing contact group check-mk-notify When you now go in WATO (no need for changing something), it works out. Seems that the default WATO configuration fixes that.

8 years, 4 months

added new check

by Simon Betz

Module: check_mk Branch: master Commit: 37ce5b76c308efaba02342787bc0317fdcafdb2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37ce5b76c308ef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 15 08:58:23 2016 +0100 added new check --- checks/aruba_wlc_aps | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/checks/aruba_wlc_aps b/checks/aruba_wlc_aps new file mode 100644 index 0000000..52f9d28 --- /dev/null +++ b/checks/aruba_wlc_aps @@ -0,0 +1,81 @@ +#!/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- +# tails. 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. + + +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.3.0.36.108.194.147.166 AP-NAME --> WLSX-WLAN-MIB::wlanAPName.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.19.0.36.108.194.147.166 2 --> WLSX-WLAN-MIB::wlanAPStatus.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.2.0.36.108.194.147.166 iii.jjj.kkk.lll --> WLSX-WLAN-MIB::wlanAPIpAddress.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.4.0.36.108.194.147.166 GROUP --> WLSX-WLAN-MIB::wlanAPGroupName.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.5.0.36.108.194.147.166 .1.3.6.1.4.1.14823.1.2.34 --> WLSX-WLAN-MIB::wlanAPModel.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.6.0.36.108.194.147.166 XYZ --> WLSX-WLAN-MIB::wlanAPSerialNumber.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.22.0.36.108.194.147.166 2 --> WLSX-WLAN-MIB::wlanAPUnprovisioned.'.$l...' +# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.32.0.36.108.194.147.166 --> WLSX-WLAN-MIB::wlanAPSysLocation.'.$l...' + + +def inventory_aruba_wlc_aps(info): + # Here we discover only provisioned aps which are up + return [ (line[0], None) for line in info \ + if line[1] == "1" and line[2] != "1" ] + + +def check_aruba_wlc_aps(item, params, info): + map_state = { + "1" : (0, "up"), + "2" : (2, "down"), + } + for ap_name, ap_status, ap_unprovisioned, ap_ip, ap_group, \ + ap_model, ap_serial, ap_sysloc in info: + if item == ap_name: + state, state_readable = map_state[ap_status] + infotext = "Status: %s" % state_readable + if ap_group: + infotext += ", Group: %s" % ap_group + if ap_sysloc: + infotext += ", System location: %s" % ap_sysloc + yield state, infotext + if ap_unprovisioned == "1": + yield 1, "Unprovisioned: yes" + + +check_info["aruba_wlc_aps"] = { + "inventory_function" : inventory_aruba_wlc_aps, + "check_function" : check_aruba_wlc_aps, + "service_description" : "AP %s", + "has_perfdata" : True, + # If you make changes here in snmp_info, don't forget to make + # these changes in the related inventory plugin, too. + "snmp_info" : ( ".1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1",[ + "3", # wlanAPName + "19", # wlanAPStatus + "22", # wlanAPUnprovisioned + "2", # wlanAPIpAddress + "4", # wlanAPGroupName + "5", # wlanAPModel + "6", # wlanAPSerialNumber + "32", # wlanAPSysLocation + ]), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith(".1.3.6.1.4.1.14823.1.1"), +}

8 years, 4 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 9e2060773b0ce77a6cdb65b810b07e174aade54f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e2060773b0ce7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 15 08:56:25 2016 +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 e66344f..bed5801 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3183 +3193

8 years, 4 months

← Newer
1
...
12
13
14
15
16
17
18
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016