Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

Check_MK Git: check_mk: new global option: default downtime and duration

by Andreas Boesl

Module: check_mk Branch: master Commit: 830c7e3af9aee60a7ec989e58929d657aa9f1ae2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830c7e3af9aee6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 14:04:47 2013 +0200 new global option: default downtime and duration --- ChangeLog | 1 + web/plugins/config/builtin.py | 3 +++ web/plugins/views/commands.py | 18 ++++++++++++------ web/plugins/wato/check_mk_configuration.py | 27 +++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa73107..98050a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * Sorter Host IP address: fixed sorting, no longer uses str compare on ip * Views: New: Draw rule editor icon in multisite views (default off) Can be activated in global settings + * New global multisite option: Default downtime duration and comment WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 4bd4728..3f9b6db 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -180,6 +180,9 @@ auth_by_http_header = False # Add an icon pointing to the WATO rule to each service multisite_draw_ruleicon = False +# Default downtime configuration +default_downtime = {} + # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) # | | | / __|/ _ \ '__| | | | _ \ diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 3155329..e9fc174 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -377,6 +377,10 @@ def command_downtime(cmdtag, spec, row): if down_to: comment = html.var_utf8("_down_comment") + try: # Catch formatting errors + comment = comment % { "user": config.user_id, "duration": int(down_to - down_from) } + except: + pass if not comment: raise MKUserError("_down_comment", _("You need to supply a comment for your downtime.")) if html.var("_down_flexible"): @@ -414,8 +418,15 @@ def get_child_hosts(site, hosts, recurse): return list(new_childs) def paint_downtime_buttons(what): + downtime_duration = config.default_downtime.get("duration", 60) + downtime_comment = config.default_downtime.get("comment", "") + html.button("_down_from_now", _("From now for")) + html.write(" ") + html.number_input("_down_minutes", downtime_duration, size=4, submit="_down_from_now") + html.write("  " + _("minutes")) + html.write("<hr>") html.write(_('Downtime Comment')+": ") - html.text_input("_down_comment", size=40, submit="") + html.text_input("_down_comment", downtime_comment, size=60, submit="") html.write("<hr>") html.button("_down_2h", _("2 hours")) html.button("_down_today", _("Today")) @@ -430,11 +441,6 @@ def paint_downtime_buttons(what): html.write("  "+_('to')+"  ") html.datetime_input("_down_to", time.time() + 7200, submit="_down_custom") html.write("<hr>") - html.button("_down_from_now", _("From now for")) - html.write(" ") - html.number_input("_down_minutes", 60, size=4, submit="_down_from_now") - html.write("  " + _("minutes")) - html.write("<hr>") html.checkbox("_down_flexible", False, label=_('flexible with max. duration')+" ") html.time_input("_down_duration", 2, 0) html.write(" "+_('(HH:MM)')) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 96766c6..c95790d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -265,6 +265,33 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "default_downtime", + Dictionary( + title = _("Default downtime settings"), + help = _("This setting allows to set a default downtime comment and duration. "\ + "The schedule downtime formular uses these values as default. "), + elements = [ + ("duration", Integer( + title = _("Duration"), + help = _("The duration in minutes of the default downtime"), + minvalue = 1, + unit = _("minutes"), + default_value = 120, + )), + ("comment", TextAscii( + title = _("Downtime comment"), + help = _("The default comment for a downtime. "\ + "You can use the placeholders %(user)s and %(duration)s "\ + "which will replaced when the downtime command is sent"), + default_value = _("Downtime of %(duration)s minutes triggered by %(user)s"), + size = 80 + )), + ], + ), + domain = "multisite", +) + +register_configvar(group, "wato_activation_method", DropdownChoice( title = _("WATO restart mode for Nagios"),

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 762c4bdd477a11279c5a1fa3b7179bab16ac94c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=762c4bdd477a11… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 14:04:51 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e27018b6333f34301169a20d663cac70311e68f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e27018b6333f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 12:02:02 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0896

by Mathias Kettner

Module: check_mk Branch: master Commit: 336dc7b2632b252d5a6ce788dbef7afdd2653823 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=336dc7b2632b25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 12:01:59 2013 +0200 Updated bug entries #0896 --- .bugs/896 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/896 b/.bugs/896 new file mode 100644 index 0000000..51934e3 --- /dev/null +++ b/.bugs/896 @@ -0,0 +1,10 @@ +Title: Perf-O-Meter of oracle_tablespaces broken +Component: checks +State: open +Date: 2013-06-26 11:59:45 +Targetversion: 1.2.3 +Class: bug + +Perfdata is e.g. size=709911117824;652298158080;688536944640;; used=663243390976;;;; max_size=724775731200;;;; +Checkouput look OK (size 661.16GB, used 617.69GB, max 675.00GB) +Perfometer show 709911117824%

11 years, 3 months

Check_MK Git: check_mk: .f12, made more talkative

by Andreas Boesl

Module: check_mk Branch: master Commit: 49978e5a01b86422c160e1588ba07e2707a4452e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49978e5a01b864… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 10:51:18 2013 +0200 .f12, made more talkative --- livestatus/.f12 | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/.f12 b/livestatus/.f12 index 0eecff6..543c461 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -17,4 +17,5 @@ sudo install -m 755 src/livecheck /omd/versions/default/lib/mk-livestatus sudo rm -f /omd/versions/default/lib/livecheck sudo chmod 4755 /omd/versions/default/lib/mk-livestatus/livecheck echo "$C files copied" +echo "Restarting site $SITE" sudo omd restart $SITE nagios

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0933

by Andreas Boesl

Module: check_mk Branch: master Commit: c76e0092d592c323fe4517ad032c8e99589fa2bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c76e0092d592c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 10:53:56 2013 +0200 Updated bug entries #0933 --- .bugs/933 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/933 b/.bugs/933 new file mode 100644 index 0000000..01d259e --- /dev/null +++ b/.bugs/933 @@ -0,0 +1,10 @@ +Title: mechanize for webpage login / checks +Component: checks +State: open +Date: 2013-06-26 10:51:54 +Targetversion: future +Class: feature + +Python mechanize allows to simulate browser actions +A check might search for a form, fill in values, post the form +and evaluate the results (typical login)

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0932

by Andreas Boesl

Module: check_mk Branch: master Commit: 3edcd8b7cacdea5429a2011171b99a6cad9ad157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3edcd8b7cacdea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 10:49:42 2013 +0200 Updated bug entries #0932 --- .bugs/932 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/932 b/.bugs/932 new file mode 100644 index 0000000..df83bbb --- /dev/null +++ b/.bugs/932 @@ -0,0 +1,16 @@ +Title: Percentage valuespec not constistent +Component: wato +State: open +Date: 2013-06-26 10:44:31 +Targetversion: future +Class: bug + +The validate_datatype() is not always called on creating rules + +active_checks.py active_checks:disk_smb +Remove allow_int from Levels for used disk space Percentages +Create rule in WATO -> Warning + +check_parameters.py filesystem_elements +Remove allow_int from trend_perc +Create rule in WATO -> No Warning (int not allowed)

11 years, 3 months

Check_MK Git: check_mk: fixed: merged accept_int into allow_int.

by Andreas Boesl

Module: check_mk Branch: master Commit: 6a97a2781a7b5c06ae46b2e68564737ab77232a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a97a2781a7b5c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 10:23:25 2013 +0200 fixed: merged accept_int into allow_int. SMB share: set allow int to True --- web/htdocs/valuespec.py | 6 +++--- web/htdocs/wato.py | 4 ++-- web/plugins/wato/active_checks.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0135e7f..40fbd94 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -815,7 +815,7 @@ class Float(Integer): Integer.__init__(self, **kwargs) self._decimal_separator = kwargs.get("decimal_separator", ".") self._display_format = kwargs.get("display_format", "%.2f") - self._accept_int = kwargs.get("accept_int", False) + self._allow_int = kwargs.get("allow_int", False) def canonical_value(self): return float(Integer.canonical_value(self)) @@ -832,9 +832,9 @@ class Float(Integer): def validate_datatype(self, value, varprefix): if type(value) != float and not \ - (type(value) == int and self._accept_int): + (type(value) == int and self._allow_int): raise MKUserError(varprefix, _("The value %r has type %s, but must be of type float%s") % - (value, type_name(value), self._accept_int and _(" or int") or "")) + (value, type_name(value), self._allow_int and _(" or int") or "")) class Percentage(Float): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 51f6cb8..b2efec8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11407,8 +11407,8 @@ def Levels(**kwargs): Tuple( title = _("Fixed Levels"), elements = [ - Float(unit = unit, title = _("Warning at"), default_value = default_levels[0], accept_int = True), - Float(unit = unit, title = _("Critical at"), default_value = default_levels[1], accept_int = True), + Float(unit = unit, title = _("Warning at"), default_value = default_levels[0], allow_int = True), + Float(unit = unit, title = _("Critical at"), default_value = default_levels[1], allow_int = True), ], ), PredictiveLevels( diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 6834ea0..d21fe40 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -786,8 +786,8 @@ register_rule(group, Tuple( title = _("Levels for used disk space"), elements = [ - Percentage(title = _("Warning at"), default_value = 85, unit=_("% used space")), - Percentage(title = _("Critical at"), default_value = 95, unit=_("% used space")), + Percentage(title = _("Warning at"), default_value = 85, unit=_("% used space"), allow_int = True), + Percentage(title = _("Critical at"), default_value = 95, unit=_("% used space"), allow_int = True), ] )), ( "auth",

11 years, 3 months

Check_MK Git: check_mk: rule editor: fixed, now with check item determination

by Andreas Boesl

Module: check_mk Branch: master Commit: 4cb110e49102515f1519953242bde7d73ec3a95a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cb110e4910251… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 26 10:05:15 2013 +0200 rule editor: fixed, now with check item determination --- modules/automation.py | 1 + web/htdocs/wato.py | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index f7eb9fa..c73f949 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -591,6 +591,7 @@ def automation_get_check_information(): checks[check_type] = { "title" : title } if check["group"]: checks[check_type]["group"] = check["group"] + checks[check_type]["service_description"] = check.get("service_description","%s") checks[check_type]["snmp"] = check_uses_snmp(check_type) return checks diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5a045b1..51f6cb8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10083,23 +10083,29 @@ def create_new_rule_form(rulespec, hostname = None, item = None, varname = None) def mode_edit_ruleset(phase): varname = html.var("varname") - + + item = None if html.var("check_command"): check_command = html.var("check_command") checks = check_mk_local_automation("get-check-information") if check_command.startswith("check_mk-"): check_command = check_command[9:] varname = "checkgroup_parameters:" + checks[check_command].get("group","") + descr_pattern = checks[check_command]["service_description"].replace("%s", "(.*)") + matcher = re.search(descr_pattern, html.var("service_description")) + if matcher: + item = matcher.group(1) elif check_command.startswith("check_mk_active-"): check_command = check_command[16:].split(" ")[0][:-1] varname = "active_checks:" + check_command rulespec = g_rulespecs.get(varname) hostname = html.var("host", "") - if html.has_var("item"): - item = mk_eval(html.var("item")) - else: - item = NO_ITEM + if not item: + if html.has_var("item"): + item = mk_eval(html.var("item")) + else: + item = NO_ITEM if hostname: hosts = load_hosts(g_folder)

11 years, 3 months

Check_MK Git: check_mk: esx_vsphere_object: make check state configurable

by Mathias Kettner

Module: check_mk Branch: master Commit: 3d1d5dfb4373464697770eacbceb29047e9ad103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d1d5dfb437346… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 26 09:41:44 2013 +0200 esx_vsphere_object: make check state configurable --- ChangeLog | 1 + checkman/esx_vsphere_objects | 19 ++++++++++-- checks/esx_vsphere_objects | 39 ++++++++++++++++++------- web/plugins/config/builtin.py | 3 ++ web/plugins/icons/builtin.py | 2 +- web/plugins/wato/check_parameters.py | 53 ++++++++++++++++++++++++++++++++-- 6 files changed, 100 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index bca2cca..fa73107 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ * ps.perf: Support Windows with new plugin "psperf.bat". wmicchecks.bat is obsolete now. * Special Agent vSphere: support ESX 4.1 (thanks to Mirko Witt) + * esx_vsphere_object: make check state configurable Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/checkman/esx_vsphere_objects b/checkman/esx_vsphere_objects index a0b1587..cb29416 100644 --- a/checkman/esx_vsphere_objects +++ b/checkman/esx_vsphere_objects @@ -10,12 +10,25 @@ description: be used for determining the architecture of a VMWare farm out of the monitoring data. - The check will get critical if a host system or virtual machine, that was once - present, is now missing. + The check will get warning if a host or VM is powered off or suspended. But + this can be configured via a check parameter. inventory: - One service per hostsystem and per VM will be created. + One service per hostsystem and per VM will be created, regardless of its state. item: The text {HostSystem} or {VM} followed by a space followed by the name of the host system or VM. + +examples: + # Allow VMs beginning with "testvm" to be powered off. + check_parameters = [ + ( { "states" : { "poweredOff" : 0 } }, [ "esx" ], [ "VM testvm" ]), + ] + + +[parameters] +params(dict): A dictionary will currently one optional key: {states}. This is again a dictionary + with the optional entries {"poweredOn"}, {"poweredOff"} and {"suspended"}. The value for each + entry is {0}, {1}, {2} or {3} and sets the check result in that case to OK, WARN, CRIT or UNKNOWN. + diff --git a/checks/esx_vsphere_objects b/checks/esx_vsphere_objects index 282e00c..8a00d89 100644 --- a/checks/esx_vsphere_objects +++ b/checks/esx_vsphere_objects @@ -40,7 +40,7 @@ # virtualmachine OpenSUSE_I vsphere_object_names = { - "hostsystem" : "HostSystem", + "hostsystem" : "HostSystem", "virtualmachine" : "VM", } @@ -55,21 +55,37 @@ vsphere_object_names = { # '----------------------------------------------------------------------' def inventory_esx_vsphere_objects(info): - return [ (vsphere_object_names[line[0]] + " " + line[1], None) for line in info ] + return [ (vsphere_object_names[line[0]] + " " + line[1], {}) for line in info ] + +# params is a dict with the allowed target states for the systems +# Example: +# params = { +# "states" : { +# "poweredOn" : 0, +# "poweredOff" : 0, +# "suspended" : 3, +# } +# } + + +def check_esx_vsphere_objects(item, params, info): + if params == None: + params = {} -def check_esx_vsphere_objects(item, _no_params, info): for line in info: if vsphere_object_names[line[0]] + " " + line[1] == item and len(line) > 3: running_on = line[2] power_state = line[3] - if power_state == "poweredOn": - state = 0 - elif power_state == "poweredOff": - state = 1 - elif power_state == "suspended": - state = 1 - else: - state = 3 + state = params.get("states",{}).get(power_state) + if state == None: + if power_state == "poweredOn": + state = 0 + elif power_state == "poweredOff": + state = 1 + elif power_state == "suspended": + state = 1 + else: + state = 3 infotext = "power state: %s" % power_state if running_on: if state == 0: @@ -91,6 +107,7 @@ check_info['esx_vsphere_objects'] = { "inventory_function" : inventory_esx_vsphere_objects, "check_function" : check_esx_vsphere_objects, "service_description" : "%s", + "group" : "esx_vsphere_objects", } # .--Cluster-------------------------------------------------------------. diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index 0cfdaa6..4bd4728 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -177,6 +177,9 @@ selection_livetime = 3600 # Configure HTTP header to read usernames from auth_by_http_header = False +# Add an icon pointing to the WATO rule to each service +multisite_draw_ruleicon = False + # _ _ ____ ____ # | | | |___ ___ _ __| _ \| __ ) # | | | / __|/ _ \ '__| | | | _ \ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index c87343e..d4f20cc 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -127,7 +127,7 @@ def paint_rule_editor(what, row, tags, custom_vars): ("check_command", row["service_check_command"]), ("service_description", row["service_description"]), ("host", row["host_name"])], "wato.py") - title = _("Edit rule for %s") % check_command + title = _("Edit check parameters for this service") return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ (url, title) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d2cab37..ef2a7e9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -34,10 +34,8 @@ register_rulegroup("checkparams", _("Parameters for Inventorized Checks"), group = "checkparams" subgroup_networking = _("Networking") -# subgroup_windows = _("Windows") subgroup_storage = _("Storage, Filesystems and Files") subgroup_os = _("Operating System Resources") -# subgroup_time = _("Time synchronization") subgroup_printing = _("Printers") subgroup_environment = _("Temperature, Humidity, etc.") subgroup_applications = _("Applications, Processes & Services") @@ -1624,6 +1622,57 @@ register_check_parameters( ) register_check_parameters( + subgroup_applications, + "esx_vsphere_objects", + _("State of ESX hosts and virtual machines"), + Dictionary( + help = _("Usually the check goes to WARN if a VM or host is powered off and OK otherwise. " + "You can change this behaviour on a per-state-base here."), + optional_keys = False, + elements = [ + ( "states", + Dictionary( + title = _("Target states"), + optional_keys = False, + elements = [ + ( "poweredOn", + MonitoringState( + title = _("Powered ON"), + help = _("Check result if the host or VM is powered on"), + default_value = 0, + ) + ), + ( "poweredOff", + MonitoringState( + title = _("Powered OFF"), + help = _("Check result if the host or VM is powered off"), + default_value = 1, + ) + ), + ( "suspended", + MonitoringState( + title = _("Suspended"), + help = _("Check result if the host or VM is suspended"), + default_value = 1, + ) + ), + ] + ) + ), + ] + ), + TextAscii( + title = _("Name of the VM/HostSystem"), + help = _("Please do not forget to specify either <tt>VM</tt> or <tt>HostSystem</tt>. Example: <tt>VM abcsrv123</tt>. Also note, " + "that we match the <i>beginning</i> of the name."), + regex = "(^VM|HostSystem)( .*|$)", + regex_error = _("The name of the system must begin with <tt>VM</tt> or <tt>HostSystem</tt>."), + allow_empty = False, + ), + "dict", +) + +register_check_parameters( subgroup_printing, "printer_supply", _("Printer cardridge levels"),

11 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013