Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: New commits on branch master

by git version control

URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b4435a6e4d9d… Merge: 511274b 0f51040 Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 29 12:51:45 2014 +0200 Merge branch 'dashedit' Conflicts: agents/windows/Makefile URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5104064b8f88… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 13:38:04 2014 +0200 Editing views of new format in users_views.mk file in user profile URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d808f23b996f5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 11:52:49 2014 +0200 Fixed different issues with the dashboard editor ; minor improvments URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf50b12b6dcdb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 11:30:25 2014 +0200 Split visual table into "builtin" and "custom" ones URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f721ed2f96f20e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 09:43:42 2014 +0200 Fixed dashboard layout of network topology URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c6d5629cca0c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 14:30:37 2014 +0200 dashboard editor: minor cleanups / usability improvements URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3465a775f5afa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 13:28:08 2014 +0200 The views snapin shows dashboards and views again URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c75305a7520de… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 10:21:07 2014 +0200 simplified dynamic dashboard position / sizing URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f13942365c9a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 10:12:34 2014 +0200 Various smaller improvements / fixes for editing dashboards URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78cd5272f45167… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 09:48:34 2014 +0200 Changed builtin dashboards to new format URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=324c2cc39949c6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 09:14:43 2014 +0200 Fixed default settings of checkbox filters URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01ae43887f79e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 08:58:17 2014 +0200 Fixed dashboard global context in view dashlets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c3ed7620b0cab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 19:37:18 2014 +0200 Errors in dashlet handler function should not prevent whole dashboard rendering URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d3b342be56988… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 19:27:06 2014 +0200 Fixed editing of views (also dashlet views) with hard coded context URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a626e31702a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 16:48:08 2014 +0200 Improved graph scaling again URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea72de8c6064b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 14:57:51 2014 +0200 Dashlets added directly from views have now a title by default URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e79b9aef0ecc42… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 14:49:05 2014 +0200 Fixed scaling of pnp graphs in several cases URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a196177c199fe7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 09:16:21 2014 +0200 Added choice to add existing views to dashboard from dashboard edit menu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1dd7b5f0815bd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 23 08:14:59 2014 +0200 Hiding dashboard controls wheel on bottom of screen when not hovered URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=698cf3ed663c51… Merge: df8953d 53f1e69 Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 22 16:25:02 2014 +0200 Merge branch 'dashedit' of mathias-kettner.de:check_mk into dashedit URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df8953d0eec19c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 22 16:24:55 2014 +0200 Fixed opening dashboard edit menu in view mode URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a755797d69309… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 22 16:12:45 2014 +0200 Dashboard edit menu is now accessible from page context menu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8635b43feaf61f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 22 14:23:05 2014 +0200 Dashboard editor: Different minor improvements / fixes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2fea034643e53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 22 13:55:28 2014 +0200 Dashboard snapin does not display topic when only one topic is used URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53f1e69d307f10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 22 10:03:54 2014 +0200 Fixed exception with legacy views of single context type URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c25cd50ec1559e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 17 14:03:59 2014 +0200 Improved sizer label styling URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdd643b9afecac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 15:43:30 2014 +0200 Fixed syntax URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f565d56614ff22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 15:41:46 2014 +0200 build process: fixed build of branch agent URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=185ecd88f94ac6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 12:05:06 2014 +0200 Removed old comments / code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78b65326363f79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 16 12:02:05 2014 +0200 It is now possible to add existing views to dashboards (see footer icons) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7625c6cdb643f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 15:11:36 2014 +0200 PNP graphs can now be added to dashboard right from the host/service detail pages URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd5f8ac0a26c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 11:54:39 2014 +0200 Cleaned up styling of static text dashlet URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=631205e5896ec8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 11:44:13 2014 +0200 Implemented deletion of dashlets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b98bd3b19e24b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 15 08:32:03 2014 +0200 Dashboard graphs do now scale with the size of the dashlet URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fcf982795f414… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 15:12:24 2014 +0200 Fixed globe rendering after reload URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed5f6c9f9d09c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 15:10:46 2014 +0200 Fixed globe rendering after reload URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5dd6851283ad8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 15:04:07 2014 +0200 Fixed dashboard modification check for builtin dashboards URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3115d1e9ba1dc9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 14:44:19 2014 +0200 Cleaned up variable naming in visual module code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=531ea0998515c2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 14:31:35 2014 +0200 Dashboard: Fixed setting html title when page title is now shown URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d6c71d1c0989e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 14:28:36 2014 +0200 Open dashboard recognize editing and reload themselfs URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f75ca867f45b15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 11:33:59 2014 +0200 dashboard editor: some IE<9 fixes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abdaf9a6f8bac8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 09:17:19 2014 +0200 Fixed mobile GUI rendering URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b78721085e774… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 09:04:19 2014 +0200 Minor cleanups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca8d3ed46ad71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 14 08:55:44 2014 +0200 Migrated builtin dashboards to new format URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50e0d0c8ea58a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 11 16:48:46 2014 +0200 PNP dashlets use the context mechanism now URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf205ed81cfde4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 11 14:57:41 2014 +0200 View dashlets can now be added to dashboards URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f35e400d37c25b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 11 12:13:12 2014 +0200 Made single object context input fields optional; Fixed single service on multi host view URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c8fb6e43b99b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 11 12:00:36 2014 +0200 Recoded view rendering to work with the context type of views URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1f326a1ae595… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 10 20:19:16 2014 +0200 Multisite: plugin loading does not catch all AttributeError exceptions anymore URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2e5e52a0ac199… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 10 10:29:50 2014 +0200 Loading / transforming of old to new views URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a31b2aed08de8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 9 16:25:24 2014 +0200 More progress in view editor refactoring URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d429d060588c33… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 8 16:10:53 2014 +0200 Additional steps in view editor rewriting URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=974b034022c1c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 8 10:03:55 2014 +0200 View / visual editor refactoring in progress URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d46773841a6e6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 7 09:39:33 2014 +0200 Added minimum dashlet size during resizing URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ce58f3d19dea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 15:16:31 2014 +0200 Started with implementing context types for visuals URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fec9884349ff01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 4 11:56:32 2014 +0200 Fixed view editor after visual editor implementation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be9f0bcf2e75c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 2 17:35:08 2014 +0200 hide dashlet content overflow URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49a9c3f371115e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 2 11:25:06 2014 +0200 Added dashlet edit button; Sorted dashlet types in add menu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aaf322186973f3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 2 10:11:14 2014 +0200 Added absolute sized dashlets resize code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23a4ca1c567b4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 1 13:58:06 2014 +0200 Added missing file URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ddc988a128108… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 1 13:37:40 2014 +0200 Dashlet changes can now be persisted; Started with dashlet add/edit dialog URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0cce473652350… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 30 08:38:13 2014 +0200 Added controls (anchors, sizer) to dashlets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b48635aad6c9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 26 16:38:25 2014 +0200 Simplyfied dashlet layout URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7d9ac195d6572… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 26 15:12:11 2014 +0200 Started implementing the dashboard editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a2f294631044f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 25 12:03:04 2014 +0200 Replaced individual localized view texts to user custom localization mechanism; Generalized view editor to visuals editor; Dashboard global parameters can now be edited URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d211a77224ec38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 24 15:59:35 2014 +0200 Prozess dashboard resize less often during window resize URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e61381ae74089c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jun 24 15:43:17 2014 +0200 Started refactoring the dashboard code

10 years, 2 months

Check_MK Git: check_mk: #1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: b6ec6428f3d7954815abdce01737305ed20ec844 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6ec6428f3d795… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 29 11:36:44 2014 +0200 #1065 heartbeat_crm / heartbeat_crm.resources: Rewrote checks / formalized parameters Both checks heartbeat_crm and heartbeat_crm.resources nailed down the resources / DC to the node which held the resources / DC during inventory. This was not fitting most users requirements and has been changed. By default the node currently holding the resources / DC does not matter anymore as long as they are held by at least one node. If you like to change this behaviour back to the old default, you need to configure the inventory rule <tt>Heartbeat CRM Inventory</tt> and re-run an inventory on the affected hosts. Already inventorized checks should continue working as they did before. The change only affects newly inventorized services. Two new WATO rules <tt>Heartbeat CRM general status</tt> and <tt>Heartbeat CRM resource status</tt> have been added to make the parameters of these checks configurable. --- .werks/1065 | 21 ++++++ ChangeLog | 1 + checkman/heartbeat_crm | 26 +++---- checkman/heartbeat_crm.resources | 12 +-- checks/heartbeat_crm | 137 ++++++++++++++++++++-------------- web/plugins/wato/check_parameters.py | 83 ++++++++++++++++++++ 6 files changed, 201 insertions(+), 79 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b6ec6428f3…

10 years, 2 months

Check_MK Git: check_mk: #1089 FIX Snapshot restore: fixed exception during exception handling...

by Andreas Boesl

Module: check_mk Branch: master Commit: c008c57bc2e1477c6ec36097501c38bbd787ed62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c008c57bc2e147… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 29 11:34:51 2014 +0200 #1089 FIX Snapshot restore: fixed exception during exception handling... If there were an error during the extracting of a backup domain, the backup process crashed entirely instead of continueing with the next backup domain. --- .werks/1089 | 9 +++++++++ ChangeLog | 1 + web/htdocs/multitar.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1089 b/.werks/1089 new file mode 100644 index 0000000..8f6dff6 --- /dev/null +++ b/.werks/1089 @@ -0,0 +1,9 @@ +Title: Snapshot restore: fixed exception during exception handling... +Level: 1 +Component: wato +Version: 1.2.5i6 +Date: 1406626339 +Class: fix + +If there were an error during the extracting of a backup domain, the backup process +crashed entirely instead of continueing with the next backup domain. diff --git a/ChangeLog b/ChangeLog index 3b88b9f..fa3b013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ WATO: * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... + * 1089 FIX: Snapshot restore: fixed exception during exception handling...... 1.2.5i5: diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index d9ddd53..b461070 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -213,9 +213,9 @@ def extract_domains(tar, domains): stdout, stderr = p.communicate() exit_code = p.wait() if exit_code: - return [ "%s - %s" % (domains["title"], stderr) ] + return [ "%s - %s" % (domain["title"], stderr) ] except Exception, e: - return [ "%s - %s" % (domains["title"], str(e)) ] + return [ "%s - %s" % (domain["title"], str(e)) ] def execute_restore(domain, is_pre_restore = True):

10 years, 2 months

Check_MK Git: check_mk: #0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Mo nitor the Temperature and the Humidity on Knürr RMS Devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 42480a49c0168b77cb467b73e1f7a4ff86fe672a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42480a49c0168b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 29 10:24:48 2014 +0200 #0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices --- .werks/185 | 8 ++++ ChangeLog | 1 + checkman/knuerr_rms_humidity | 15 +++++++ checkman/knuerr_rms_temp | 14 ++++++ checks/knuerr_rms_humidity | 55 ++++++++++++++++++++++++ checks/knuerr_rms_temp | 55 ++++++++++++++++++++++++ pnp-templates/check_mk-knuerr_rms_humidity.php | 1 + pnp-templates/check_mk-knuerr_rms_temp.php | 1 + web/plugins/perfometer/check_mk.py | 2 + web/plugins/wato/check_parameters.py | 15 +++++++ 10 files changed, 167 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=42480a49c0…

10 years, 2 months

Check_MK Git: check_mk: #1064 FIX Fixed rare issue with WATO communication in distributed setups ( different OS versions)

by Lars Michelsen

Module: check_mk Branch: master Commit: 32dc33df48e4734f8aa39a527a684af089b0b3c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32dc33df48e473… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 28 16:24:38 2014 +0200 #1064 FIX Fixed rare issue with WATO communication in distributed setups (different OS versions) In distributed setups where the python versions differ, especially the remote site is older than Python 2.5 and the central site is newer than this, it might happen that the communication between these both sites is not possible anymore since werk #0984 (2014-06-23 / 1.2.5i4). This commit makes the communication work again with older python versions. This has been tested with Python 2.4. It might also work with python 2.3 - but is untested yet. --- .werks/1064 | 13 +++++++++++++ ChangeLog | 3 +++ web/htdocs/wato.py | 50 +++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/.werks/1064 b/.werks/1064 new file mode 100644 index 0000000..f8bd111 --- /dev/null +++ b/.werks/1064 @@ -0,0 +1,13 @@ +Title: Fixed rare issue with WATO communication in distributed setups (different OS versions) +Level: 1 +Component: wato +Version: 1.2.5i6 +Date: 1406557188 +Class: fix + +In distributed setups where the python versions differ, especially the remote site is older +than Python 2.5 and the central site is newer than this, it might happen that the communication +between these both sites is not possible anymore since werk #0984 (2014-06-23 / 1.2.5i4). + +This commit makes the communication work again with older python versions. This has been tested +with Python 2.4. It might also work with python 2.3 - but is untested yet. diff --git a/ChangeLog b/ChangeLog index 5f92d9f..36b3588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ Checks & Agents: * 1051 FIX: tcp_conn_stats: fix missing performance data... + WATO: + * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... + 1.2.5i5: Core & Setup: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e203f14..451cc8d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16994,17 +16994,53 @@ def validate_all_hosts(hostnames, force_all = False): import base64 try: import ast -except: - ast = None + literal_eval = ast.literal_eval +except ImportError: + # Python <2.5 compatibility + try: + from compiler import parse + import compiler.ast + def literal_eval(node_or_string): + _safe_names = {'None': None, 'True': True, 'False': False} + + if isinstance(node_or_string, basestring): + node_or_string = parse(node_or_string, mode='eval') + if isinstance(node_or_string, compiler.ast.Expression): + node_or_string = node_or_string.node + + def _convert(node): + if isinstance(node, compiler.ast.Const) and isinstance(node.value, + (basestring, int, float, long, complex)): + return node.value + elif isinstance(node, compiler.ast.Tuple): + return tuple(map(_convert, node.nodes)) + elif isinstance(node, compiler.ast.List): + return list(map(_convert, node.nodes)) + elif isinstance(node, compiler.ast.Dict): + return dict((_convert(k), _convert(v)) for k, v + in node.items) + elif isinstance(node, compiler.ast.Name): + if node.name in _safe_names: + return _safe_names[node.name] + elif isinstance(node, compiler.ast.UnarySub): + return -_convert(node.expr) + raise ValueError('malformed string') + + return _convert(node_or_string) + except: + literal_eval = None def mk_eval(s): - if ast and not config.wato_legacy_eval: - return ast.literal_eval(base64.b64decode(s)) - else: - return pickle.loads(base64.b64decode(s)) + try: + if literal_eval and not config.wato_legacy_eval: + return literal_eval(base64.b64decode(s)) + else: + return pickle.loads(base64.b64decode(s)) + except: + raise MKGeneralException(_('Unable to parse provided data: %s') % html.attrencode(repr(s))) def mk_repr(s): - if ast and not config.wato_legacy_eval: + if literal_eval and not config.wato_legacy_eval: return base64.b64encode(repr(s)) else: return base64.b64encode(pickle.dumps(s))

10 years, 2 months

Check_MK Git: check_mk: #1142 FIX winperf_ts_sessions: fix computation, check has never really worked

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e05f308896a155629b525285437abda456dace1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e05f308896a15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 15:47:20 2014 +0200 #1142 FIX winperf_ts_sessions: fix computation, check has never really worked --- .werks/1142 | 9 +++++++++ ChangeLog | 1 + checks/winperf_ts_sessions | 10 +++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.werks/1142 b/.werks/1142 new file mode 100644 index 0000000..bf500e3 --- /dev/null +++ b/.werks/1142 @@ -0,0 +1,9 @@ +Title: winperf_ts_sessions: fix computation, check has never really worked +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i6 +Date: 1406555200 + + diff --git a/ChangeLog b/ChangeLog index 5f92d9f..4ca5388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i6: Checks & Agents: * 1051 FIX: tcp_conn_stats: fix missing performance data... + * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked 1.2.5i5: diff --git a/checks/winperf_ts_sessions b/checks/winperf_ts_sessions index 0498ceb..113abf6 100644 --- a/checks/winperf_ts_sessions +++ b/checks/winperf_ts_sessions @@ -31,7 +31,7 @@ # 4 1 rawcount # 6 0 rawcount -# Counters, relative to the base ID (2102) +# Counters, relative to the base ID (e.g. 2102) # 2 Total number of Terminal Services sessions. # 4 Number of active Terminal Services sessions. # 6 Number of inactive Terminal Services sessions. @@ -43,7 +43,7 @@ def inventory_winperf_ts_sessions(info): def check_winperf_ts_sessions(_unused, params, info): if not info or len(info) == 1: return 3, "Performance counters not available" - total, active, inactive = [ int(l[0]) for l in info[1:4] ] + total, active, inactive = [ int(l[1]) for l in info[1:4] ] state = 0 state_txt = [] @@ -52,11 +52,11 @@ def check_winperf_ts_sessions(_unused, params, info): txt = '%d %s' % (val, title) if key in params: if val > params[key][0]: - state = max(state, 2) - txt += ' (!!)' + state = 2 + txt += '(!!)' elif val > params[key][1]: state = max(state, 1) - txt += ' (!)' + txt += '(!)' state_txt.append(txt) perfdata = [ ('active', active, ), ('inactive', inactive) ]

10 years, 2 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8855aafaf33f7386d661dde42b6e1e0804169387 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8855aafaf33f73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 15:46:11 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b4fd007..d98057a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1142 +1152

10 years, 2 months

Check_MK Git: check_mk: Small code cleanup in mk_jolokia

by Mathias Kettner

Module: check_mk Branch: master Commit: 1fc70c7da2ec2298f780a5943d58b8e37c62d3b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fc70c7da2ec22… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 28 14:34:10 2014 +0200 Small code cleanup in mk_jolokia --- agents/plugins/mk_jolokia | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index ae0a013..679e27d 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -239,12 +239,12 @@ socket.setdefaulttimeout(1.0) # of dicts). for inst in instances: for varname, value in [ - ( "server", server ), - ( "port", port ), - ( "user", user ), + ( "server", server ), + ( "port", port ), + ( "user", user ), ( "password", password ), - ( "mode", mode ), - ( "suburi", suburi ), + ( "mode", mode ), + ( "suburi", suburi ), ( "instance", instance )]: if varname not in inst: inst[varname] = value @@ -253,6 +253,3 @@ for inst in instances: inst["instance"] = inst["instance"].replace(" ", "_") query_instance(inst) - - -

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2165

by Andreas Boesl

Module: check_mk Branch: master Commit: 5b2bb3a0ff6b3e0983e6f6491b3a391eceabe869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b2bb3a0ff6b3e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 28 14:00:05 2014 +0200 Updated bug entries #2165 --- .bugs/2165 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.bugs/2165 b/.bugs/2165 new file mode 100644 index 0000000..7977f4f --- /dev/null +++ b/.bugs/2165 @@ -0,0 +1,7 @@ +Title: WATO: Host tag descriptions are cut in some screens, if they are too long +Component: multisite +State: open +Date: 2014-07-28 13:56:32 +Targetversion: future +Class: nastiness +

10 years, 2 months

Check_MK Git: check_mk: fixed textarea auto resize (off by 6 pixel)

by Andreas Boesl

Module: check_mk Branch: master Commit: 74507567c2fcce1bf26b4d9a11ab6feb4ff7ba90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74507567c2fcce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 28 13:15:08 2014 +0200 fixed textarea auto resize (off by 6 pixel) --- web/htdocs/js/checkmk.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 29c97da..d211411 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1663,8 +1663,7 @@ function valuespec_cascading_change(oSelect, varprefix, count) { } function valuespec_textarea_resize(oArea) { - oArea.style.height = 'auto'; - oArea.style.height = oArea.scrollHeight + "px"; + oArea.style.height = (oArea.scrollHeight - 6) + "px" ; }

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits