Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

Check_MK Git: check_mk: New feature of hiding certain actions from the commands in the status GUI

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7aa633cbd191d7e7b7b6008869825d1ec9763348 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aa633cbd191d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 15:23:50 2012 +0200 New feature of hiding certain actions from the commands in the status GUI --- ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 5 +++-- mkeventd/web/plugins/views/mkeventd.py | 4 ++-- mkeventd/web/plugins/wato/mkeventd.py | 9 +++++++++ 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765d398..f6ab0b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Moved source of Event Console into Check_MK project * New button for resetting all rule hits counters * When saving a rule then its hits counter is always reset + * New feature of hiding certain actions from the commands in the status GUI Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 7868eb9..6994caa 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -66,13 +66,14 @@ def service_levels(): except: return [(0, "(no service level)")] -def action_choices(): +def action_choices(omit_hidden = False): # The possible actions are configured in mkeventd.mk, # not in multisite.mk (like the service levels). That # way we have not direct access to them but need # to load them from the configuration. return [ (a["id"], a["title"]) - for a in eventd_configuration().get("actions", []) ] + for a in eventd_configuration().get("actions", []) + if not omit_hidden or not a.get("hidden") ] cached_config = None def eventd_configuration(): diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index de458c6..c8c0873 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -639,12 +639,12 @@ if mkeventd_enabled: [ "user", "admin" ]) def render_mkeventd_actions(): - for action_id, title in mkeventd.action_choices(): + for action_id, title in mkeventd.action_choices(omit_hidden = True): html.button("_action_" + action_id, title) html.write(" ") def command_mkeventd_action(cmdtag, spec, row): - for action_id, title in mkeventd.action_choices(): + for action_id, title in mkeventd.action_choices(omit_hidden = True): if html.var("_action_" + action_id): return "ACTION;%s;%s;%s" % (row["event_id"], config.user_id, action_id), \ (_("execute that action "%s&quot") % title) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 84a5fc2..0ba0fa1 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -103,6 +103,15 @@ vs_mkeventd_actions = \ label = _("Current disable execution of this action"), ) ), + ( "hidden", + Checkbox( + title = _("Hide from Status GUI"), + label = _("Do not offer this action as a command on open events"), + help = _("If you enabled this option, then this action will not " + "be available as an interactive user command. It is usable " + "as an ad-hoc action when a rule fires, nevertheless."), + ), + ), ( "action", CascadingDropdown( title = _("Type of Action"),

11 years, 11 months

Check_MK Git: check_mk: Added missing icon for Event Console

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 737c3f007c7ca06c215e1974e0b3338ba6de1675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=737c3f007c7ca0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 14:55:48 2012 +0200 Added missing icon for Event Console --- mkeventd/web/htdocs/images/icon_resetcounters.png | Bin 0 -> 2484 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mkeventd/web/htdocs/images/icon_resetcounters.png b/mkeventd/web/htdocs/images/icon_resetcounters.png new file mode 100644 index 0000000..321e824 Binary files /dev/null and b/mkeventd/web/htdocs/images/icon_resetcounters.png differ

11 years, 11 months

Check_MK Git: check_mk: Event Console: allow to reset rule hit counters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c9a91d8ae3c38a329c0cc95b7a1fdd0058d8a092 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9a91d8ae3c38a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 14:55:26 2012 +0200 Event Console: allow to reset rule hit counters --- ChangeLog | 2 ++ mkeventd/bin/mkeventd | 22 ++++++++++++++++++++++ mkeventd/web/plugins/wato/mkeventd.py | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aa7cbc..e2babc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ Event Console: * Moved source of Event Console into Check_MK project + * New button for resetting all rule hits counters + * When saving a rule then its hits counter is always reset Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 373c198..de491f5 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1291,6 +1291,8 @@ class StatusServer: self.handle_command_flush() elif command == "SYNC": self.handle_command_sync() + elif command == "RESETCOUNTERS": + self.handle_command_resetcounters(arguments) elif command == "UPDATE": self.handle_command_update(arguments) elif command == "CHANGESTATE": @@ -1351,6 +1353,16 @@ class StatusServer: def handle_command_sync(self): g_event_status.save_status() + def handle_command_resetcounters(self, arguments): + if arguments: + rule_id = arguments[0] + log("Resetting counters of rule " + rule_id) + else: + rule_id = None # Reset all rule counters + log("Resetting all rule counters") + g_event_status.reset_counters(rule_id) + + def handle_command_action(self, arguments): with lock_configuration: event_id, user, action_id = arguments @@ -1594,6 +1606,16 @@ class EventStatus(): elapsed = time.time() - now log("Saved event state to %s in %.3fms." % (path, elapsed * 1000)) + def reset_counters(self, rule_id): + if rule_id: + if rule_id in self._rule_stats: + del self._rule_stats[rule_id] + else: + self._rule_stats = {} + self.save_status() + + + def load_status(self): path = g_state_dir + "/status" if os.path.exists(path): diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 2c5bff9..84a5fc2 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -695,6 +695,8 @@ def mode_mkeventd_rules(phase): mkeventd_changes_button() if config.may("mkeventd.edit"): html.context_button(_("New Rule"), make_link([("mode", "mkeventd_edit_rule")]), "new") + html.context_button(_("Reset Counters"), + make_action_link([("mode", "mkeventd_rules"), ("_reset_counters", "1")]), "resetcounters") return rules = load_mkeventd_rules() @@ -720,6 +722,17 @@ def mode_mkeventd_rules(phase): else: return + elif html.has_var("_reset_counters"): + c = wato_confirm(_("Confirm counter reset"), + _("Do you really want to reset all Hits counters to zero?")) + if c: + mkeventd.query("COMMAND RESETCOUNTERS") + log_mkeventd("counter-reset", _("Resetted all rule hit counters to zero")) + elif c == False: + return "" + else: + return + if html.check_transaction(): if html.has_var("_move"): @@ -931,6 +944,8 @@ def mode_mkeventd_edit_rule(phase): log_mkeventd("new-rule", _("Created new event corelation rule with id %s" % rule["id"])) else: log_mkeventd("edit-rule", _("Modified event corelation rule %s" % rule["id"])) + # Reset hit counters of this rule + mkeventd.query("COMMAND RESETCOUNTERS;" + rule["id"]) return "mkeventd_rules"

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 132fee613922729778ed1262abe24b6913a6e675 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=132fee61392272… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 14:55:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Removed debug output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 903924c3afdfe42bb0198f32a4c8fa340f931f8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=903924c3afdfe4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 8 14:38:35 2012 +0200 Removed debug output --- checks/mssql_counters | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/mssql_counters b/checks/mssql_counters index 7f21ba5..6d5e1b6 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -145,7 +145,6 @@ check_info['mssql_counters.transactions'] = { } def check_mssql_counters_locks(item, params, info): - print params state = 0 output = [] perfdata = []

11 years, 11 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 040c04d7391a70837747cdce0fbf99babb23ae38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040c04d7391a70… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 8 14:38:38 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: New check mssql_counters.locks:

by git＠mathias-kettner.de

Monitors locking related information of MSSQL tablespaces User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 272401a081805ef6d3cc91f05dbd6b3af1ebc2b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=272401a081805e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 8 14:37:30 2012 +0200 New check mssql_counters.locks: Monitors locking related information of MSSQL tablespaces --- ChangeLog | 4 ++ checkman/mssql_counters.locks | 27 ++++++++++++ checks/mssql_counters | 53 ++++++++++++++++++++++- web/plugins/wato/check_parameters.py | 77 +++++++++++++++++++++++++++------ 4 files changed, 145 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff32f6c..6e22772 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,10 @@ * FIX: Implemented basic non HTTP 200 status code response handling in interactive progress dialogs (e.g. bulk inventory mode) * Users & Contacts: Case-insensitive sorting of 'Full name' column + + Checks & Agents: + * New check mssql_counters.locks: Monitors locking related information of + MSSQL tablespaces 1.2.0p3: Mulitisite diff --git a/checkman/mssql_counters.locks b/checkman/mssql_counters.locks new file mode 100644 index 0000000..f4bcaa5 --- /dev/null +++ b/checkman/mssql_counters.locks @@ -0,0 +1,27 @@ +title: Checks locks per second in MSSQL tablespaces +agents: windows +author: Lars Michelsen <lm(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check monitors locking related information of MSSQL tablespaces + like for example the number of deadlocks per second or lock requests. + + The check has been developed with MSSQL Server 2008 R2 but should + work with other versions too. + + This check needs the Check_MK mssql.vbs plugin installed in + the agent. Please refer to the online documentation + for how to install that plugin. + +item: + The MSSQL instance name and the tablespace name separated by a space. + +perfdata: + lock_requests/sec(int): Number of requested locks per second. + lock_timeouts/sec(int): Number of lock timeouts per second. + number_of_deadlocks/sec(int): Number of deadlocks per second. + lock_waits/sec(int): Number of lock waits per second. + +inventory: + One separate check for each tablespace will be created. diff --git a/checks/mssql_counters b/checks/mssql_counters index 49f86d2..7f21ba5 100644 --- a/checks/mssql_counters +++ b/checks/mssql_counters @@ -49,7 +49,7 @@ def mssql_counters_item(line, add_counter_name): else: return obj + ' ' + instance -def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name): +def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name, dflt = None): inventory = [] for line in info: if line[1] in want_counters: @@ -65,7 +65,7 @@ def inventory_mssql_counters(info, want_counters, perc_w_base, add_counter_name) if base == 0.0: continue # Skip counters where base is "0" - inventory.append((mssql_counters_item(line, add_counter_name), None)) + inventory.append((mssql_counters_item(line, add_counter_name), dflt)) return inventory # @@ -144,6 +144,55 @@ check_info['mssql_counters.transactions'] = { 'has_perfdata': True, } +def check_mssql_counters_locks(item, params, info): + print params + state = 0 + output = [] + perfdata = [] + for line in info: + if mssql_counters_item(line, False) != item: + continue + + for counter, label in [ + ('lock_requests/sec', 'Requests'), + ('lock_timeouts/sec', 'Timeouts'), + ('number_of_deadlocks/sec', 'Deadlocks'), + ('lock_waits/sec', 'Waits'), + ]: + if line[1] == counter: + prob_txt = '' + value = float(line[-1]) + + p = params.get(counter) + if p: + warn, crit = p + if value > crit: + state = max(state, 1) + prob_txt = ' (!)' + elif value > warn: + state = max(state, 2) + prob_txt = ' (!!)' + else: + warn, crit = None, None + + output.append('%s: %d/s%s' % (label, value, prob_txt)) + perfdata.append((counter, value, warn, crit)) + + if output: + return (state, '%s - %s' % (nagios_state_names[state], ', '.join(output)), perfdata) + else: + return (3, 'UNKNOWN - Counters %s could not be found in agent output' % (item)) + +check_info['mssql_counters.locks'] = { + 'check_function': check_mssql_counters_locks, + 'inventory_function': lambda info: inventory_mssql_counters(info, + [ 'number_of_deadlocks/sec', 'lock_requests/sec', 'lock_timeouts/sec', 'lock_waits/sec' ], + False, False, {}), + 'service_description': "%s Locks", + 'has_perfdata': True, + 'group': 'mssql_counters_locks', +} + # # File Sizes # diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1a65a74..4cc68e9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1072,31 +1072,80 @@ checkgroups.append(( subgroup_applications, "mssql_backup", _("MSSQL Backups"), - Alternative( + Optional( + Tuple( + elements = [ + Integer(title = _("Warning if more than"), unit = _("seconds")), + Integer(title = _("Critical if more than"), unit = _("seconds")) + ] + ), + title = _("Specify time since last successful backup"), help = _("The levels for memory usage on Linux and UNIX systems take into account the " "currently used memory (RAM or SWAP) by all processes and sets this in relation " "to the total RAM of the system. This means that the memory usage can exceed 100%. " "A usage of 200% means that the total size of all processes is twice as large as " "the main memory, so at least the half of it is currently swapped out."), - elements = [ - FixedValue( - None, - totext = '', - title = _("Don't use any threshold. Just collect the information.")), - Tuple( - title = _("Specify time since last successful backup"), - elements = [ - Integer(title = _("Warning if more than"), unit = _("seconds")), - Integer(title = _("Critical if more than"), unit = _("seconds")) - ] - ) - ] ), TextAscii( title = _("Service descriptions"), allow_empty = False), None)) +checkgroups.append(( + subgroup_applications, + "mssql_counters_locks", + _("MSSQL Locks"), + Dictionary( + help = _("This check monitors locking related information of MSSQL tablespaces."), + elements = [ + ("lock_requests/sec", + Tuple( + title = _("Lock Requests / sec"), + help = _("Number of new locks and lock conversions per second requested from the lock manager."), + elements = [ + Float(title = _("Warning at"), unit = _("requests/sec")), + Float(title = _("Critical at"), unit = _("requests/sec")), + ], + ), + ), + ( "lock_timeouts/sec", + Tuple( + title = _("Lock Timeouts / sec"), + help = _("Number of lock requests per second that timed out, including requests for NOWAIT locks."), + elements = [ + Float(title = _("Warning at"), unit = _("timeouts/sec")), + Float(title = _("Critical at"), unit = _("timeouts/sec")), + ], + ), + ), + ( "number_of_deadlocks/sec", + Tuple( + title = _("Number of Deadlocks / sec"), + help = _("Number of lock requests per second that resulted in a deadlock."), + elements = [ + Float(title = _("Warning at"), unit = _("deadlocks/sec")), + Float(title = _("Critical at"), unit = _("deadlocks/sec")), + ], + ), + ), + ( "lock_waits/sec", + Tuple( + title = _("Lock Waits / sec"), + help = _("Number of lock requests per second that required the caller to wait."), + elements = [ + Float(title = _("Warning at"), unit = _("waits/sec")), + Float(title = _("Critical at"), unit = _("waits/sec")), + ], + ), + ), + ] + ), + TextAscii( + title = _("Service descriptions"), + allow_empty = False + ), + None)) + checkgroups.append(( subgroup_applications,

11 years, 11 months

Check_MK Git: check_mk: FIX: fix layout bug in ValueSpec ListOfStrings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 973f15996d38e87c25d4eb1b693f6206ce77abdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=973f15996d38e8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 14:19:46 2012 +0200 FIX: fix layout bug in ValueSpec ListOfStrings Conflicts: ChangeLog --- ChangeLog | 7 +++++++ web/htdocs/check_mk.css | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff32f6c..9aa7cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,13 @@ * Added "profile" option to be configurable via browser * FIX: It is now possible to create clusters in empty folders * FIX: Fixed problem with complaining empty ListOf() valuespecs + * FIX: Users & Contacts uses case-insensitive sorting of 'Full name' column + * FIX: Removed focus of "Full name" attribute on editing a contact + * FIX: fix layout bug in ValueSpec ListOfStrings (e.g. used in + list of explicit host/services in rules) + + BI: + * FIX: Correct representation of (!), (!!) and (?) markers in check output Livestatus * FIX: comments_with_info in service table was always empty diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index d6301e4..7a28caa 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -435,6 +435,10 @@ table.valuespec_listof option[selected] { font-weight: bold; } +div.listofstring.horizontal { + clear: left; +} + div.listofstrings > div { margin-bottom: 2px; } @@ -444,7 +448,7 @@ div.listofstrings.horizontal > div { margin-right: 2px; } div.listofstrings.horizontal > div:last-child { - float: none; + /* float: none; */ } table.listchoice {

11 years, 11 months

Check_MK Git: check_mk: Cleanup doc of event console

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee3c9e3a8a06653132951748e7cbf5b684add3c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee3c9e3a8a0665… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 8 12:54:58 2012 +0200 Cleanup doc of event console --- .../doc/treasures => doc/mkeventd}/query_events | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mkeventd/doc/treasures/query_events b/doc/mkeventd/query_events similarity index 100% rename from mkeventd/doc/treasures/query_events rename to doc/mkeventd/query_events

11 years, 11 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ecda1caf8175533d63fef4e674dba7abba2a5c96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecda1caf817553… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Oct 5 21:00:44 2012 +0200 Add new bug entry --- .bugs/804 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/804 b/.bugs/804 new file mode 100644 index 0000000..5d5a722 --- /dev/null +++ b/.bugs/804 @@ -0,0 +1,12 @@ +Title: DRBD check should allow configurable alert level for flipped roles +Component: checks +State: open +Date: 2012-10-05 20:29:21 +Targetversion: future +Class: bug + +The check for DRBD status also keeps an eye on the roles of the DR:BD +nodes. If the primary and secondary roles switch on both nodes, +the check will go to critical for historical reasons. +For many people it would only be considered a WARNING or even OK assuming that +the primary is working and serving requests.

11 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits