Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64471 discussions

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 017b0dad8d5b9e34458a94ba8efc0cdf3bf9cd8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=017b0dad8d5b9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 17:10:00 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Fixed AIX manpage

by Mathias Kettner

Module: check_mk Branch: master Commit: e59b658f051ddfbbb7a3a08e1a0e38f73a484784 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e59b658f051ddf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 17:09:58 2013 +0200 Fixed AIX manpage --- checkman/vmstat_aix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/checkman/vmstat_aix b/checkman/vmstat_aix index 0856210..d5905bd 100644 --- a/checkman/vmstat_aix +++ b/checkman/vmstat_aix @@ -1,21 +1,13 @@ -title: CPU usage +title: CPU utilization agents: aix catalog: os/kernel license: GPL distribution: check_mk description: - Get CPU usage (user, system, idle, IO-Wait) on an AIX system. + Get CPU utilization (user, system, idle, IO-Wait) on an AIX system. Only performance data is written. Alerting is not implemented (returns always {OK} if input data is valid). perfdata: Four variables: The percentage of time spent in {user}, {system}, {idle} and {wait} -inventory: - Not implemented. - -[parameters] -None. - -[configuration] -None.

11 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0947

by Lars Michelsen

Module: check_mk Branch: master Commit: 49621648b23d763660e56a40025610a97249d9f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49621648b23d76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:05:13 2013 +0200 Updated bug entries #0947 --- .bugs/947 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/947 b/.bugs/947 index efd1f9e..cbb0120 100644 --- a/.bugs/947 +++ b/.bugs/947 @@ -1,10 +1,13 @@ Title: localization not working share/ Component: multisite -State: open +Class: bug +State: works4me Date: 2013-07-01 17:00:52 Targetversion: 1.2.3 -Class: bug In OMD localization seems only to workin local/share, not directlyh in share. The languages are seen by Multisite, but not used by gettext. + +2013-07-02 15:01:10: changed state open -> works4me +works with current versions. no problem.

11 years, 3 months

Check_MK Git: check_mk: Added option to enable an (ugly)

by Lars Michelsen

scrollbar in multisite sidebar Message-ID: <51d2ec85.VDmATXnfnlKcirgE%lm(a)mathias-kettner.de> 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: d98d32cc73bb3134cc5832a6d5e55e33c5778fcc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d98d32cc73bb31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:05:52 2013 +0200 Added option to enable an (ugly) scrollbar in multisite sidebar --- ChangeLog | 2 ++ web/htdocs/sidebar.css | 8 +++++++- web/htdocs/sidebar.py | 6 +++++- web/plugins/config/builtin.py | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50ce77e..4528939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,8 @@ Display current date in dashboard * LDAP: Using asynchronous searches / added optional support for paginated searches (Can be enabled in connection settings) + * Added option to enable browser scrollbar to the multisite sidebar (only + via "sidebar_show_scrollbar = True" in multisite.mk WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b11f718..2ff7a15 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -84,7 +84,13 @@ body.side { height: 500px; overflow: hidden; color: #000000; - padding-top: 55px; + padding-top: 5px; + position: absolute; + top: 50px; +} + +#side_content.scroll { + overflow-y: scroll; } /* The footer of the sidebar */ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 1522de1..5898259 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -163,7 +163,11 @@ def page_side(): refresh_snapins = [] restart_snapins = [] - html.write('<div id="side_content">') + scrolling = '' + if config.sidebar_show_scrollbar: + scrolling = ' class=scroll' + + html.write('<div id="side_content"%s>' % scrolling) for name, state in user_config: if not name in sidebar_snapins or not config.may("sidesnap." + name): continue diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py index c1abc51..be85e05 100644 --- a/web/plugins/config/builtin.py +++ b/web/plugins/config/builtin.py @@ -148,6 +148,9 @@ reschedule_timeout = 10.0 # Interval of snapin updates in seconds sidebar_update_interval = 30.0 +# It is possible (but ugly) to enable a scrollbar in the sidebar +sidebar_show_scrollbar = False + # Number of columsn in "Filter" form filter_columns = 2

11 years, 3 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b882f0eb1fd8b6ae06276544f75374274cfb616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b882f0eb1fd8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 2 17:06:14 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 3 months

Check_MK Git: check_mk: prediction: Fixed several problems with incomplete RRDs

by Mathias Kettner

Module: check_mk Branch: master Commit: 2dc44c24d1a66d669b5767b3309800cf9eff6cc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dc44c24d1a66d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:41:12 2013 +0200 prediction: Fixed several problems with incomplete RRDs --- modules/prediction.py | 8 +++++--- web/htdocs/prediction.py | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index 8d9a741..bf114d3 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -182,9 +182,11 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn # print "PUNKT %d --------------------------------------" % i point_line = [] for from_time, scale, data in slices: - d = data[int(i / float(scale))] - if d != None: - point_line.append(d) + idx = int(i / float(scale)) + if idx < len(data): + d = data[idx] + if d != None: + point_line.append(d) # else: # date_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(fr + ((un - fr) * i / float(num_points)))) # print "Keine Daten fur %s / %d/%s/ %.2f " % (date_str, i, float(scale),i/float(scale)) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 2574961..534bce4 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -203,13 +203,20 @@ def swap_and_compute_levels(tg_data, tg_info): row = dict(zip(columns, step)) for k, v in row.items(): swapped[k].append(v) - upper, lower = compute_levels(tg_info, row["average"], row["stdev"]) - if upper[0] != None: - swapped.setdefault("upper_warn", []).append(upper[0]) - swapped.setdefault("upper_crit", []).append(upper[1]) - if lower[0] != None: - swapped.setdefault("lower_warn", []).append(lower[0]) - swapped.setdefault("lower_crit", []).append(lower[1]) + if row["average"] != None and row["stdev"] != None: + upper, lower = compute_levels(tg_info, row["average"], row["stdev"]) + if upper[0] != None: + swapped.setdefault("upper_warn", []).append(upper[0]) + swapped.setdefault("upper_crit", []).append(upper[1]) + if lower[0] != None: + swapped.setdefault("lower_warn", []).append(lower[0]) + swapped.setdefault("lower_crit", []).append(lower[1]) + else: + swapped.setdefault("upper_warn", []).append(0) + swapped.setdefault("upper_crit", []).append(0) + swapped.setdefault("lower_warn", []).append(0) + swapped.setdefault("lower_crit", []).append(0) + return swapped def stack(apoints, bpoints, scale): @@ -243,8 +250,8 @@ def compute_levels(params, ref_value, stdev): def compute_vertical_range(swapped): mmin, mmax = 0.0, 0.0 for name, points in swapped.items(): - mmax = max(mmax, max(points)) - mmin = min(mmin, min(points)) + mmax = max(mmax, max(points)) or 0.0 # convert None into 0.0 + mmin = min(mmin, min(points)) or 0.0 return mmin, mmax def create_graph(name, size, range, v_range, legend):

11 years, 3 months

Check_MK Git: check_mk: Honor --debug within check_levels

by Mathias Kettner

Module: check_mk Branch: master Commit: 43315a4f630745951244b9914f46cf34d3096513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43315a4f630745… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:22:48 2013 +0200 Honor --debug within check_levels --- modules/check_mk_base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 465aae6..cd11d07 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1489,6 +1489,8 @@ def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=Fa else: infotext += "no reference for prediction yet" except Exception, e: + if opt_debug: + raise return 3, "%s" % e, [] if ref_value:

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: bfd6abd3b5e7736cf7e2c69ca1f6659c78acf9e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd6abd3b5e773… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:01:22 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Better i18n of some texts

by Mathias Kettner

Module: check_mk Branch: master Commit: fd93b11941ea98c3c898eb6a6367e9c3839349de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd93b11941ea98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 2 15:01:20 2013 +0200 Better i18n of some texts --- web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 09b50bc..63974db 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1233,7 +1233,7 @@ class ListChoice(ValueSpec): def validate_value(self, value, varprefix): if not self._allow_empty and not value: - raise MKUserError(varprefix, _('You have not selected any connector. You have to select at least one.')) + raise MKUserError(varprefix, _('You have to select at least one element.')) ValueSpec.custom_validate(self, value, varprefix) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bf73fe4..f808789 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10797,8 +10797,10 @@ def mode_edit_rule(phase, new = False): else: return "edit_ruleset" - return ("edit_ruleset", _("%s rule in ruleset '%s' in folder %s") % - (new and _("Created new") or _("Edited"), rulespec["title"], new_rule_folder["title"])) + return ("edit_ruleset", + (new and _("Created new rule in ruleset '%s' in folder %s") + or _("Editor rule in ruleset '%s' in folder %s")) % + (rulespec["title"], new_rule_folder["title"])) if rulespec.get("help"): html.write("<div class=info>" + rulespec["help"] + "</div>")

11 years, 3 months

Check_MK Git: check_mk: fixed titles of manpages for better categorization, categories fsc and fujitsu grouped together under fujitsu

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 611006be173a5e28bc7b24342878b7c949ba165c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611006be173a5e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 2 11:44:39 2013 +0200 fixed titles of manpages for better categorization, categories fsc and fujitsu grouped together under fujitsu --- checkman/carel_uniflair_cooling | 2 +- checkman/fsc_fans | 2 +- checkman/fsc_subsystems | 2 +- checkman/fsc_temp | 2 +- checkman/jolokia_metrics.bea_queue | 2 +- checkman/jolokia_metrics.bea_requests | 2 +- checkman/jolokia_metrics.bea_sess | 2 +- checkman/jolokia_metrics.requests | 2 +- checkman/mbg_lantime_refclock | 2 +- checkman/mbg_lantime_state | 2 +- checkman/raritan_emx | 2 +- modules/catalog.py | 1 - 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/checkman/carel_uniflair_cooling b/checkman/carel_uniflair_cooling index adccb60..709a71c 100644 --- a/checkman/carel_uniflair_cooling +++ b/checkman/carel_uniflair_cooling @@ -1,6 +1,6 @@ title: Carel Uniflair cooling devices agents: snmp -catalog: hw/other +catalog: hw/environment author: Andreas Boesl <ab(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_fans b/checkman/fsc_fans index ebfdca7..e835671 100644 --- a/checkman/fsc_fans +++ b/checkman/fsc_fans @@ -1,6 +1,6 @@ title: FANs of Fujitsu Siemens (FSC) Servers using ServerView Agent agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_subsystems b/checkman/fsc_subsystems index 68f29f0..b8040e0 100644 --- a/checkman/fsc_subsystems +++ b/checkman/fsc_subsystems @@ -1,6 +1,6 @@ title: Physical status of Fujitsu Siemens (FSC) Hardware parts agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/fsc_temp b/checkman/fsc_temp index 56eec3a..6d3f8de 100644 --- a/checkman/fsc_temp +++ b/checkman/fsc_temp @@ -1,6 +1,6 @@ title: Temperature status of Fujitsu Siemens (FSC) Hardware agents: snmp -catalog: hw/server/fsc +catalog: hw/server/fujitsu author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/jolokia_metrics.bea_queue b/checkman/jolokia_metrics.bea_queue index 9ba13c9..31d3710 100644 --- a/checkman/jolokia_metrics.bea_queue +++ b/checkman/jolokia_metrics.bea_queue @@ -1,4 +1,4 @@ -title: Length of queue in BEA +title: BEA Weblogic: Length of queue agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.bea_requests b/checkman/jolokia_metrics.bea_requests index d19a489..ae69a1e 100644 --- a/checkman/jolokia_metrics.bea_requests +++ b/checkman/jolokia_metrics.bea_requests @@ -1,4 +1,4 @@ -title: Requests to JVM sessions on BEA Weblogic +title: BEA Weblogic: Requests to JVM sessions agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.bea_sess b/checkman/jolokia_metrics.bea_sess index b74ee7d..6209d84 100644 --- a/checkman/jolokia_metrics.bea_sess +++ b/checkman/jolokia_metrics.bea_sess @@ -1,4 +1,4 @@ -title: Number of JVM sessions on BEA Weblogic +title: BEA Weblogic: Number of JVM sessions agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/jolokia_metrics.requests b/checkman/jolokia_metrics.requests index 0d4317a..254a823 100644 --- a/checkman/jolokia_metrics.requests +++ b/checkman/jolokia_metrics.requests @@ -1,4 +1,4 @@ -title: Requests to JVM instances +title: BEA Weblogic: Requests to JVM instances agents: linux catalog: app/java author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/mbg_lantime_refclock b/checkman/mbg_lantime_refclock index 5c81f4e..56b3ff0 100644 --- a/checkman/mbg_lantime_refclock +++ b/checkman/mbg_lantime_refclock @@ -1,4 +1,4 @@ -title: Reflock state of Meinberg LANTIME devices +title: Meinberg LANTIME devices: Reflock state agents: snmp catalog: hw/other author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/mbg_lantime_state b/checkman/mbg_lantime_state index ac5d76e..b0132e4 100644 --- a/checkman/mbg_lantime_state +++ b/checkman/mbg_lantime_state @@ -1,4 +1,4 @@ -title: General state of Meinberg LANTIME devices +title: Meinberg LANTIME devices: General state agents: snmp catalog: hw/other author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/raritan_emx b/checkman/raritan_emx index 9cd77ec..d2035f3 100644 --- a/checkman/raritan_emx +++ b/checkman/raritan_emx @@ -1,4 +1,4 @@ -title: Temperature, FAN and Door States for Raritan EMX devices +title: Raritan EMX devices: Temperature, FAN and Door States agents: snmp catalog: hw/other author: Bastian Kuhn <bk(a)mathias-kettner.de> diff --git a/modules/catalog.py b/modules/catalog.py index 62a0b35..aac4bb8 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -21,7 +21,6 @@ manpage_catalog_titles = { "printer" : "Printers", "server" : "Servers (management boards, blade enclosures)", "ibm" : "IBM", - "fsc" : "Fujitsu", "storagehw" : "Storage (filers, SAN, tape libs)", "brocade" : "Brocade", "fujitsu" : "Fujitsu",

11 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits