Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Updated bug entries #0624, #0673, #0696

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8321ca8c12e3d76659c2611797e84e43b932b9e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8321ca8c12e3d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:45:05 2012 +0200 Updated bug entries #0624, #0673, #0696 --- .bugs/624 | 2 +- .bugs/673 | 7 +++++-- .bugs/696 | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.bugs/624 b/.bugs/624 index 485d598..6ee7ab9 100644 --- a/.bugs/624 +++ b/.bugs/624 @@ -2,7 +2,7 @@ Title: WATO Folder Filter wird auch bei single host views angezeigt Component: multisite State: open Date: 2012-01-20 15:54:20 -Targetversion: 1.2.0 +Targetversion: future Class: nastiness Der Filter ist in solchen Ansichten eigentlich sinnlos. diff --git a/.bugs/673 b/.bugs/673 index 5c63269..01d973f 100644 --- a/.bugs/673 +++ b/.bugs/673 @@ -1,12 +1,15 @@ Title: Service details view should not show Filter tab Component: multisite -State: open +Class: nastiness +State: closed Date: 2012-04-08 11:01:32 Targetversion: 1.2.0 -Class: nastiness No filter is being shown, but the filter tab is there and a search button. The reason is probably that one filter is there (the WATO path filter?) but is not being displayed? + +2012-05-25 11:44:59: changed state open -> closed +Duplicate bug of 624. The source of the problem is the same diff --git a/.bugs/696 b/.bugs/696 index 7d1e74a..d680d56 100644 --- a/.bugs/696 +++ b/.bugs/696 @@ -1,9 +1,12 @@ Title: WATO host/folder move to: Visualize folder tree Component: wato -State: open +Class: nastiness +State: done Date: 2012-04-25 12:44:55 Targetversion: 1.2.0 -Class: nastiness The display text in the dropdown fields has to visualize the folder hierarchy. At the moment there is only a plain list shown in the dropdown field. + +2012-05-25 11:42:48: changed state open -> done +Slashes and names of the parents show the hierarchy

12 years, 1 month

Check_MK Git: check_mk: Broken plugins prevent plugin caching now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8f103de51bdcc36f6184835360307df2b30aff93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f103de51bdcc3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:53:52 2012 +0200 Broken plugins prevent plugin caching now --- .bugs/681 | 8 ++++++-- ChangeLog | 1 + web/htdocs/dashboard.py | 6 +++++- web/htdocs/sidebar.py | 6 +++++- web/htdocs/views.py | 6 +++++- web/htdocs/wato.py | 6 +++++- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.bugs/681 b/.bugs/681 index 70ff811..0ffe08c 100644 --- a/.bugs/681 +++ b/.bugs/681 @@ -1,10 +1,14 @@ Title: load_plugins should raise error if plugin is broken Component: multisite -State: open +Class: nastiness +State: done Date: 2012-04-25 10:45:52 Targetversion: 1.2.0 -Class: nastiness When loading plugins (e.g. WATO rule_specs), and there is a syntax or other error in the plugin, an Exception should be raised. Currently the plugin is silently ignored. + +2012-05-25 11:52:43: changed state open -> done +Simply setting loaded_with_language AFTER plugin loading. Broken +plugins will raise before reaching this code. diff --git a/ChangeLog b/ChangeLog index d2395f3..bcfb52b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * New display type 'boxes-omit-root' for BI views * Hostgroup view BI Boxes omits the root level * Finalized layout if view options and commands/filters/painteroptions. + * Broken plugins prevent plugin caching now * FIX: remove refresh button from dashboard. * FIX: remove use of old option defaults.checkmk_web_uri * FIX: fixed outgoing bandwidth in fc port perfometer diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index edbbabe..3129ca4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -60,7 +60,6 @@ def load_plugins(): global loaded_with_language if loaded_with_language == current_language: return - loaded_with_language = current_language # Permissions are currently not being defined. That will be the # case as soon as dashboards become editable. @@ -70,6 +69,11 @@ def load_plugins(): # just may add custom dashboards by adding to builtin_dashboards. load_web_plugins("dashboard", globals()) + # This must be set after plugin loading to make broken plugins raise + # exceptions all the time and not only the first time (when the plugins + # are loaded). + loaded_with_language = current_language + # In future there will be user editable dashboards just like # views which will be loaded. Currently we only use the builtin # dashboads. diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index d37c239..c5c8502 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -39,13 +39,17 @@ def load_plugins(): global loaded_with_language if loaded_with_language == current_language: return - loaded_with_language = current_language # Load all snapins global sidebar_snapins sidebar_snapins = {} load_web_plugins("sidebar", globals()) + # This must be set after plugin loading to make broken plugins raise + # exceptions all the time and not only the first time (when the plugins + # are loaded). + loaded_with_language = current_language + # Declare permissions: each snapin creates one permission config.declare_permission_section("sidesnap", _("Sidebar snapins")) for name, snapin in sidebar_snapins.items(): diff --git a/web/htdocs/views.py b/web/htdocs/views.py index f1c189d..6647385 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -47,7 +47,6 @@ def load_plugins(): global loaded_with_language if loaded_with_language == current_language: return - loaded_with_language = current_language global multisite_datasources ; multisite_datasources = {} global multisite_filters ; multisite_filters = {} @@ -64,6 +63,11 @@ def load_plugins(): load_web_plugins("views", globals()) + # This must be set after plugin loading to make broken plugins raise + # exceptions all the time and not only the first time (when the plugins + # are loaded). + loaded_with_language = current_language + # Declare permissions for builtin views config.declare_permission_section("view", _("Builtin views")) for name, view in multisite_builtin_views.items(): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 70e6c15..16dc0d0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11279,7 +11279,6 @@ def load_plugins(): global loaded_with_language if loaded_with_language == current_language: return - loaded_with_language = current_language # Reset global vars global extra_buttons, configured_host_tags, host_attributes, user_attributes, \ @@ -11474,3 +11473,8 @@ def load_plugins(): load_web_plugins("wato", globals()) + + # This must be set after plugin loading to make broken plugins raise + # exceptions all the time and not only the first time (when the plugins + # are loaded). + loaded_with_language = current_language

12 years, 1 month

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: d3d13cbc4799eae8a644338628010102d0612e85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3d13cbc4799ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:56:45 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0694

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bd5bf40a36b5b6d646d789a7d52690bbf2bd6620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd5bf40a36b5b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:39:46 2012 +0200 Updated bug entries #0694 --- .bugs/694 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/694 b/.bugs/694 index 11d7174..e023ce7 100644 --- a/.bugs/694 +++ b/.bugs/694 @@ -1,9 +1,12 @@ Title: Allow umlauts in mail addresses Component: wato -State: open +Class: nastiness +State: done Date: 2012-04-25 12:25:47 Targetversion: 1.2.0 -Class: nastiness The mail addresses in contacts deny umlauts. But it is possible to use umlauts as mail prefix and also in umlaut domains. + +2012-05-25 11:39:42: changed state open -> done +Has been implemented. At least for the german umlauts

12 years, 1 month

Check_MK Git: check_mk: ntp checks: Changed default value of time offsets to be 200ms (WARN) / 500ms (CRIT)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 97bd73f352781ea8cf039bcdddb12b8fe9e7a361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97bd73f352781e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 11:27:24 2012 +0200 ntp checks: Changed default value of time offsets to be 200ms (WARN) / 500ms (CRIT) --- ChangeLog | 1 + checkman/ntp | 5 +++-- checkman/ntp.time | 2 +- checks/ntp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f777f82..5a47b37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat * AIX: convert NIC check to lnx_if (now being compatible with if/if64) * AIX: new check for CPU utilization (using section lparstat_aix) + * ntp checks: Changed default value of time offsets to be 200ms (WARN) / 500ms (CRIT) 1.2.0b4: Core: diff --git a/checkman/ntp b/checkman/ntp index 040d41b..1f4a44e 100644 --- a/checkman/ntp +++ b/checkman/ntp @@ -37,8 +37,9 @@ critical (float): the critical offset in ms [configuration] ntp_default_levels (int, float, float): The global default levels for all checks - of this type. This is preset to {(10, 20.0, 50.0)} (which means that the check - gets critical if the stratum is {10} or higher). + of this type. This is preset to {(10, 200.0, 500.0)} (which means that the check + gets critical if the stratum is {10} or higher, warning if time offset is more than + 200ms or critical if the time offset is more than 500ms). ntp_inventory_mode (string): This variable controls which kind of NTP checks are created. A check of this type ({ntp}) is only created, if this variable is set to {"detailed"} or {"both"}. Default is {"summary"}. diff --git a/checkman/ntp.time b/checkman/ntp.time index b0adf7b..c0e070a 100644 --- a/checkman/ntp.time +++ b/checkman/ntp.time @@ -41,7 +41,7 @@ critical (float): the critical offset in ms [configuration] ntp_default_levels (int, float, float): The global default levels for all checks - of this type. This is preset to {(10, 20.0, 50.0)} (which means that the check + of this type. This is preset to {(10, 200.0, 500.0)} (which means that the check gets critical if the stratum is {10} or higher). ntp_inventory_mode (string): This variable controls which kind of NTP checks are created. A check of this type ({ntp.time}) is only created, if this variable is diff --git a/checks/ntp b/checks/ntp index 8474197..efb24d0 100644 --- a/checks/ntp +++ b/checks/ntp @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -ntp_default_levels = (10, 20.0, 50.0) # stratum, ms offset +ntp_default_levels = (10, 200.0, 500.0) # stratum, ms offset # Example output from agent: # <<<ntp>>>

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d8b0448fb8118d7023a4ad098df6aca05948159 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d8b0448fb8118… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 10:45:06 2012 +0200 Updated bug entries #0679 --- .bugs/679 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/679 b/.bugs/679 index 5d809fd..bbe6d94 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -2,7 +2,7 @@ Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on Iceweasel on Debian 6 Component: multisite State: open Date: 2012-04-24 12:07:14 -Targetversion: 1.2.0 +Targetversion: future Class: bug On Iceweasel 3.5.16 the rule editor breaks while editing ListOf()

12 years, 1 month

Check_MK Git: check_mk: aironet_{errors, clients}: detect new kinds of devices (Thanks to Tiago Sousa)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa82b76e17247eb3d5af8167ae7153a232c4a9ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa82b76e17247e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:48:55 2012 +0200 aironet_{errors,clients}: detect new kinds of devices (Thanks to Tiago Sousa) --- checks/aironet_clients | 7 ++++++- checks/aironet_errors | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/checks/aironet_clients b/checks/aironet_clients index f622d08..67adbd6 100644 --- a/checks/aironet_clients +++ b/checks/aironet_clients @@ -90,4 +90,9 @@ snmp_info['aironet_clients'] = ( ".1.3.6.1.4.1.9.9.273.1.3.1.1", [ 3, 4 ]) # CISCO-DOT11-ASSOCIATION-MIB::cDot11ClientSigQuality snmp_scan_functions['aironet_clients'] \ - = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525" ] + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ + ".1.3.6.1.4.1.9.1.685", + ".1.3.6.1.4.1.9.1.525", + ".1.3.6.1.4.1.9.1.758", + ".1.3.6.1.4.1.9.1.1247", + ] diff --git a/checks/aironet_errors b/checks/aironet_errors index 50df7f0..0db145d 100644 --- a/checks/aironet_errors +++ b/checks/aironet_errors @@ -54,4 +54,9 @@ snmp_info['aironet_errors'] = ( ".1.3.6.1.4.1.9.9.272.1.2.1.1.1", [0, 2] ) # CISCO-DOT11-IF-MIB::cd11IfRecFrameMacCrcErrors snmp_scan_functions['aironet_errors'] \ - = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525" ] + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ + ".1.3.6.1.4.1.9.1.685", + ".1.3.6.1.4.1.9.1.525", + ".1.3.6.1.4.1.9.1.758", + ".1.3.6.1.4.1.9.1.1247", + ]

12 years, 1 month

Check_MK Git: check_mk: aironet_{errors, clients}: detect new kinds of devices (Thanks to Tiago Sousa)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a88039111a55e001abdf065bf95f8625ee72fcab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a88039111a55e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:46:00 2012 +0200 aironet_{errors,clients}: detect new kinds of devices (Thanks to Tiago Sousa) --- ChangeLog | 1 + checks/aironet_clients | 2 +- checks/aironet_errors | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d6b939..57d2ece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat * AIX: convert NIC check to lnx_if (now being compatible with if/if64) * AIX: new check for CPU utilization (using section lparstat_aix) + * aironet_{errors,clients}: detect new kinds of devices (Thanks to Tiago Sousa) 1.2.0b4: Core: diff --git a/checks/aironet_clients b/checks/aironet_clients index 9ccf08d..f622d08 100644 --- a/checks/aironet_clients +++ b/checks/aironet_clients @@ -90,4 +90,4 @@ snmp_info['aironet_clients'] = ( ".1.3.6.1.4.1.9.9.273.1.3.1.1", [ 3, 4 ]) # CISCO-DOT11-ASSOCIATION-MIB::cDot11ClientSigQuality snmp_scan_functions['aironet_clients'] \ - = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.9.1.685" + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525" ] diff --git a/checks/aironet_errors b/checks/aironet_errors index b6dabc4..50df7f0 100644 --- a/checks/aironet_errors +++ b/checks/aironet_errors @@ -54,4 +54,4 @@ snmp_info['aironet_errors'] = ( ".1.3.6.1.4.1.9.9.272.1.2.1.1.1", [0, 2] ) # CISCO-DOT11-IF-MIB::cd11IfRecFrameMacCrcErrors snmp_scan_functions['aironet_errors'] \ - = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.9.1.685" + = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525" ]

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0758

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67547e0efcfe7737acdc3af050978e3f46a54c29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67547e0efcfe77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:25:55 2012 +0200 Updated bug entries #0758 --- .bugs/758 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/758 b/.bugs/758 new file mode 100644 index 0000000..371cf8c --- /dev/null +++ b/.bugs/758 @@ -0,0 +1,12 @@ +Title: Offer dropdown for standard command comments +Component: multisite +State: open +Date: 2012-05-25 11:22:25 +Targetversion: future +Class: feature + +In the global settings we could have the user configure a list +of texts. This texts could then be offered as a dropdown in th +command form. We can implemented this using OptionalDropDown, where +a text field appears as soon as the first entry "custom text" is +selected.

12 years, 1 month

Check_MK Git: check_mk: Allow list of aux tags to be missing in host tag definitions.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96477b46a3b6f5c48ed6a643287324c910c1c4c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96477b46a3b6f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 11:38:02 2012 +0200 Allow list of aux tags to be missing in host tag definitions. --- ChangeLog | 2 ++ web/htdocs/wato.py | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe36100..6d6b939 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,8 @@ * Keep track of changes made by other users before activating changes, let user confirm this, new permission can be used to prevent a user from activating foreign changes. + * Allow list of aux tags to be missing in host tag definitions. This + makes migration from older version easier. Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68d395b..938f247 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8828,6 +8828,12 @@ def load_hosttags(): "wato_host_tags" : [], "wato_aux_tags" : []} execfile(filename, vars, vars) + # Convert manually crafted host tags tags WATO-style. This + # makes the migration easier + for taggroup in vars["wato_host_tags"]: + for nr, entry in enumerate(taggroup[2]): + if len(entry) <= 2: + taggroup[2][nr] = entry + ([],) return vars["wato_host_tags"], vars["wato_aux_tags"] except Exception, e:

12 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
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