Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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: ccf763eddef16c097483c57db67d1b85a5211e32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccf763eddef16c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 12:50:19 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Finalized layout of view control buttons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70b0cd036901f66c28eaf159b96a238cbfbafcd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70b0cd036901f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 12:50:15 2012 +0200 Finalized layout of view control buttons --- ChangeLog | 1 + web/htdocs/images/contextlink_hi.png | Bin 928 -> 718 bytes web/htdocs/js/checkmk.js | 89 ++++++++++++++++++--------- web/htdocs/views.css | 113 +++++++++++++++++++++++++--------- web/htdocs/views.py | 69 +++++++++++---------- 5 files changed, 179 insertions(+), 93 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70b0cd0369…

12 years, 3 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b8a87f1af6a4554d9da8eb3578b8a028d36a54c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8a87f1af6a455… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 23 12:08:04 2012 +0200 Add new bug entry --- .bugs/712 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/712 b/.bugs/712 new file mode 100644 index 0000000..0c31da4 --- /dev/null +++ b/.bugs/712 @@ -0,0 +1,13 @@ +Title: WATO delete host does not trigger replication +Component: wato +State: open +Date: 2012-05-23 12:05:47 +Targetversion: 1.2.0 +Class: bug + +Report: +Eventueller Bug: + +Wird auf Kneipix ein Host mit WATO gelöscht, wird diese Änderung nicht auf Gruenix geschrieben. Erst bei einer neuen Änderungen über Kneipix wie z.B. anlegen eines Hosts auf Site Gruenix wird auch das Löschen des Hosts auf die Site Gruenix synchronisiert. + +Probable cause - the object is gone, so there's no changes to an object ;)

12 years, 3 months

Check_MK Git: check_mk: Checkmans: add missing manunal page for NFSexports

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4cc02f113b0e4c13ed6daad7e600f6bddcce2dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4cc02f113b0e4… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue May 22 11:32:02 2012 +0200 Checkmans: add missing manunal page for NFSexports --- checkman/nfsexports | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/checkman/nfsexports b/checkman/nfsexports new file mode 100644 index 0000000..64f7254 --- /dev/null +++ b/checkman/nfsexports @@ -0,0 +1,24 @@ +title: Check health of NFS mounts +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check validates NFS exports on a NFS file server. + It looks at exports defined both in /etc/exports (classic way) or exports + that are run-time defined using exportfs by a cluster management software. + It uses the native NFS toolset to query this information and should notice + errors in the NFS server daemons or portmapper. + + If you want to use this check then you will have to install the appropriate + agent plugin. + +item: + The name of the NFS export, which is the name of the exported filesystem. + +perfdata: + This check does not provide performance data. + +inventory: + All NFS exportss are found automatically. This is done + using showmount -e (not /proc)

12 years, 3 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: a3edfacb747b1b0f5528be1ffc74bcf0344af350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3edfacb747b1b… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 23 12:02:43 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0754

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03e52fd6ac308a2e8a1f773230a108149de195c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03e52fd6ac308a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 23 09:23:17 2012 +0200 Updated bug entries #0754 --- .bugs/754 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/754 b/.bugs/754 new file mode 100644 index 0000000..005920e --- /dev/null +++ b/.bugs/754 @@ -0,0 +1,9 @@ +Title: Dashboard is garbled in Safari (iPad) +Component: multisite +State: open +Date: 2012-05-23 09:22:40 +Targetversion: 1.2.0 +Class: bug + +On the iPad the dashlets seems to overflow. +The layout is garbled.

12 years, 3 months

Check_MK Git: check_mk: Changed icon for commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b54a6468e80b2df133ee4d8765edef0a7edee50e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b54a6468e80b2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 12:10:41 2012 +0200 Changed icon for commands --- web/htdocs/images/icon_commands.png | Bin 2981 -> 3919 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_commands.png b/web/htdocs/images/icon_commands.png index 78e3b20..22a9248 100644 Binary files a/web/htdocs/images/icon_commands.png and b/web/htdocs/images/icon_commands.png differ

12 years, 3 months

Check_MK Git: check_mk: New aggregation function count_ok

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 615e5a19e0d2764af0c1acf7dd19ce56e4e13236 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615e5a19e0d276… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 11:01:11 2012 +0200 New aggregation function count_ok --- ChangeLog | 4 ++++ web/htdocs/bi.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c9fe22..e293270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,10 @@ * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level + BI: + * New aggregation function count_ok, that counts the number + of nodes in state OK. + 1.2.0b4: Core: * New configuration variable snmp_timing, allowing to diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 943d3be..6d19aa2 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -868,6 +868,19 @@ def aggr_best(nodes, n = 1, worst_state = CRIT): config.aggregation_functions["worst"] = aggr_worst config.aggregation_functions["best"] = aggr_best +def aggr_countok(nodes, needed_for_ok=2, needed_for_warn=1): + states = [ i[0]["state"] for i in nodes ] + num_ok = len([s for s in states if s == 0 ]) + if num_ok >= int(needed_for_ok): + return { "state" : 0, "output" : "" } + elif num_ok >= int(needed_for_warn): + return { "state" : 1, "output" : "" } + else: + return { "state" : 2, "output" : "%r / %d" % (states, num_ok) } + +config.aggregation_functions["count_ok"] = aggr_countok + + import re def aggr_running_on(nodes, regex):

12 years, 3 months

Check_MK Git: check_mk: Hostgroup view BI Boxes omits the root level

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 58f9ba96324435964082952ad330ccc3dd0b24fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f9ba96324435… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 09:16:53 2012 +0200 Hostgroup view BI Boxes omits the root level --- ChangeLog | 2 ++ web/plugins/views/bi.py | 34 +++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39e0d63..5c9fe22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Multisite: * FIX: remove refresh button from dashboard. + * New display type 'boxes-omit-root' for BI views + * Hostgroup view BI Boxes omits the root level 1.2.0b4: Core: diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 771101f..12e3738 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -154,10 +154,11 @@ multisite_painter_options["aggr_treetype"] = { "title" : _("Type of tree layout"), "default" : "foldable", "values" : [ - ("foldable", _("foldable")), - ("boxes", _("boxes")), - ("bottom-up", _("bottom up")), - ("top-down", _("top down"))] + ("foldable", _("foldable")), + ("boxes", _("boxes")), + ("boxes-omit-root", _("boxes (omit root)")), + ("bottom-up", _("bottom up")), + ("top-down", _("top down"))] } multisite_painter_options["aggr_wrap"] = { @@ -275,7 +276,7 @@ def filter_tree_only_problems(tree): return state, assumed_state, node, new_subtrees -def paint_aggr_tree_foldable(row, boxes): +def paint_aggr_tree_foldable(row, boxes, omit_root=True): saved_expansion_level = bi.load_ex_level() treestate = weblib.get_tree_states('bi') expansion_level = int(get_painter_option("aggr_expand")) @@ -309,13 +310,14 @@ def paint_aggr_tree_foldable(row, boxes): leaf = "noleaf" mc = mousecode - h += '<span id="%d:%s" %s class="bibox_box %s %s state%s">' % ( - expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) - if is_leaf: - h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") - else: - h += tree[2]["title"].replace(" ", " ") - h += '</span> ' + if not omit_root or len(path) > 1: + h += '<span id="%d:%s" %s class="bibox_box %s %s state%s">' % ( + expansion_level, path_id, mc, leaf, is_open and "open" or "closed", state["state"]) + if is_leaf: + h += aggr_render_leaf(tree, show_host, bare = True) # .replace(" ", " ") + else: + h += tree[2]["title"].replace(" ", " ") + h += '</span> ' if not is_leaf: h += '<span class="bibox" style="%s">' % (not is_open and "display: none;" or "") @@ -421,9 +423,11 @@ def paint_aggr_tree_ltr(row, mirror): def paint_aggregated_tree_state(row): treetype = get_painter_option("aggr_treetype") if treetype == "foldable": - return paint_aggr_tree_foldable(row, boxes = False) + return paint_aggr_tree_foldable(row, boxes = False, omit_root = False) elif treetype == "boxes": - return paint_aggr_tree_foldable(row, boxes = True) + return paint_aggr_tree_foldable(row, boxes = True, omit_root = False) + elif treetype == "boxes-omit-root": + return paint_aggr_tree_foldable(row, boxes = True, omit_root = True) elif treetype == "bottom-up": return paint_aggr_tree_ltr(row, False) elif treetype == "top-down": @@ -441,7 +445,7 @@ multisite_painters["aggr_treestate_boxed"] = { "title" : _("Aggregation: simplistic boxed layout"), "short" : _("Tree"), "columns" : [ "aggr_treestate", "aggr_hosts" ], - "paint" : lambda row: paint_aggr_tree_foldable(row, boxes=True), + "paint" : lambda row: paint_aggr_tree_foldable(row, boxes = True, omit_root = True), } # _____ _ _ _

12 years, 3 months

Check_MK Git: check_mk: FIX: fix folding problems with dependent host tags

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b7429379202a47c8bbecf84a3973a2db8b18d701 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7429379202a47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 22 08:04:01 2012 +0200 FIX: fix folding problems with dependent host tags --- ChangeLog | 3 +++ web/htdocs/check_mk.css | 4 ++++ web/htdocs/forms.py | 14 +++++++------- web/htdocs/htmllib.py | 7 ++----- web/htdocs/js/checkmk.js | 40 +++++++++++++++++++++++++++++++++++----- web/htdocs/pages.css | 4 ++++ 6 files changed, 55 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 589bbb2..39e0d63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0b5: + WATO: + * FIX: fix folding problems with dependent host tags + Multisite: * FIX: remove refresh button from dashboard. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 8c12bcc..aa94eb2 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -285,6 +285,10 @@ ul.treeangle li { margin-left: 16px; padding-left: 20px; list-style: disc; + display: block; +} +ul.closed { + display: none; } diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 02dc244..8d71bb2 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -118,7 +118,7 @@ def header(title, isopen = True, table_id = ""): fold_id = strip_bad_chars(title) g_section_isopen = html.begin_foldable_container( html.form_name and html.form_name or "nform", fold_id, isopen, title, indent="nform") - html.write('<tr class=top style="display: %s"><td colspan=2></td></tr>' % (not g_section_isopen and "none" or "")) + html.write('<tr class="top %s"><td colspan=2></td></tr>' % (g_section_isopen and "open" or "closed")) g_header_open = True g_section_open = False @@ -127,8 +127,8 @@ def container(): global g_section_open if g_section_open: html.write('</td></tr>') - html.write('<tr style="display: %s"><td colspan=2 class=container>' % - (not g_section_isopen and "none" or "")) + html.write('<tr class="%s"><td colspan=2 class=container>' % + (g_section_isopen and "open" or "closed")) g_section_open = True def section(title = None, checkbox = None, id = "", simple=False): @@ -137,8 +137,8 @@ def section(title = None, checkbox = None, id = "", simple=False): html.write('</td></tr>') if id: id = ' id="%s"' % id - html.write('<tr style="display: %s"%s><td class="legend%s">' % - (not g_section_isopen and "none" or "", id, simple and " simple" or "")) + html.write('<tr class="%s"%s><td class="legend%s">' % + (g_section_isopen and "open" or "closed", id, simple and " simple" or "")) if title: html.write('<div class="title%s">%s<span class="dots">%s</span></div>' % (checkbox and " withcheckbox" or "", title, "."*100)) @@ -161,7 +161,7 @@ def end(): if g_section_open: html.write('</td></tr>') html.end_foldable_container() - html.write('<tr class=bottom style="display: %s"><td colspan=2></td></tr>' - % (not g_section_isopen and "none" or "")) + html.write('<tr class="bottom %s"><td colspan=2></td></tr>' + % (g_section_isopen and "open" or "closed")) html.write('</table>') diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c4b1808..511dca9 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1118,9 +1118,6 @@ class html: self.write('<tr class=heading><td id="nform.%s.%s" %s colspan=2>' % (treename, id, onclick)) self.write('%s</td></tr>' % title) else: - if indent == "form": - self.write('<table id="topic_%s" style="display:table" class="form nomargin"><tr%s><td class=title>' % \ - (id.encode("utf-8"), first and ' class="top"' or '')) self.write('<img align=absbottom class="treeangle" id="treeimg.%s.%s" ' 'src="images/tree_%s.png" %s>' % (treename, id, img_num, onclick)) @@ -1136,8 +1133,8 @@ class html: if indent == "form": self.write("</td></tr></table>") indent_style += "margin: 0; " - self.write('<ul class="treeangle" style="%s display: %s" id="tree.%s.%s">' % - (indent_style, (not isopen) and "none" or "block", treename, id)) + self.write('<ul class="treeangle %s" style="%s" id="tree.%s.%s">' % + (isopen and "open" or "closed", indent_style, treename, id)) # give caller information about current toggling state (needed for nform) return isopen diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 36392b8..8e6bdf3 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -796,21 +796,51 @@ function folding_step(oImg, state, step) { setTimeout(function() { folding_step(oImg, state, step); }, fold_steps[step]); } +/* Check if an element has a certain css class. */ +function has_class(o, cn) { + var parts = o.className.split(' '); + for (x=0; x<parts.length; x++) { + if (parts[x] == cn) + return true; + } + return false; +} + +function remove_class(o, cn) { + var parts = o.className.split(' '); + var new_parts = Array(); + for (x=0; x<parts.length; x++) { + if (parts[x] != cn) + new_parts.push(parts[x]); + } + o.className = new_parts.join(" "); +} + +function add_class(o, cn) { + o.className += " " + cn; +} + +function change_class(o, a, b) { + remove_class(o, a); + add_class(o, b); +} + + function toggle_tree_state(tree, name, oContainer) { var state; - if (oContainer.style.display == 'none') { - oContainer.style.display = ''; + if (has_class(oContainer, 'closed')) { + change_class(oContainer, 'closed', 'open'); state = 'on'; if (oContainer.tagName == 'TR') { // handle in-table toggling while (oContainer = oContainer.nextSibling) - oContainer.style.display = ''; + change_class(oContainer, 'closed', 'open'); } } else { - oContainer.style.display = 'none'; + change_class(oContainer, 'open', 'closed'); state = 'off'; if (oContainer.tagName == 'TR') { // handle in-table toggling while (oContainer = oContainer.nextSibling) - oContainer.style.display = 'none'; + change_class(oContainer, 'open', 'closed'); } } get_url('tree_openclose.py?tree=' + escape(tree) + '&name=' + escape(name) + '&state=' + state); diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 31f98e5..c823e5c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -511,6 +511,10 @@ table.nform { border-style: solid; } +table.nform tr.closed { + display: none; +} + table.nform tr.heading td { color: white; }

12 years, 3 months

← Newer
1
...
18
19
20
21
22
23
24
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012