Checkmk git commits March 2014

checkmk-commits@lists.checkmk.com

6 participants
183 discussions

Check_MK Git: check_mk: INV: add scanners for various windows SW sources

by Mathias Kettner

Module: check_mk Branch: master Commit: 401b83ed11124698959f5ef0ee42adb4a322ec0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=401b83ed111246… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 15:31:46 2014 +0100 INV: add scanners for various windows SW sources --- inventory/win_exefiles | 48 +++++++++++++++++++++++++++++++++++++ inventory/win_reg_uninstall | 48 +++++++++++++++++++++++++++++++++++++ inventory/win_wmi_software | 51 ++++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 12 ++++++---- 4 files changed, 155 insertions(+), 4 deletions(-) diff --git a/inventory/win_exefiles b/inventory/win_exefiles new file mode 100644 index 0000000..dcc0826 --- /dev/null +++ b/inventory/win_exefiles @@ -0,0 +1,48 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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 output +# <<<win_exefiles:sep(124)>>> +# C:\Program Files\Common Files\Microsoft Shared\MSInfo\msinfo32.exe|378880 +# C:\Program Files\Common Files\Microsoft Shared\OFFICE15\CMigrate.exe|6847704 +# C:\Program Files\Common Files\Microsoft Shared\OFFICE15\MSOXMLED.EXE|217200 +# C:\Program Files\Common Files\Microsoft Shared\OfficeSoftwareProtectionPlatform\OSPPSVC.EXE|5132888 + +def inv_win_exefiles(info): + paclist = inv_tree("software.packages:") + for path, size in info: + parts = path.split('\\') + entry = { + "name" : path, + "package_type" : "exe", + "size" : int(size), + } + paclist.append(entry) + + +inv_info['win_exefiles'] = { + "inv_function" : inv_win_exefiles, +} diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall new file mode 100644 index 0000000..c437a5e --- /dev/null +++ b/inventory/win_reg_uninstall @@ -0,0 +1,48 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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 output +# <<<win_reg_uninstall:sep(124)>>> +# AddressBook +# AFPL Ghostscript 8.54 +# AFPL Ghostscript Fonts +# Connection Manager +# DirectDrawEx +# F-Secure Anti-Spyware + +def inv_win_reg_uninstall(info): + paclist = inv_tree("software.packages:") + for line in info: + entry = { + "name" : line[0], + "package_type" : "reg_uninstall", + } + paclist.append(entry) + + +inv_info['win_reg_uninstall'] = { + "inv_function" : inv_win_reg_uninstall, +} diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software new file mode 100644 index 0000000..01eb091 --- /dev/null +++ b/inventory/win_wmi_software @@ -0,0 +1,51 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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 output +# <<<win_wmi_software:sep(124)>>> +# 64 Bit HP CIO Components Installer|Hewlett-Packard|15.2.1 +# Adobe Flash Player 12 ActiveX|Adobe Systems Incorporated|12.0.0.70 +# Microsoft Visio 2010 Interactive Guide DEU|Microsoft|1.2.1 +# Microsoft Outlook 2010 Interactive Guide DEU|Microsoft|1.2.1 +# VMware vSphere Client 4.1|VMware, Inc.|4.1.0.17435 +# Microsoft Office Professional Plus 2010|Microsoft Corporation|14.0.7015.1000 + + +def inv_win_wmi_software(info): + paclist = inv_tree("software.packages:") + for pacname, vendor, version in info: + entry = { + "name" : pacname, + "version" : version, + "vendor" : vendor, + "package_type" : "wmi", + } + paclist.append(entry) + + +inv_info['win_wmi_software'] = { + "inv_function" : inv_win_wmi_software, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 8343c4c..50531e8 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -503,11 +503,14 @@ def inv_paint_bytes(b): return "number", "%d %s" % (b, units[i]) def inv_paint_count(b): - return "number", str(b) + if b == None: + return "", "" + else: + return "number", str(b) def inv_paint_bytes_rounded(b): if b == None: - return "", _("unknown") + return "", "" elif b == 0: return "number", "0" @@ -519,9 +522,9 @@ def inv_paint_bytes_rounded(b): fac = fac / 1024.0 if i: - return "number", "%.2f %s" % (b / fac, units[i]) + return "number", "%.2f %s" % (b / fac, units[i]) else: - return "number", "%d %s" % (b, units[0]) + return "number", "%d %s" % (b, units[0]) def inv_paint_volt(volt): return "number", "%.1f V" % volt @@ -568,6 +571,7 @@ inventory_displayhints.update({ ".software.packages:*.summary" : { "title" : _("Description"), }, ".software.packages:*.version" : { "title" : _("Version"), }, ".software.packages:*.package_version" : { "title" : _("Package Version"), }, + ".software.packages:*.size" : { "title" : _("Size"), "paint" : "count" }, }) # TEST: create painters for node with a display hint

10 years, 3 months

Check_MK Git: check_mk: INV: Omit None-text for empty columns

by Mathias Kettner

Module: check_mk Branch: master Commit: 1a2a5bf9022f99f438a732f8a3d01b7416eb6312 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a2a5bf9022f99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 15:09:42 2014 +0100 INV: Omit None-text for empty columns --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 8b93819..8343c4c 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -377,7 +377,7 @@ def render_inv_subtree_leaf(hostname, invpath, node): html.write(str(node)) elif type(node) == float: html.write("%.2f" % node) - else: + elif node != None: html.write(str(node)) html.write("<br>")

10 years, 3 months

Check_MK Git: check_mk: INV: fixed software search

by Mathias Kettner

Module: check_mk Branch: master Commit: 61933627233a6ec3887ed9ee666705219c64e427 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61933627233a6e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 11:51:02 2014 +0100 INV: fixed software search --- web/plugins/views/inventory.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index cdbafdd..8b93819 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -677,14 +677,13 @@ def inv_software_table(columns, add_headers, only_sites, limit, filters): header = filt.filter("invswpacs") if not header.startswith("Sites:"): filter_code += header - host_columns = filter(lambda c: c.startswith("host_"), columns) - columns = [ "name" ] + columns + host_columns = [ "host_name" ] + filter(lambda c: c.startswith("host_"), columns) html.live.set_only_sites(only_sites) html.live.set_prepend_site(True) query = "GET hosts\n" - query += "Columns: " + (" ".join(columns)) + "\n" + query += "Columns: " + (" ".join(host_columns)) + "\n" query += filter_code if config.debug_livestatus_queries \ @@ -700,7 +699,7 @@ def inv_software_table(columns, add_headers, only_sites, limit, filters): html.live.set_prepend_site(False) html.live.set_only_sites(None) - headers = [ "site" ] + columns + headers = [ "site" ] + host_columns # Now create big table of all software packages of these hosts rows = [] @@ -754,7 +753,7 @@ class FilterSWPacsVersion(Filter): html.write(_("Min. Version:")) html.text_input(self.htmlvars[0], size = 9) html.write("   ") - html.write(_("Max. Vers.:")) + html.write(_("Max. Version:")) html.text_input(self.htmlvars[1], size = 9) def filter_table(self, rows): @@ -796,12 +795,12 @@ def declare_swpacs_columns(name, title, sortfunc): for name, title, sortfunc in [ - ( "name", _("Name"), cmp ), - ( "summary", _("Summary"), cmp ), - ( "arch", _("CPU Architecture"), cmp ), - ( "package_type", _("Type"), cmp ), - ( "version", _("Version"), cmp_version ), - ( "package_version", _("Package Version"), cmp_version ), + ( "name", _("Name"), cmp ), + ( "summary", _("Summary"), cmp ), + ( "arch", _("CPU Architecture"), cmp ), + ( "package_type", _("Type"), cmp ), + ( "version", _("Version"), cmp_version ), + ( "package_version", _("Package Version"), cmp_version ), ]: declare_swpacs_columns(name, title, sortfunc) @@ -811,7 +810,7 @@ for name, title, sortfunc in [ multisite_datasources["invswpacs"] = { "title" : _("Inventory: Software Packages"), "table" : inv_software_table, - "infos" : [ "host", "invswpacs" ], + "infos" : [ "host", "invswpac" ], "keys" : [], "idkeys" : [], }

10 years, 3 months

Check_MK Git: check_mk: Added HW/SW-Inventory as a git bug component

by Mathias Kettner

Module: check_mk Branch: master Commit: 44e7cdef1cbc445e273a4fe44812825c9a46c35f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44e7cdef1cbc44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 11:34:11 2014 +0100 Added HW/SW-Inventory as a git bug component --- .bugs/config | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.bugs/config b/.bugs/config index 85f22ca..05d7372 100644 --- a/.bugs/config +++ b/.bugs/config @@ -8,16 +8,17 @@ states = { } components = [ - ( "core", "Core Modules, Setup, etc." ), - ( "checks", "Checks and Agent plugins" ), - ( "multisite", "Multisite GUI" ), + ( "core", "Core Modules, Setup, etc." ), + ( "checks", "Checks and Agent plugins" ), + ( "multisite", "Multisite GUI" ), ( "livestatus", "Livestatus" ), - ( "ec", "Event Console" ), - ( "livecheck", "Livecheck part in Livestatus, livecheck helper" ), - ( "wato", "Check_MK's Web Administration Tool" ), - ( "bi", "BI - Business Intelligence" ), - ( "mobile", "Multisite Mobile GUI" ), - ( "docu", "Documentation "), + ( "ec", "Event Console" ), + ( "inv", "Hardware/Software-Inventory" ), + ( "livecheck", "Livecheck part in Livestatus, livecheck helper" ), + ( "wato", "Check_MK's Web Administration Tool" ), + ( "bi", "BI - Business Intelligence" ), + ( "mobile", "Multisite Mobile GUI" ), + ( "docu", "Documentation "), ] classes = [

10 years, 3 months

Check_MK Git: check_mk: INV: Fixed numeric filters

by Mathias Kettner

Module: check_mk Branch: master Commit: 3932d664eb38bc2d18b8b4e7c16d4866c657cb80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3932d664eb38bc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 11:33:07 2014 +0100 INV: Fixed numeric filters --- web/plugins/views/inventory.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 01ba452..cdbafdd 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -279,7 +279,7 @@ def declare_inv_column(invpath, datatype, title, short = None): filter_info = inv_filter_info.get(datatype, {}) declare_filter(800, FilterInvFloat(name, invpath, title, unit = filter_info.get("unit"), - scale = filter_info.get("scale"))) + scale = filter_info.get("scale", 1.0))) # Tree painter

10 years, 3 months

Check_MK Git: check_mk: RBN: Fix exception when a user is saving a new rule

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d501436171ccd54a120efff90cc707428d0c785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d501436171ccd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 11:21:36 2014 +0100 RBN: Fix exception when a user is saving a new rule --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f4784eb..bc9cf2f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -257,7 +257,7 @@ def page_handler(): html.set_var("mode", newmode) # will be used by makeuri # Check general permissions for the new mode - if not config.may("wato.seeall"): + if modeperms != None and not config.may("wato.seeall"): for pname in modeperms: if '.' not in pname: pname = "wato." + pname

10 years, 3 months

Check_MK Git: check_mk: RBN: add optional comment field

by Mathias Kettner

Module: check_mk Branch: master Commit: e34daaa6205e376e8dda956358a8e081d6360b54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e34daaa6205e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 18 10:05:38 2014 +0100 RBN: add optional comment field --- web/htdocs/wato.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 71e246b..f4784eb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7472,6 +7472,13 @@ def vs_notification_rule(userid = None): attrencode = True, allow_empty = False, )), + ( "comment", + TextAreaUnicode( + title = _("Comment"), + help = _("An optional comment that explains the purpose of this rule."), + rows = 5, + ) + ), ( "disabled", Checkbox( title = _("Rule activation"), @@ -7730,7 +7737,7 @@ def vs_notification_rule(userid = None): "match_sl", "match_host_event", "match_service_event", "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails" ], headers = [ - ( _("General Properties"), [ "description", "disabled", "allow_disable" ] ), + ( _("General Properties"), [ "description", "comment", "disabled", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ @@ -7988,7 +7995,8 @@ def mode_notifications(phase): "one <a href=\"%s\">here</a>.") % url) if show_bulks: - render_bulks(only_ripe = False) # Warn if there are unsent bulk notificatios + if not render_bulks(only_ripe = False): # Warn if there are unsent bulk notificatios + html.message(_("Currently there are no unsent notification bulks pending.")) else: render_bulks(only_ripe = True) # Warn if there are unsent bulk notificatios @@ -8118,6 +8126,9 @@ def render_bulks(only_ripe): if len(uuids) >= maxcount: html.icon(_("Number of notifications exceeds maximum allowed number"), "warning") table.end() + return True + else: + return False

10 years, 3 months

Check_MK Git: check_mk: BI aggregates now acknowledgement information

by Mathias Kettner

Module: check_mk Branch: master Commit: babfd065300b0a242f6e779a33403b77d835724c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=babfd065300b0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 17 17:33:06 2014 +0100 BI aggregates now acknowledgement information Check_MK BI now also aggregates the information wether problems that make the aggregate non-OK are acknowledged. Please refer to the updated <a href="checkmk_bi.html">documentation about BI</a> for details. --- .werks/715 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 24 ++++++++++++++++++++++-- web/plugins/views/bi.py | 2 ++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/.werks/715 b/.werks/715 new file mode 100644 index 0000000..e15fb26 --- /dev/null +++ b/.werks/715 @@ -0,0 +1,11 @@ +Title: BI aggregates now acknowledgement information +Level: 2 +Component: bi +Version: 1.2.5i1 +Date: 1395073928 +Class: feature + +Check_MK BI now also aggregates the information wether problems that make the aggregate +non-OK are acknowledged. Please refer to the updated <a href="checkmk_bi.html">documentation +about BI</a> for details. + diff --git a/ChangeLog b/ChangeLog index b962247..0037d89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -334,6 +334,7 @@ BI: * 0721 Use hard states in BI aggregates... * 0714 BI aggregations now also honor scheduled downtimes... + * 0715 BI aggregates now acknowledgement information... * 0669 FIX: Fixed regex matching in BI when using character groups [...]... Reporting & Availability: diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 8fda93a..aac8a89 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1107,13 +1107,22 @@ def execute_rule_node(node, status_info, use_hard_states): node_states = [] assumed_states = [] downtime_states = [] + ack_states = [] # Needed for computing the acknowledgement of non-OK nodes one_assumption = False for n in node["nodes"]: result = execute_node(n, status_info, use_hard_states) # state, assumed_state, node [, subtrees] subtrees.append(result) - # Assume items in downtime as CRIT + + # Assume items in downtime as CRIT when computing downtime state downtime_states.append(({"state": result[0]["in_downtime"] and 2 or 0, "output" : ""}, result[2])) + # Assume non-OK nodes that are acked as OK + if result[0]["acknowledged"]: + acked_state = 0 + else: + acked_state = result[0]["state"] + ack_states.append(({"state": acked_state, "output" : ""}, result[2])) + node_states.append((result[0], result[2])) if result[1] != None: assumed_states.append((result[1], result[2])) @@ -1125,9 +1134,16 @@ def execute_rule_node(node, status_info, use_hard_states): downtime_state = func(*([downtime_states] + funcargs)) state = func(*([node_states] + funcargs)) state["in_downtime"] = downtime_state["state"] >= 2 + if state["state"] > 0: # Non-OK-State -> compute acknowledgedment + ack_state = func(*([ack_states] + funcargs)) + state["acknowledged"] = ack_state["state"] == 0 # would be OK if acked problems would be OK + else: + state["acknowledged"] = False + if one_assumption: assumed_state = func(*([assumed_states] + funcargs)) assumed_state["in_downtime"] = state["in_downtime"] + assumed_state["acknowledged"] = state["acknowledged"] else: assumed_state = None return (state, assumed_state, node, subtrees) @@ -1529,7 +1545,7 @@ def render_tree_foldable(row, boxes, omit_root, expansion_level, only_problems, return "aggrtree" + (boxes and "_box" or ""), htmlcode def aggr_render_node(tree, title, mousecode, show_host): - + # Check if we have an assumed state: comparing assumed state (tree[1]) with state (tree[0]) if tree[1] and tree[0] != tree[1]: addclass = " " + _("assumed") @@ -1542,6 +1558,10 @@ def aggr_render_node(tree, title, mousecode, show_host): title = ('<img class="icon bi" src="images/icon_downtime.png" title="%s">' % \ _("This element is currently in a scheduled downtime")) + title + if tree[0]["acknowledged"]: + title = ('<img class="icon bi" src="images/icon_ack.png" title="%s">' % \ + _("This problem has been acknowledged")) + title + h = '<span class="content state state%d%s">%s</span>\n' \ % (effective_state["state"], addclass, render_bi_state(effective_state["state"])) if mousecode: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 9a89b2c..a335f1c 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -80,6 +80,8 @@ def paint_bi_icons(row): html.icon_button(avail_url, _("Analyse availability of this aggregation"), "availability") if row["aggr_effective_state"]["in_downtime"]: html.icon(_("This aggregation is currently in a scheduled downtime"), "downtime") + if row["aggr_effective_state"]["acknowledged"]: + html.icon(_("The critical problems that make this aggregation non-OK have been acknowledged"), "ack") code = html.drain() html.unplug() return "buttons", code

10 years, 3 months

Check_MK Git: check_mk: BI aggregations now also honor scheduled downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 7075b91027a8a9be530ca9c6efe7b42f89d55895 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7075b91027a8a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 17 17:10:47 2014 +0100 BI aggregations now also honor scheduled downtimes A BI aggregate now also aggregates the additional information wether it is in a scheduled downtime or not. Please refer to the updated <a href="checkmk_bi.html">documentation about BI</a> for details. --- .werks/714 | 10 ++++++ ChangeLog | 1 + web/htdocs/bi.css | 9 ++++- web/htdocs/bi.py | 71 ++++++++++++++++++++++++++++++------- web/plugins/views/availability.py | 25 +++++++++---- web/plugins/views/bi.py | 4 ++- 6 files changed, 100 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7075b91027…

10 years, 3 months

Check_MK Git: check_mk: fixed categorization of dell poweredge servers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 0bf581889b068e61ec607337745eeb2accff5acf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bf581889b068e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Mar 17 16:52:57 2014 +0100 fixed categorization of dell poweredge servers --- checkman/dell_poweredge_amperage.current | 2 +- checkman/dell_poweredge_amperage.power | 2 +- checkman/dell_poweredge_cpu | 2 +- checkman/dell_poweredge_mem | 2 +- checkman/dell_poweredge_pci | 2 +- checkman/dell_poweredge_status | 2 +- checkman/dell_poweredge_temp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/dell_poweredge_amperage.current b/checkman/dell_poweredge_amperage.current index 802451a..94adcfc 100644 --- a/checkman/dell_poweredge_amperage.current +++ b/checkman/dell_poweredge_amperage.current @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: Current agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_amperage.power b/checkman/dell_poweredge_amperage.power index 82c0641..025aab2 100644 --- a/checkman/dell_poweredge_amperage.power +++ b/checkman/dell_poweredge_amperage.power @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: Power Consumption agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_cpu b/checkman/dell_poweredge_cpu index 3e16658..2f0b23a 100644 --- a/checkman/dell_poweredge_cpu +++ b/checkman/dell_poweredge_cpu @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: CPU State agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_mem b/checkman/dell_poweredge_mem index cc1068a..d1bd2ba 100644 --- a/checkman/dell_poweredge_mem +++ b/checkman/dell_poweredge_mem @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: State of Memory Modules agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_pci b/checkman/dell_poweredge_pci index dfaf065..995f01f 100644 --- a/checkman/dell_poweredge_pci +++ b/checkman/dell_poweredge_pci @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: State of PCI Devices agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_status b/checkman/dell_poweredge_status index 1d8993d..4e118cff 100644 --- a/checkman/dell_poweredge_status +++ b/checkman/dell_poweredge_status @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: Global State agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description: diff --git a/checkman/dell_poweredge_temp b/checkman/dell_poweredge_temp index 1e52a15..4d0eed0 100644 --- a/checkman/dell_poweredge_temp +++ b/checkman/dell_poweredge_temp @@ -1,6 +1,6 @@ title: Dell PowerEdge Server: Temperature Sensors agents: snmp -catalog: hw/network/dell +catalog: hw/server/dell license: GPL distribution: check_mk description:

10 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2014