Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: visual types can now register a function to check whether or not a visual can be deleted

by Lars Michelsen

Module: check_mk Branch: master Commit: 3032eb1c193c4ac2a726d9688841102e389c48fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3032eb1c193c4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 11:17:34 2015 +0100 visual types can now register a function to check whether or not a visual can be deleted --- web/htdocs/visuals.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 6c8ea63..685a711 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -247,7 +247,8 @@ def available(what, all_visuals): def page_list(what, title, visuals, custom_columns = [], render_custom_buttons = None, render_custom_columns = None, - render_custom_context_buttons = None): + render_custom_context_buttons = None, + check_deletable_handler = None): what_s = what[:-1] if not config.may("general.edit_" + what): @@ -268,14 +269,22 @@ def page_list(what, title, visuals, custom_columns = [], delname = html.var("_delete") if delname and html.transaction_valid(): deltitle = visuals[(config.user_id, delname)]['title'] - c = html.confirm(_("Please confirm the deletion of \"%s\".") % deltitle) - if c: - del visuals[(config.user_id, delname)] - save(what, visuals) - html.reload_sidebar() - elif c == False: - html.footer() - return + + try: + if check_deletable_handler: + check_deletable_handler(visuals, delname) + + c = html.confirm(_("Please confirm the deletion of \"%s\".") % deltitle) + if c: + del visuals[(config.user_id, delname)] + save(what, visuals) + html.reload_sidebar() + elif c == False: + html.footer() + return + except MKUserError, e: + html.write("<div class=error>%s</div>\n" % e.message) + html.add_user_error(e.varname, e.message) keys_sorted = visuals.keys() keys_sorted.sort(cmp = lambda a,b: -cmp(a[0],b[0]) or cmp(a[1], b[1]))

9 years, 4 months

Check_MK Git: check_mk: #2008 FIX Users created during basic auth login get the role assigned configured in "default user profile"

by Lars Michelsen

Module: check_mk Branch: master Commit: cf4abd145134028e3f88c5ab1f99658be3911502 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf4abd14513402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:36:59 2015 +0100 #2008 FIX Users created during basic auth login get the role assigned configured in "default user profile" Previously the role(s) configured in the default user profile were not used when a user which is not known to multisite logs in via basic auth. --- .werks/2008 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/config.py | 2 ++ 3 files changed, 14 insertions(+) diff --git a/.werks/2008 b/.werks/2008 new file mode 100644 index 0000000..627573d --- /dev/null +++ b/.werks/2008 @@ -0,0 +1,11 @@ +Title: Users created during basic auth login get the role assigned configured in "default user profile" +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424424942 + +Previously the role(s) configured in the default user profile were not used +when a user which is not known to multisite logs in via basic auth. diff --git a/ChangeLog b/ChangeLog index d608b8a..e3bcc7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -212,6 +212,7 @@ * 1984 FIX: Fixed loosing sidebar after switching to/from edit mode in dashboard edior on page reload... * 1985 FIX: PNP graph dashlet handles graphs in distributed setups correctly... * 1945 FIX: doc/treasures/downtime script: was no longer working because of latest changes in the GUI... + * 2008 FIX: Users created during basic auth login get the role assigned configured in "default user profile"... WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/config.py b/web/htdocs/config.py index a07f4bb..db05b82 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -298,6 +298,8 @@ def roles_of_user(user): return [ "user" ] elif os.path.exists(config_dir + "/" + user + "/automation.secret"): return [ "guest" ] # unknown user with automation account + elif 'roles' in default_user_profile: + return default_user_profile['roles'] elif default_user_role: return [ default_user_role ] else:

9 years, 4 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: c43639ffcfef8aece743ec3e11d6d11433e5565b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c43639ffcfef8a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:34:43 2015 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 9142bb4..2fc31b3 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2008 +2028

9 years, 4 months

Check_MK Git: check_mk: Fixed styling issue of modified global settings highlighting for dicts

by Lars Michelsen

Module: check_mk Branch: master Commit: b8b50c649527a11b004bd7eb67ba6127a7bbaecb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b50c649527a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:21:37 2015 +0100 Fixed styling issue of modified global settings highlighting for dicts --- web/htdocs/wato.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 4806e0a..706a80f 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -807,6 +807,11 @@ div.varname { padding-bottom: 18px; padding: 1px 4px 2px 4px; } + +.wato div.globalvars a.modified table.vs_dict_text { + border-collapse: separate; +} + .wato div.globalvars div.title a.modified { box-shadow: none; border: none;

9 years, 4 months

Check_MK Git: check_mk: #1987 FIX Editing auxtags shows existing topics in dropdown instead of as "create new topic"

by Lars Michelsen

Module: check_mk Branch: master Commit: eeaf6e0e4695d953b4fd52ba2fe6f2e01f2a733b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeaf6e0e4695d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:14:20 2015 +0100 #1987 FIX Editing auxtags shows existing topics in dropdown instead of as "create new topic" --- .werks/1987 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/1987 b/.werks/1987 new file mode 100644 index 0000000..b42e85d --- /dev/null +++ b/.werks/1987 @@ -0,0 +1,10 @@ +Title: Editing auxtags shows existing topics in dropdown instead of as "create new topic" +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424423629 + + diff --git a/ChangeLog b/ChangeLog index ebecf56..d608b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -239,6 +239,7 @@ * 1927 FIX: Fixed level description in WATO rules, change from if above into at * 1976 FIX: Sorting BI rule choice dropdown field entries now * 1986 FIX: Added nicer error message when calling the rename host page with a non existant host + * 1987 FIX: Editing auxtags shows existing topics in dropdown instead of as "create new topic" 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 2258c2f..bba807a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12693,9 +12693,9 @@ def parse_hosttag_title(title): else: return None, title -def hosttag_topics(hosttags): +def hosttag_topics(hosttags, auxtags): names = set([]) - for entry in hosttags: + for entry in hosttags + auxtags: topic, title = parse_hosttag_title(entry[1]) if topic: names.add((topic, topic)) @@ -12905,7 +12905,7 @@ def mode_edit_auxtag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic") + "<sup>*</sup>", - choices = hosttag_topics(hosttags), + choices = hosttag_topics(hosttags, auxtags), explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, @@ -13031,7 +13031,7 @@ def mode_edit_hosttag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic"), - choices = hosttag_topics(hosttags), + choices = hosttag_topics(hosttags, auxtags), explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None,

9 years, 4 months

Check_MK Git: check_mk: #1986 FIX Added nicer error message when calling the rename host page with a non existant host

by Lars Michelsen

Module: check_mk Branch: master Commit: 396758ad1fc9c38b27552853445adf79d8a445d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=396758ad1fc9c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:05:52 2015 +0100 #1986 FIX Added nicer error message when calling the rename host page with a non existant host --- .werks/1986 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/1986 b/.werks/1986 new file mode 100644 index 0000000..f544e00 --- /dev/null +++ b/.werks/1986 @@ -0,0 +1,10 @@ +Title: Added nicer error message when calling the rename host page with a non existant host +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424423142 + + diff --git a/ChangeLog b/ChangeLog index 8962157..ebecf56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ * 1925 FIX: Fix missing auxilliary tags that have their own topic... * 1927 FIX: Fixed level description in WATO rules, change from if above into at * 1976 FIX: Sorting BI rule choice dropdown field entries now + * 1986 FIX: Added nicer error message when calling the rename host page with a non existant host 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 d20c9ba..2258c2f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2217,6 +2217,10 @@ def check_edit_host_permissions(folder, host, hostname): def mode_rename_host(phase): hostname = html.var("host") + + if hostname not in g_folder[".hosts"]: + raise MKGeneralException(_("You called this page with an invalid host name.")) + host = g_folder[".hosts"][hostname] is_cluster = ".nodes" in host

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2302

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ea1e430273efb6eea6c0a4fa19ee15e49de94f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ea1e430273efb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 20 09:27:03 2015 +0100 Updated bug entries #2302 --- .bugs/2302 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2302 b/.bugs/2302 new file mode 100644 index 0000000..14718b9 --- /dev/null +++ b/.bugs/2302 @@ -0,0 +1,11 @@ +Title: mount check should ignore bind mounts +Component: checks +State: open +Date: 2015-02-20 09:25:31 +Targetversion: 1.2.7 +Class: bug + +With the new feature extra_sections, the df check should read the +mounts section and do the checking of the mount options here. +By that way we only check real filesystems and no duplicates. Also +this will reduce the number of checks.

9 years, 4 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b2bdbf238be236a8e1c71bb6b7f9e55f681cc58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b2bdbf238be23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 20 09:25:28 2015 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 122d34e..ebc926e 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2302 +2312

9 years, 4 months

Check_MK Git: check_mk: #2000 FIX check_mk_agent.freebsd: Add missing <<< local>>> section, plugins was twice instead

by Mathias Kettner

Module: check_mk Branch: master Commit: 87afe600ada511527fee274f333f5868746b310e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87afe600ada511… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 20 09:14:52 2015 +0100 #2000 FIX check_mk_agent.freebsd: Add missing <<<local>>> section, plugins was twice instead Thanks to Aran Cox! --- .werks/2000 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.freebsd | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/2000 b/.werks/2000 new file mode 100644 index 0000000..61a4576 --- /dev/null +++ b/.werks/2000 @@ -0,0 +1,10 @@ +Title: check_mk_agent.freebsd: Add missing <<<local>>> section, plugins was twice instead +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424420058 + +Thanks to Aran Cox! diff --git a/ChangeLog b/ChangeLog index 0332c5d..8962157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -168,6 +168,7 @@ * 1997 FIX: checkpoint_connections, checkpoint_packets: Detect more recent devices * 1999 FIX: raritan_pdu_inlet_summary, raritan_pdu_inlet, ups_socomec_outphase: renamed services to be consistent... NOTE: Please refer to the migration notes! + * 2000 FIX: check_mk_agent.freebsd: Add missing <<<local>>> section, plugins was twice instead... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index d39c600..00301ae 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -375,8 +375,9 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then fi -# Plugins -if cd $PLUGINSDIR ; then +# Local checks +echo '<<<local>>>' +if cd $LOCALDIR ; then for skript in $(ls) ; do if [ -f "$skript" -a -x "$skript" ] ; then ./$skript @@ -385,7 +386,7 @@ if cd $PLUGINSDIR ; then # Call some plugins only every X'th minute for skript in [1-9]*/* ; do if [ -x "$skript" ] ; then - run_cached plugins_${skript//\//\\} ${skript%/*} "$skript" + run_cached local_${skript//\//\\} ${skript%/*} "$skript" fi done fi

9 years, 4 months

Check_MK Git: check_mk: #1889 cmciii.phase: New check to monitor input phases for Raritan PDUs

by Konstantin Büttner

Module: check_mk Branch: master Commit: df33bf24cb499101f83bf9fbf38867dd481b2d87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df33bf24cb4991… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Feb 19 17:25:28 2015 +0100 #1889 cmciii.phase: New check to monitor input phases for Raritan PDUs --- .werks/1889 | 9 +++++++ ChangeLog | 1 + checkman/cmciii.phase | 30 ++++++++++++++++++++++ checks/cmciii | 54 +++++++++++++++++++++++++++++++++++++++ web/plugins/metrics/check_mk.py | 1 + 5 files changed, 95 insertions(+) diff --git a/.werks/1889 b/.werks/1889 new file mode 100644 index 0000000..ca03c5d --- /dev/null +++ b/.werks/1889 @@ -0,0 +1,9 @@ +Title: cmciii.phase: New check to monitor input phases for Raritan PDUs +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424363018 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1611c0e..0332c5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 1996 kernel.util: Also output values for steal and guest (no PNP template yet) * 1998 statgrab_net: New implementation of network interface monitoring via statgrab... NOTE: Please refer to the migration notes! + * 1889 cmciii.phase: New check to monitor input phases for Raritan PDUs * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/cmciii.phase b/checkman/cmciii.phase new file mode 100644 index 0000000..8602f06 --- /dev/null +++ b/checkman/cmciii.phase @@ -0,0 +1,30 @@ +title: Rittal CMC-III PDUs: Input Phases +agents: snmp +catalog: hw/power/rittal +license: GPL +distribution: check_mk +description: + This check monitors the input power phases for Rittal CMC-III PDUs. + +item: + The unit name and the phase identifier ("Phase 1"), or Summary for overall + power and energy. + +perfdata: + Voltage in Volt, power in Watt, current in Ampère, energy in Wh, apparent power in VA. + Only Power and Energy for the summary Item. + +inventory: + One item per phase and one summary item is added. + +[parameters] +parameters (dict): This check supports four types of parameters, +none of which have default values. It is a dictionary with the following keys: + + {"voltage"}: Warning and critical levels for voltage in int, denoting the minimum required voltage in volt. + + {"current"}: Warning and critical levels for current in int, denoted in Ampère + + {"power"}: Warning and critical levels for power in int, denoted in Watt. + + {"appower"}: Warning and critical levels for apparent power in int, denoted in AV. diff --git a/checks/cmciii b/checks/cmciii index 39a5050..0e69e09 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -728,3 +728,57 @@ check_info['cmciii.humidity'] = { "has_perfdata" : True, } #. +# .--phase---------------------------------------------------------------. +# | _ | +# | _ __ | |__ __ _ ___ ___ | +# | | '_ \| '_ \ / _` / __|/ _ \ | +# | | |_) | | | | (_| \__ \ __/ | +# | | .__/|_| |_|\__,_|___/\___| | +# | |_| | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +def inventory_cmciii_phase(info): + phases = {} + parsed = parse_cmciii_inputs(info[0]) + units = parse_units(info[1]) + for (unit, raw_item_name), entry in parsed.iteritems(): + unit_type, unit_name = units[int(unit)-1][0:2] + if 'Phase' in raw_item_name: + item_name = raw_item_name.split(".")[1] + phases["%s Phase %s" % (unit_name, item_name[-1])] = {} + elif 'Unit.General' in raw_item_name: + phases["%s Summary" % unit_name] = {} + return phases.items() + +def check_cmciii_phase(item, params, info): + unit_name = item.split(" ")[0] + item_name = item.split(" ")[-1] + semiparsed = parse_cmciii_inputs(info[0]) + unit = get_unit_number(parse_units(info[1]), unit_name) + parsed = {} + parsed[item] = {} + if "Phase" in item: + parsed[item]["voltage"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Voltage")]["Value"].split()[0]), None + parsed[item]["current"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Current")]["Value"].split()[0]), None + parsed[item]["power"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Power.Active")]["Value"].split()[0]), None + parsed[item]["appower"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Power.Apparent")]["Value"].split()[0]), None + parsed[item]["energy"] = float(semiparsed[(unit, "Unit.Phase" + item_name + ".Energy.Active")]["Value"].split()[0]), None + elif "Summary" in item: + parsed[item]["power"] = float(semiparsed[(unit, "Unit.General.Power")]["Value"].split()[0]), None + parsed[item]["energy"] = float(semiparsed[(unit, "Unit.General.Energy.Active")]["Value"].split()[0]), None + + return check_elphase(item, params, parsed) + +check_info['cmciii.phase'] = { + "check_function" : check_cmciii_phase, + "inventory_function" : inventory_cmciii_phase, + "service_description" : "Input %s", + "has_perfdata" : True, + "snmp_scan_function" : cmciii_scan, + "snmp_info" : cmciii_snmp_info, + "includes" : [ "elphase.include" ], + "group" : "el_inphase", +} +#. diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 46dba9c..8cd1b1d 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -416,6 +416,7 @@ check_metrics["check_mk-sensatronics_temp"] = {} check_metrics["check_mk-smart.temp"] = {} check_metrics["check_mk-viprinet_temp"] = {} check_metrics["check_mk-wagner_titanus_topsense.temp"] = {} +check_metrics["check_mk-cmciii.phase"] = {} check_metrics["check_mk-kernel"] = { "processes" : { "name" : "proc_creat", } }

9 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015