Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

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: 8305873938bd07293e7daa3d0c101321528c6a91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8305873938bd07… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Sep 21 10:36:25 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 12 months

Check_MK Git: check_mk: Check Manpage for jolokia_metrics.bea_queue

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91c8c03bdd184aa375619eac82a006a7ca0b54ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91c8c03bdd184a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Sep 21 13:15:36 2012 +0200 Check Manpage for jolokia_metrics.bea_queue --- checkman/jolokia_metrics.bea_queue | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_metrics.bea_queue b/checkman/jolokia_metrics.bea_queue new file mode 100644 index 0000000..8f54b9e --- /dev/null +++ b/checkman/jolokia_metrics.bea_queue @@ -0,0 +1,36 @@ +title: Length of queue in BEA +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + The BEA application servers have "Execute Queues" in which requests are + processed. This check allows to monitor the number of requests that + are being queued for processing. + + To use this plugin, Jolokia and the agent plugin need to be deployed + on the monitored server in each application container. + + The check can alert if the {WARN}/{CRIT} thresholds for a configurable total + is exceeded. + +item: + The name of the application server instance as configured by the agent + followed by the name of the application. + I.e. webservices webservices + +perfdata: + The number queued requests + +inventory: + One check is created for each application running inside a weblogic + instance sent by the agent. + + +[paramters] +warn (int): This many queue entries will trigger a WARNING state +crit (int): This many queue entries will trigger a CRITICAL state + +[configuration] +jolokia_metrics_queue_default_levels (int, int): Default levels warning and critical +

11 years, 12 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 840f6eccb38b3973fc59e3a9dfb955f9d93e5280 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=840f6eccb38b39… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Sep 21 10:48:02 2012 +0200 Add new bug entry --- .bugs/803 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/803 b/.bugs/803 new file mode 100644 index 0000000..1001da2 --- /dev/null +++ b/.bugs/803 @@ -0,0 +1,14 @@ +Title: Oracle Sessions should be able to define limits per Database +Component: checks +State: open +Date: 2012-09-21 10:41:08 +Targetversion: 1.2.0 +Class: feature + +The oracle_sessions check has has warn/crit levels. If using WATO those can only +be specified as a "global" value because no service name can be specified. +A user tried to work around this using the inventory->ruleset shortcut but that +didn't help either. + +We should change the WATO interface for the check, to make it support the +same configuration as is available on the CLI-side of things.

11 years, 12 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 13e0a62ddb66d9229266c93ed09e4485fe2ffeca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13e0a62ddb66d9… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Sep 20 18:20:27 2012 +0200 Add new bug entry --- .bugs/802 | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.bugs/802 b/.bugs/802 new file mode 100644 index 0000000..4098a21 --- /dev/null +++ b/.bugs/802 @@ -0,0 +1,13 @@ +Title: BI simulated states only show on top aggregation for BI Boxes +Component: bi +State: open +Date: 2012-09-20 18:17:19 +Targetversion: future +Class: nastiness + +If you add a simulated state for a given service (using foldable) +it will be reflected on the top-level, but not on the nodes. +So you see a lot of green items and but the main state stays as +configured to be simulated +it's very irritating, since the correct subaggrs and services +are in fact displayed, just not with their simulated states.

11 years, 12 months

Check_MK Git: check_mk: Check manpage for jolokia_metrics.bea_threads

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4bb0453366c40852f3433969d5e5ddc724952040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4bb0453366c408… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Sep 21 13:21:50 2012 +0200 Check manpage for jolokia_metrics.bea_threads --- checkman/jolokia_metrics.bea_threads | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/checkman/jolokia_metrics.bea_threads b/checkman/jolokia_metrics.bea_threads new file mode 100644 index 0000000..d0b3167 --- /dev/null +++ b/checkman/jolokia_metrics.bea_threads @@ -0,0 +1,28 @@ +title: Number of JVM threads +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check works on the number of threads running in a JVM. + time. + + To use this plugin, Jolokia and the agent plugin need to be installed + on the monitored server. + + This check does not have configurable levels. + +item: + The name of the application server instance as configured by the agent. + +perfdata: + The following values are returned in the perfdata: + The count of threads for processing requests, + The count of idle threads that are ready to process requests, + The count of threads that are in standby, + The count of "hogging" threads that are executing for too long. + +inventory: + One check is created per JVM instance sent by the Jolokia agent. + +

11 years, 12 months

Check_MK Git: check_mk: FIX: Totally hiding hidden filters from view editor now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e551045102e55004a887e1f2570fe4e513039e36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e551045102e550… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 10:25:45 2012 +0200 FIX: Totally hiding hidden filters from view editor now --- ChangeLog | 7 ++++--- web/htdocs/forms.py | 8 +++++--- web/htdocs/views.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dabe23..9f781b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,9 +100,6 @@ * FIX: Fixed error in printer_supply valuespec which lead to an exception when defining host/service specific rules * FIX: Fixed button url icon in docu-url link - * FIX: Fixed handling of filter configuration in view editor where filters - are using same variable names. Overlaping filters are now disabled - in the editor. BI: * Great speed up of rule compilation in large environments @@ -136,6 +133,10 @@ * FIX: Fixed bug in alert statistics view (only last 1000 lines were processed for calculating the statistics) * FIX: Added missing downtime icon for comment view + * FIX: Fixed handling of filter configuration in view editor where filters + are using same variable names. Overlaping filters are now disabled + in the editor. + * FIX: Totally hiding hidden filters from view editor now Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 3e96ff1..74b18c0 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -137,14 +137,16 @@ def container(): (g_section_isopen and "open" or "closed")) g_section_open = True -def section(title = None, checkbox = None, id = "", simple=False): +def section(title = None, checkbox = None, id = "", simple=False, hide = False): global g_section_open if g_section_open: html.write('</td></tr>') if id: id = ' id="%s"' % id - html.write('<tr class="%s"%s><td class="legend%s">' % - (g_section_isopen and "open" or "closed", id, simple and " simple" or "")) + html.write('<tr class="%s"%s%s><td class="legend%s">' % + (g_section_isopen and "open" or "closed", id, + hide and ' style="display:none;"' or '', + 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)) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index eaf7dd9..37711e9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -619,7 +619,7 @@ def page_edit_view(): shown_help = False for sortindex, title, fname, filt in s: - forms.section(title) + forms.section(title, hide = not filt.visible()) if not shown_help: html.help(_("Please configure, which of the available filters will be used in this " "view. <br><br><b>Show to user</b>: the user will be able to see and modify these "

11 years, 12 months

Check_MK Git: check_mk: Revert "Bugfix: Fixed doubled var in view editor ( site and siteopt filter)"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d69b8db17924caedc0b9afe0e33cc46934b51712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d69b8db17924ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 20 15:26:19 2012 +0200 Revert "Bugfix: Fixed doubled var in view editor (site and siteopt filter)" This reverts commit e89eadd9a4d3d44018aa9ec4f929e819a92af7ca. --- web/plugins/views/filters.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 0cc63b0..4fe3a1b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -324,20 +324,20 @@ declare_filter(232, FilterNagiosExpression("service", "in_downtime", class FilterSite(Filter): def __init__(self, name, enforce): - Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, [name], []) + Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, ["site"], []) self.enforce = enforce def visible(self): return config.is_multisite() def display(self): - site_selector(html, self.name, self.enforce) + site_selector(html, "site", self.enforce) def filter(self, infoname): if config.is_multisite(): - site = html.var(self.name) + site = html.var("site") if site: - return "Sites: %s\n" % (html.var(self.name, "")) + return "Sites: %s\n" % (html.var("site", "")) elif not self.enforce: return "" else: @@ -346,7 +346,7 @@ class FilterSite(Filter): return "" def heading_info(self, infoname): - current_value = html.var(self.name) + current_value = html.var("site") if current_value: alias = config.site(current_value)["alias"] return alias

11 years, 12 months

Check_MK Git: check_mk: FIX: Fixed handling of filter configuration in view editor where filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7638e67f22f03eabc712a8233cc7fe2e3765262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7638e67f22f03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 21 10:17:48 2012 +0200 FIX: Fixed handling of filter configuration in view editor where filters are using same variable names. Overlaping filters are now disabled in the editor. --- ChangeLog | 3 ++ web/htdocs/js/checkmk.js | 62 ++++++++++++++++++++++++++++++++++----------- web/htdocs/views.py | 32 +++++++++++++++++++++-- 3 files changed, 79 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index f33ad6a..5dabe23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,9 @@ * FIX: Fixed error in printer_supply valuespec which lead to an exception when defining host/service specific rules * FIX: Fixed button url icon in docu-url link + * FIX: Fixed handling of filter configuration in view editor where filters + are using same variable names. Overlaping filters are now disabled + in the editor. BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index dd43ee0..9658447 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -55,6 +55,17 @@ if (!Array.prototype.indexOf) }; } +// The nextSibling attribute points also to "text nodes" which might +// be created by spaces or even newlines in the HTML code and not to +// the next painted dom object. +// This works around the problem and really returns the next object. +function real_next_sibling(o) { + var n = o.nextSibling; + while (n.nodeType != 1) + n = n.nextSibling; + return n; +} + var classRegexes = {}; function hasClass(obj, cls) { @@ -297,29 +308,50 @@ function update_headinfo(text) } } +function toggle_input_fields(container, type, disable) { + var fields = container.getElementsByTagName(type); + for(var a = 0; a < fields.length; a++) { + fields[a].disabled = disable; + } +} + +function toggle_other_filters(fname, disable_others) { + for(var i = 0; i < g_filter_groups[fname].length; i++) { + var other_fname = g_filter_groups[fname][i]; + var oSelect = document.getElementById('filter_' + other_fname); + + // When the filter is active, disable the other filters and vice versa + + // Disable the "filter mode" dropdown + oSelect.disabled = disable_others; + + // Now dig into the filter and rename all input fields. + // If disabled add an "_disabled" to the end of the var + // If enabled remve "_disabled" from the end of the var + var oFloatFilter = real_next_sibling(oSelect); + if (oFloatFilter) { + toggle_input_fields(oFloatFilter, 'input', disable_others); + toggle_input_fields(oFloatFilter, 'select', disable_others); + oFloatFilter = null; + } + + oSelect = null; + } +} function filter_activation(oSelect) { var usage = oSelect.value; + var fname = oSelect.id.replace('filter_', ''); + + // Disable/Enable other filters which conflict with this filter + toggle_other_filters(fname, usage != 'off'); + + // Make the current filter visible/invisible var oDiv = oSelect.parentNode; oDiv.setAttribute("className", "filtersetting " + usage); oDiv.setAttribute("class", "filtersetting " + usage); - // If the filter is not in state hard or show, disable filter - // input - var disabled = usage != "hard" && usage != "show"; - var oFloatFilter = oSelect.nextSibling; - if (oFloatFilter) { - for (var i in oFloatFilter.childNodes) { - oNode = oFloatFilter.childNodes[i]; - if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { - oNode.disabled = disabled; - } - } - oFloatFilter = null; - } - - p = null; oDiv = null; oSelect = null; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 502866f..eaf7dd9 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -590,11 +590,33 @@ def page_edit_view(): forms.header(_("Filters"), isopen=False) allowed_filters = filters_allowed_for_datasource(datasourcename) + # sort filters according to title s = [(filt.sort_index, filt.title, fname, filt) for fname, filt in allowed_filters.items() if fname not in ubiquitary_filters ] s.sort() + + # Construct a list of other filters which conflict with this filter. A filter uses one or + # several http variables for transporting the filter data. There are several filters which + # have overlaping vars which must not be used at the same time. Those filters must exclude + # eachother. This is done in the JS code. When activating one filter it checks which other + # filters to disable and makes the "mode" dropdowns unchangable. + filter_htmlvars = {} + for sortindex, title, fname, filt in s: + for htmlvar in filt.htmlvars: + if htmlvar not in filter_htmlvars: + filter_htmlvars[htmlvar] = [] + filter_htmlvars[htmlvar].append(fname) + + filter_groups = {} + for sortindex, title, fname, filt in s: + filter_groups[fname] = set([]) + for htmlvar in filt.htmlvars: + filter_groups[fname].update(filter_htmlvars[htmlvar]) + filter_groups[fname].remove(fname) + filter_groups[fname] = list(filter_groups[fname]) + shown_help = False for sortindex, title, fname, filt in s: forms.section(title) @@ -620,14 +642,18 @@ def page_edit_view(): html.write('</div>') html.write('<div class=clear></div>') html.help(filt.comment) - - # Set all filters into the proper display state + html.write("<script language=\"javascript\">\n") + + html.write("g_filter_groups = %r;\n" % filter_groups) + + # Set all filters into the proper display state for fname, filt in allowed_filters.items(): if fname not in ubiquitary_filters: html.write("filter_activation(document.getElementById(\"filter_%s\"));\n" % fname) + html.write("</script>\n") - + def sorter_selection(title, var_prefix, maxnum, data): allowed = allowed_for_datasource(data, datasourcename)

11 years, 12 months

Check_MK Git: check_mk: Fixed output nastiness in services check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09517f3de0aa1a2b1707c8dbe1627740792d7d0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09517f3de0aa1a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 20 12:29:50 2012 +0200 Fixed output nastiness in services check --- checks/services | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/services b/checks/services index 1da7d23..2f9cd88 100644 --- a/checks/services +++ b/checks/services @@ -157,7 +157,7 @@ def check_windows_services(item, params, info): best_info = state, start_type best_running_on = running_on infotext = nagios_state_names[best_state] + " - " + desc + ": %s (start type is %s)" % best_info - if best_running_on: + if best_running_on and best_state != 2: #if best state ist critical, there should no message "running on" infotext += " (running on: %s)" % best_running_on return (best_state, infotext)

11 years, 12 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: e9375d145a8db37446828b3f7f41dc000a205cbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9375d145a8db3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Sep 20 12:29:58 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 12 months

← Newer
1
...
5
6
7
8
9
10
11
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012