Checkmk git commits October 2011

checkmk-commits@lists.checkmk.com

2 participants
109 discussions

Check_MK Git: check_mk: FIX: mk_oracle now also detects XE databases

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ee7db1628656741e3c02c87305a957abd51a8470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee7db162865674… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 12:43:40 2011 +0200 FIX: mk_oracle now also detects XE databases --- ChangeLog | 5 +++++ agents/plugins/mk_oracle | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7981b2d..b399e4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,11 @@ * FIX: Fixed encoding problem when opening dashboard +1.1.12p1: + Checks & Agents: + * FIX: mk_oracle now also detects XE databases + + 1.1.12: Checks & Agents: * dell_powerconnect_*: final fixed, added PNP-templates diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 98890fb..0069f22 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -26,7 +26,7 @@ # Check_MK agent plugin for monitoring ORACLE databases # Get list of all running databases -SIDS=$(UNIX95=true ps ax -o args | sed -n '/^ora_pmon_$[^ ]*$/s//\1/p') +SIDS=$(UNIX95=true ps ax -o args | sed -n '/^$ora\|xe$_pmon_$[^ ]*$/s//\2/p') if [ -z "$SIDS" ] ; then exit 0 ; fi CACHE_MAXAGE=120

12 years, 8 months

Check_MK Git: New commits on branch master

by git＠mathias-kettner.de

URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a115b3ee0509e4… Merge: e07eda6fdef845328f11eab3491eb11f57fc3829 dbb1fb022fb30d7ac488164a02fc172a1fd70da0 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 12:36:00 2011 +0200 Merge branch 'wato-ng' Conflicts: agents/windows/check_mk_agent.exe agents/windows/crash.exe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e07eda6fdef845… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 12:35:25 2011 +0200 Set version to 1.1.13i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dbb1fb022fb30d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 13:38:45 2011 +0200 WATO: fix typos in help texts URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba2ae88af343b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 13:34:47 2011 +0200 WATO: fix deletion of rules In some cases the wrong rule was deleted URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a9ebefcff142f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 12:22:31 2011 +0200 if/if64: new ruleset if_disable_if64_hosts URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53af61ab315198… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 12:12:10 2011 +0200 Added some missing file headers URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd31320409fcd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 12:01:34 2011 +0200 WATO: changes in roles not longer pending URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eea96ee0388680… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 11:57:39 2011 +0200 WATO: handle invalid lines in audit log URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a050f96a22ac4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 11:41:50 2011 +0200 Make sure, that static_checks honor factory settings URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=405c0ed18cdb5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 10:54:58 2011 +0200 WATO: deal with explicit checks without parameters URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c76a21bed5ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 25 10:38:27 2011 +0200 Make sidebar zoom correctly in Chrome URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2994eee256fb57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 23:22:16 2011 +0200 WATO: configuration of static checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1d35d539feaa7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 19:29:37 2011 +0200 WATO: dashboard: fix links in hoststats URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be734f1ad56a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 19:11:48 2011 +0200 WATO: fix problem when editing folder properties URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=870304837c1d14… Merge: c97067c4dc36b830560f69ffe91782a28a40b1e0 ed689a161938f320e574b012075e66c5cb207ce3 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 18:24:07 2011 +0200 Merge branch 'master' into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c97067c4dc36b8… Merge: a364e831873475d09bb3ef8a81af818f5b824477 b5b015693c1e4ee0b8761d7123cca510d71f3229 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 18:14:54 2011 +0200 Merge branch 'master' into wato-ng Conflicts: ChangeLog URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a364e831873475… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:47:46 2011 +0200 WATO: use more icons, display host tags URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd9219af77ee3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:27:40 2011 +0200 WATO: fix typos in rule description URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffdf44e9a7f249… Merge: 400b71be511d243dc4f812ca641299baed234859 cb4d45bb676c018ff5b6969ef88a01c311bcaf82 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:24:32 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=400b71be511d24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:24:30 2011 +0200 WATO: fix users table: swap email/full name URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b45a1a4cf0acd1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:22:14 2011 +0200 WATO: Make WATO snapin i10n'able (part 2) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0b37ac250668e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:21:26 2011 +0200 WATO: fix layout of save button in users form URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55af45677e9b48… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 13:35:45 2011 +0200 WATO: Make WATO snapin i10n'able URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24aec04a47ee6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 12:15:05 2011 +0200 WATO: added rules for editing icon image :-) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b81f154f49ff90… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 11:13:18 2011 +0200 WATO: add rules for notifications_enabled URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a241ea40d91733… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 11:04:07 2011 +0200 WATO: fixed typo in rule help URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4c8d9a2e533d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 23 11:51:54 2011 +0200 WATO: fix help text URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16724e3a788583… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 23 11:47:28 2011 +0200 Fix WATO icons in Multisite URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=141b9b75297328… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 23 11:20:37 2011 +0200 WATO: rules for check_interval and retry_interval URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8b0bff9404da4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 23 10:57:39 2011 +0200 Fix bug: allow admin users immutable access again URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13ddf83ab507e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 22 14:20:01 2011 +0200 WATO: allow moving rules to other foldres URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54d57981357990… Merge: 415d33d12b0e66d9f5aeba19bd2f26a303026b76 07752718ab189e5f904d7210bc3b91f54406a334 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 21 17:30:49 2011 +0200 Merge branch 'master' into wato-ng Conflicts: ChangeLog web/htdocs/wato.py web/plugins/views/wato.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=415d33d12b0e66… Merge: 92415415655424b6b9a31c7d57cdbcad8cada68c d665c9008b958bcfd24def6454743b7946c1dae6 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 21 12:22:47 2011 +0200 Merge branch 'master' into wato-ng Conflicts: ChangeLog modules/check_mk.py web/htdocs/wato.py web/plugins/icons/builtin.py web/plugins/sidebar/wato.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92415415655424… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:46:19 2011 +0200 WATO: detect collision with secondary tags URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d7cd94c9baf3f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:43:38 2011 +0200 WATO: Fix editing of host tags.. in the case that tags are already defined in multisite.mk URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f5c2720cf12a7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:14:13 2011 +0200 Fix cloning of roles URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb419d565b24c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:11:11 2011 +0200 Fix bulk inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5ccea79d984d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 14:11:00 2011 +0200 WATO: log failed automation commands URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d49d8dad6859e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 13:48:09 2011 +0200 WATO: fix header of services table URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7ec905e8c3bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 12:42:09 2011 +0200 WATO: fixed moving to imported target folders URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e27f421be03360… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 12:27:07 2011 +0200 WATO: fix layout of tree snapin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866f6bd0972ae7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 12:14:02 2011 +0200 WATO: moving of host tag groups works URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfa25a6fa9159e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 12:04:58 2011 +0200 WATO: checkbox host attributes seem to work URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f55bb28fbd7046… Merge: a6ff3b77b35652e73d5b1ab56e64eb6b18ec16b6 5c258d1ca2209dba0b3e958f9edd01eadd00dc6f Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 11:14:54 2011 +0200 Merge branch 'wato-ng' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6ff3b77b35652… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 11:14:50 2011 +0200 WATO: removal of tag groups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c258d1ca2209d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 20 10:57:14 2011 +0200 Adding folder object to host objects during processing e.g. when using the API URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=acbd12b0895867… Merge: 16180f6180d28e9669ae77157475e0216883b32b de0291a86099671b663020b7259cb883b955cfd5 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 10:34:29 2011 +0200 Merge branch 'wato-ng' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16180f6180d28e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 20 10:34:20 2011 +0200 WATO: make host tags editable some special cases are still not handled. URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de0291a8609967… Merge: f0f4ac19aa9509dc3826a931cbf26b0b181a5e57 b85c6b0f675b50b17b60c1c38de08caf848ae4cb Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 19 10:08:37 2011 +0200 Merge branch 'wato-ng' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daf17923ae0a9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 21:20:59 2011 +0200 WATO: ignored_checks now editable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab1e590ca36c9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 21:20:46 2011 +0200 New automation for table of all checktypes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1348dd1a29d809… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 20:21:42 2011 +0200 Updated bug entries URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80d12e0b78b255… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 20:21:07 2011 +0200 WATO: make host pings configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d989ff7ea9ad0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 19:01:33 2011 +0200 WATO: fix configuration of if checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d26e2c56a569f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 18:04:33 2011 +0200 WATO: postfix_mailq and disk IO configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ff1389cc69647… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 16:50:27 2011 +0200 WATO: make further check parameters editable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0f4ac19aa9509… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 13:49:51 2011 +0200 Added API function num_hosts_in_folder() to count the number of hosts below the given folder URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec8307718a6eeb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 18 13:36:38 2011 +0200 Added missing API function update_host_attributes() to change the attributes of a host URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b85c6b0f675b50… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 09:37:39 2011 +0200 WATO: fix saving of hosts.mk URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a09dd901faef23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 09:02:18 2011 +0200 remove duplicate alias entries in host definitions URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83e14bb19c32db… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 18 08:46:22 2011 +0200 Dashboard: use more space on the right side URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c7295877487eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 16:54:33 2011 +0200 WATO: integration of rules into inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fa0d5a2f37861… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 13:18:02 2011 +0200 Fix custom_links snapin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad01bc6f1ca571… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 13:00:44 2011 +0200 WATO: show members of a contact group in table URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4486a73999999b… Merge: ffea585386c7b695f11470d898c6e6d2a601919f d86b2429f5f5bcd2425e37b972ea75b11ce8ffe5 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:48:55 2011 +0200 Merge branch 'wato-ng' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffea585386c7b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:43:04 2011 +0200 WATO: remove obsolete New Role button URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=869961c3d33a57… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:41:10 2011 +0200 WATO: better error messages when creating groups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76d95e7a455c60… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:36:40 2011 +0200 WATO: fix moving to imported folders URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72f38eb313ab42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:18:33 2011 +0200 WATO: fix bulk edit URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=823c552fcc06ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 12:17:17 2011 +0200 WATO: remove reload code from ajax output URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=330f8b51cca090… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 11:38:11 2011 +0200 WATO: fix error when saving groups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=522cee1c8f01d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 11:29:44 2011 +0200 WATO: fix help text URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=210760c81f611c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 17 11:06:31 2011 +0200 FIX: remove obsolete import of permissions.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d86b2429f5f5bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 17 09:51:13 2011 +0200 FIX: Fixed encoding problem when opening dashboard URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b6a839ae06a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 16 21:22:24 2011 +0200 Switch version back to 1.1.13i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e051462c8d4ec0… Merge: a3b1921e86026293ca83162277526aeb76940e9d f639294cc0991b9259b32d5c4133f84755ea1796 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 16 21:21:53 2011 +0200 Merge branch 'master' into wato-ng Conflicts: agents/windows/check_mk_agent.exe agents/windows/crash.exe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3b1921e860262… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 16 21:20:50 2011 +0200 Switch version to 1.1.12b1, avoid merge conflict URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bdef22c16aa1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 18:03:24 2011 +0200 WATO: make quicksearch limit configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0084093d32df8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 18:03:07 2011 +0200 WATO: make quicksearh limit configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a6d40a02eab6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 16:08:45 2011 +0200 WATO: refresh hosts snapin on active changes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f70fa964dd00b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 15:53:04 2011 +0200 WATO: fix of the reappering re-fix of the indentation of the WATO hosts snapin... URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b91618f49aa75… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 15:18:37 2011 +0200 WATO: Make back/save return correctly to origin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ab87a07bd06d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 15:07:01 2011 +0200 WATO hosts snapin: save tree state for main directory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe69c8f6d3139a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 15:03:28 2011 +0200 WATO: force non-empty alias in timeperiods URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049699d14e83ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 14:57:16 2011 +0200 WATO: show pending changes in hosts snapin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4966b0b32ca6dc… Merge: 438d39ef7864d8eaa5f0309824856019754fc26a af700f37d4dc3071cd2f0476339c2d6797fe98e8 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 14:47:03 2011 +0200 Merge branch 'wato-ng' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438d39ef7864d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 14:46:45 2011 +0200 Fix indentation of Views and Hosts snapings URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af700f37d4dc30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 14:43:24 2011 +0200 automation inventory: better tag check validation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b32ad39d5991da… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:19:56 2011 +0200 FIX: Fixed bookmark delete icon size URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df12e3dfc67962… Merge: 925e3e8d29438a4e413d8850af5a7f8adf80d766 373dd4b4c054fc940376715d0779e9b11ecc2d01 Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 14 13:14:36 2011 +0200 Merge branch 'master' into wato-ng Conflicts: web/htdocs/views.py web/htdocs/wato.py web/plugins/wato/builtin_attributes.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=925e3e8d29438a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 12:46:59 2011 +0200 WATO: fixed helpers for CVS import URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=054684f3d13da4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 11:36:37 2011 +0200 WATO: handle missing attributes in folders URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9cb7cbc8f9cd1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 11:36:19 2011 +0200 WATO: indent in hosts snapin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00c25a86bb7b4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 09:51:18 2011 +0200 WATO: initialize global variables URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c2c15b63b2035… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 14 09:50:57 2011 +0200 WATO: add migration script for 1.2.0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c7299ff07fbfe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 13 14:54:12 2011 +0200 WATO: add missing buttons in folder and rulesets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=942dc9d3f3f6bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 13 14:36:38 2011 +0200 WATO: fix editing of timeperiods URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fbdff0b5ce521… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 17:45:11 2011 +0200 WATO: updated internal docu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbfa2042de3775… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 17:26:39 2011 +0200 WATO: fixed bugs in logfile page URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=915608895d8d16… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 17:20:35 2011 +0200 WATO: two further bug fixes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff20c970dfe55e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 16:54:24 2011 +0200 WATO: fixed some bugs URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbff9c32923b80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 16:05:26 2011 +0200 Dashboard: hide dashlets that have no space URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c7682de56fdb0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 15:28:24 2011 +0200 WATO: fix missing config vars URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=604b2bfc785430… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 13:52:46 2011 +0200 WATO: added internal documentation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c414eda722d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 13:48:16 2011 +0200 WATO: deal with permissions on objects URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=699a1f3f77947c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 12 11:37:31 2011 +0200 WATO: edit contactsgroups on hosts/folders URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84a7872bda8b3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 11 17:49:45 2011 +0200 WATO: implemented various permissions, new main menu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=48983d8ec74ab2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 10 17:47:56 2011 +0200 WATO: renamed config.user to config.user_id URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe368d0052df3c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 10 17:18:39 2011 +0200 WATO: finish new implementation of roles URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcc9d0327e522a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 10 14:51:06 2011 +0200 WATO: managing roles and users finished Still missing: honoring roles in Multisite and combination with old-style multisite.mk variables URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61ef2a111878f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 8 22:23:26 2011 +0200 WATO: contact creation in Nagios works URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2acbfb0dcd4f17… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 8 21:39:44 2011 +0200 WATO: first part of user management URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ec4261c621c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 17:58:31 2011 +0200 WATO: loading/saving users & contacts Editing still missing, also creation of contacts by Check_MK URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877cf2ca607382… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 17:01:41 2011 +0200 WATO: repaired hosts-snapin URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=340f44f3095d0c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 16:00:21 2011 +0200 WATO: complete site configuration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33ade6427ed81b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 13:23:46 2011 +0200 WATO: editing of the sites variable from multisite.mk URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d5c8eee443c9e… Merge: 1149a2d93a0261c21fb558dc71c29d910b94008d bcff444034dba4411293b3c97c7c0370d10f3217 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 10:37:18 2011 +0200 Merge branch 'master' into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1149a2d93a0261… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 7 10:37:16 2011 +0200 WATO: code formatting URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dae533115b8ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 16:58:25 2011 +0200 WATO: added internal documentation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d79110c8adb14a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 16:58:11 2011 +0200 WATO: restructured snapins URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5664b0fca025f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 11:38:37 2011 +0200 WATO: fix fs configuration rules URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=472c863cb13f21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 09:29:58 2011 +0200 WATO: added missing icons URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb4e93c7e14748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 09:29:35 2011 +0200 WATO: restructured navigation URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7055c66b877a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 6 08:24:23 2011 +0200 WATO: new overview page for configuration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d907796e49a9d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 15:41:59 2011 +0200 WATO: fix missing folder tag on hosts URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16ae2894f191d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 15:11:44 2011 +0200 WATO: configuration of if checks complete URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43b54fff0abfd0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 13:50:51 2011 +0200 WATO: configuration of if checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3009c51dbe8a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 10:53:44 2011 +0200 Creation of configuration for timeperiods URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59b730db7e52d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 09:34:29 2011 +0200 WATO: hilite nagios errors URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d22b677d6be95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 09:25:43 2011 +0200 WATO: rules for notification_period URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ae2adfd74da9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 5 09:06:58 2011 +0200 WATO: deletion of time periods URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7de65be3a90a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 17:56:45 2011 +0200 WATO: configure timeperiods but they are still not used. URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df5ace9226d70c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 15:59:38 2011 +0200 WATO: assignment of hosts/services to groups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdc41b8ca2e45b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 15:19:28 2011 +0200 WATO: editing of host/service/contact groups URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=452e03d21d5858… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 12:44:46 2011 +0200 WATO: fixed some problems when moving hosts URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b1556fe186eb9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 12:36:50 2011 +0200 WATO: fix problems with default values URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d143cb9d09b1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 12:14:58 2011 +0200 WATO: make multisite.mk vars configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c6528731408f9… Merge: dec68dc593186093f00dbb551900abec3d2cc7cb b54e97424959515d476a3a0a2ebd7524d05f32ba Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 11:37:25 2011 +0200 Merge branch 'master' into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dec68dc5931860… Merge: 64d7f28bf1dc6438f64c4290e028ffecf894958b e6f7c014d9fb80e07ba496b49618afddeb1f9e9b Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 4 10:42:12 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64d7f28bf1dc64… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 19:35:28 2011 +0200 WATO: complete filesystem levels configuration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0831bfe12ca6a7… Merge: 8ba6f4becea5cecd3c6aa536f72ceab54bc3f38a 07e7bda728b3a9462deb079904fffeb233134db2 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:12:45 2011 +0200 Merge branch 'master' into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ba6f4becea5ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:12:24 2011 +0200 WATO: updated internal docu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d2a46e4db98d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 17:05:57 2011 +0200 WATO: make SNMP v3 configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0fadf32e2bd3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 29 15:22:12 2011 +0200 WATO: improve host-based rule configuration URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8c01f85d93fb5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 19:33:21 2011 +0200 WATO: short cut for creating host-specific rules URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eccb9df3364ea6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 18:54:21 2011 +0200 WATO: added icon for local rules URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b6df120779d93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 18:53:37 2011 +0200 WATO: minor improvements in rule editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16eea22d302f18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 14:40:58 2011 +0200 WATO: repair rule persistency URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f91bbc8002ea0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 12:56:15 2011 +0200 WATO: fixed several bugs in edit mode URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f4890e9f15284… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 28 12:49:59 2011 +0200 WATO: restructured user handling of rule editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=021bd3ddad1000… Merge: 357b92a84e2eb13bd9ba9b1e8b8c177de24303a9 620e0404e14753e01ce229123df2dea9d16e9682 Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 17:53:15 2011 +0200 Merge branch 'wato-ng' of http://git.mathias-kettner.de/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=357b92a84e2eb1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 17:52:02 2011 +0200 WATO: render_folder_path() - accepts additional urlvars mode_view_rulesets() improved layout URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=620e0404e14753… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 17:51:08 2011 +0200 WATO: updated internal docu URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfa956700e808d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 17:47:04 2011 +0200 WATO: output name of main.mk variables URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92277d0026cb21… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 17:42:17 2011 +0200 WATO: new value spec for dictionaries URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e43b86c498cfcf… Merge: 21d49ba8ba30c5419b10adfe244150eae072f275 3f1ff84adbd552703e519db6e8a28e4f7aff4253 Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 16:44:14 2011 +0200 Merge branch 'wato-ng' of 10.0.0.150:git/check_mk into wato-ng URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f1ff84adbd552… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 16:43:22 2011 +0200 WATO: fix bug with num_hostspecs URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d49ba8ba30c5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 16:40:57 2011 +0200 WATO: get_folder_aliaspath implemented URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a55203041477a5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 16:39:19 2011 +0200 WATO: very first time check parameters can be edited URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd0446e70d259… Merge: 5183589c68cc561482af3d24c30961d9a453003a 94ceb85c2fd0aaed987a823a0949b2b77dc64d4b Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 15:47:07 2011 +0200 Merge branch 'wato-ng' of 10.0.0.150:git/check_mk into wato-ng Conflicts: web/htdocs/wato.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5183589c68cc56… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 26 15:44:02 2011 +0200 Ignore .swo files URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3eae72b7743a7… Author: Andreas Boesl <boesl(a)localhost.localdomain> Date: Mon Sep 26 15:41:08 2011 +0200 WATO: first implementation of folder specific rules, mode_view_rulesets URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94ceb85c2fd0aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 15:33:49 2011 +0200 WATO: make ignored_services configurable URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec93b2a89f5926… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 15:08:37 2011 +0200 WATO: configure service base rules URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79978017eee5a2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 12:54:02 2011 +0200 Set FOLDER_PATH and FILE_PATH in config reader URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02e57fcc920f0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 26 11:44:18 2011 +0200 WATO: minor bugfixes in rule editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a04593d0372fc4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 25 20:14:36 2011 +0200 WATO: rule editor now handles binary rules URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=492645ffe6dcea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 25 18:03:24 2011 +0200 WATO: first version of functional rule editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd254e0d86dd65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Sep 24 18:59:45 2011 +0200 WATO: creation of new rules works URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94035ba19628b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Sep 24 18:34:00 2011 +0200 WATO: moving and deleting rules works URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8347944eb5003… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 23 17:19:06 2011 +0200 WATO: first part of implementation of rule editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=befea617186949… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 23 12:38:29 2011 +0200 WATO: implemented new datatypes for editing URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45c2297254ff4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 23 11:18:41 2011 +0200 WATO: first version of global config editor URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71b87829fcac99… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 16:49:19 2011 +0200 Set version to 1.1.13i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bcc63d8f041d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 16:42:32 2011 +0200 WATO: fix handling of mandatory attributes URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e26e40eb0794f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 16 16:20:53 2011 +0200 WATO: fix two exceptions in new WATO URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3464b35e9c7359… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 13 17:08:00 2011 +0200 WATO: restructuration to get rid of files (part 5/5) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08dc96262c9e2a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 13 16:43:36 2011 +0200 WATO: restructuration to get rid of files (part 4) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=650c742cec6a3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 13 14:51:38 2011 +0200 WATO: restructuration to get rid of files (part 3) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da88e37e8c62f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 11 18:27:38 2011 +0200 WATO: restructuration to get rid of files (part 2) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9881ce14a6225… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Sep 11 12:47:24 2011 +0200 WATO: restructuration to get rid of files (part 1)

12 years, 8 months

Check_MK Git: check_mk: Switched version to 1.1.12

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1a38804cef5911ce808a34fd57663d640975d899 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a38804cef5911… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 11:37:24 2011 +0200 Switched version to 1.1.12 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 97280 -> 97280 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes debian/files | 2 +- livestatus/configure.ac | 2 +- scripts/setup.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 7e786e8..23c4057 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.12b2 +VERSION = 1.1.12 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 53dc224..004b46c 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.12b2 +echo Version: 1.1.12 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 764fd53..d912b57 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.12b2 +echo Version: 1.1.12 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index aab9625..9230c74 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -41,7 +41,7 @@ LOCALDIR=$MK_LIBDIR/local exec <&- 2>/dev/null echo '<<<check_mk>>>' -echo Version: 1.1.12b2 +echo Version: 1.1.12 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index bf75078..2bec927 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.12b2 +echo Version: 1.1.12 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 421c096..ebf9eee 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -42,7 +42,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.12b2 +echo Version: 1.1.12 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 3bb9077..09127af 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.12b2" +#define CHECK_MK_VERSION "1.1.12" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a9ea99e..c9a1590 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index cd59684..0c541d0 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/debian/files b/debian/files index 7b81f7f..8bf1521 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.1.12b2-1_all.deb net optional +check-mk_1.1.12-1_all.deb net optional diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 1efcc9a..c47d43a 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.12b2], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.12], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/setup.sh b/scripts/setup.sh index c66c43f..84f2a82 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.12b2 +VERSION=1.1.12 NAME=check_mk LANG= LC_ALL=

12 years, 8 months

Check_MK Git: check_mk: ps.perf: better error handling in PNP template

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c613f44a8e3f488a79136d9c3aaf0008dd810df9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c613f44a8e3f48… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 11:25:43 2011 +0200 ps.perf: better error handling in PNP template --- ChangeLog | 1 + pnp-templates/check_mk-ps.perf.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b6bb1c..a6bd942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.1.12: Checks & Agents: * dell_powerconnect_*: final fixed, added PNP-templates + * ps.perf: better error handling in PNP template Multisite: * Dashboard: fix font size of service statistics table diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index 99661aa..3b468f8 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -39,7 +39,7 @@ $def[1] .= "GPRINT:count:MAX:\"Maximum\: $format \" "; $def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" "; $def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; -if ($DS[2]) { +if (isset($DS[2])) { $opt[2] = " --vertical-label \"MB\" -l 0 --title \"Memory Usage\" "; $def[2] = "DEF:vsz=$RRDFILE[2]:$DS[2]:MAX "; $def[2] .= "DEF:rss=$RRDFILE[3]:$DS[3]:MAX "; @@ -55,7 +55,7 @@ if ($DS[2]) { $def[2] .= "GPRINT:rssmb:MAX:\"Max\: %5.1lf MB\" "; } -if ($DS[3]) { +if (isset($DS[3])) { $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU Usage\" "; $def[3] = "DEF:pcpu=$RRDFILE[4]:$DS[4]:MAX "; $def[3] .= "AREA:pcpu#30ff80:\"CPU usage (%) \" ";

12 years, 8 months

Check_MK Git: check_mk: Dashboard: add links to PNP when using PNP graphs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ed689a161938f320e574b012075e66c5cb207ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed689a161938f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 18:23:58 2011 +0200 Dashboard: add links to PNP when using PNP graphs --- ChangeLog | 1 + web/htdocs/dashboard.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc238bd..8b6bb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Multisite: * Dashboard: fix font size of service statistics table * Dashboard: insert links to views into statistics + * Dashboard: add links to PNP when using PNP graphs 1.1.12b2: Core, Setup, etc.: diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index f461580..1fbfa42 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -583,11 +583,14 @@ def render_pnpgraph(site, host, service=None, source=0): service = "_HOST_" if not site: - base_url = defaults.url_prefix + "/pnp4nagios/index.php/" + base_url = defaults.url_prefix else: base_url = html.site_status[site]["site"]["url_prefix"] - - img_url = base_url + "image?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ + base_url += "/pnp4nagios/index.php/" + var_part = "?host=%s&srv=%s&view=0&source=%d&theme=multisite&_t=%d" % \ (pnp_cleanup(host), pnp_cleanup(service), source, int(time.time())) - html.write('<img src="%s">' % img_url) + + pnp_url = base_url + "graph" + var_part + img_url = base_url + "image" + var_part + html.write('<a href="%s"><img border=0 src="%s"></a>' % (pnp_url, img_url))

12 years, 8 months

Check_MK Git: check_mk: Dashboard: insert links to views into statistics

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5b015693c1e4ee0b8761d7123cca510d71f3229 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5b015693c1e4e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 18:04:52 2011 +0200 Dashboard: insert links to views into statistics --- ChangeLog | 1 + web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/dashboard.py | 23 ++++++++++++++++++----- web/plugins/views/builtin.py | 1 + 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 771c3a1..cc238bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Multisite: * Dashboard: fix font size of service statistics table + * Dashboard: insert links to views into statistics 1.1.12b2: Core, Setup, etc.: diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 815cfe7..2038acd 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1764,6 +1764,14 @@ div.dashlet table.hoststats.narrow { margin-top: 4px; } +div.dashlet table.hoststats a { + color: black; + text-decoration: none; +} +div.dashlet table.hoststats a:hover { + text-decoration: underline; +} + div.dashlet table.hoststats td { text-align: right; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 582d5ef..f461580 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -413,21 +413,25 @@ def dashlet_mk_logo(): def dashlet_hoststats(): table = [ ( _("up"), "#0b3", + "searchhost&is_host_scheduled_downtime_depth=0&hst0=on", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), ( _("down"), "#f00", + "searchhost&is_host_scheduled_downtime_depth=0&hst1=on", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), ( _("unreachable"), "#f80", + "searchhost&is_host_scheduled_downtime_depth=0&hst2=on", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "StatsAnd: 2\n"), ( _("in downtime"), "#0af", + "searchhost&search=1&is_host_scheduled_downtime_depth=1", "Stats: scheduled_downtime_depth > 0\n" \ ) ] @@ -438,6 +442,7 @@ def dashlet_hoststats(): def dashlet_servicestats(): table = [ ( _("OK"), "#0b3", + "searchsvc&hst0=on&st0=on&is_in_downtime=0", "Stats: state = 0\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -445,6 +450,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("warning"), "#ff0", + "searchsvc&hst0=on&st1=on&is_in_downtime=0", "Stats: state = 1\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -452,6 +458,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("unknown"), "#f80", + "searchsvc&hst0=on&st3=on&is_in_downtime=0", "Stats: state = 3\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -459,6 +466,7 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("critical"), "#f00", + "searchsvc&hst0=on&st2=on&is_in_downtime=0", "Stats: state = 2\n" \ "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ @@ -466,11 +474,13 @@ def dashlet_servicestats(): "StatsAnd: 4\n"), ( _("in downtime"), "#0af", + "searchsvc&hst0=on&is_in_downtime=0", "Stats: scheduled_downtime_depth > 0\n" \ "Stats: host_scheduled_downtime_depth > 0\n" \ "StatsOr: 2\n"), ( _("on down host"), "#048", + "searchsvc&hst1=on&hst2=on&hstp=on", "Stats: scheduled_downtime_depth = 0\n" \ "Stats: host_scheduled_downtime_depth = 0\n" \ "Stats: host_state != 0\n" \ @@ -490,7 +500,7 @@ def render_statistics(what, table, filter): query = "GET %s\n" % what for entry in table: - query += entry[2] + query += entry[3] query += filter result = html.live.query_summed_stats(query) @@ -503,16 +513,19 @@ def render_statistics(what, table, filter): html.write('<table class="hoststats%s" style="float:left">' % ( len(pies) > 5 and " narrow" or "")) - for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: - html.write('<tr><th>%s</th><td class=color style="background-color: %s">' - '</td><td>%d</td></tr>' % (name, color, count)) + for (name, color, viewurl, query), count in pies + [ ((_("Total"), "", "all%s" % what, ""), total) ]: + url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&filename=" \ + + htmllib.urlencode(html.var("filename", "")) + html.write('<tr><th><a href="%s">%s</a></th>' % (url, name)) + html.write('<td class=color style="background-color: %s">' + '</td><td><a href="%s">%d</a></td></tr>' % (color, url, count)) html.write("</table>") r = 0.0 pie_parts = [] if total > 0: - for (name, color, q), value in pies: + for (name, color, viewurl, q), value in pies: perc = 100.0 * value / total pie_parts.append('chart_pie("%s", %f, %f, %r);' % (what, r, r + perc, color)) r += perc diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3c4efd5..951f7f5 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1006,6 +1006,7 @@ multisite_builtin_views.update({ 'summary_host', 'serviceregex', 'check_command', + 'hoststate', 'svcstate', 'opthostgroup', 'opthost_contactgroup',

12 years, 8 months

Check_MK Git: check_mk: Dashboard: fix font size of service statistics table

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9136ae19aaaf1a5c18041ed86206ad515c2bd453 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9136ae19aaaf1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 17:26:37 2011 +0200 Dashboard: fix font size of service statistics table --- ChangeLog | 3 +++ web/htdocs/check_mk.css | 3 +++ web/htdocs/dashboard.py | 3 ++- 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae932bb..771c3a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 1.1.12: Checks & Agents: * dell_powerconnect_*: final fixed, added PNP-templates + + Multisite: + * Dashboard: fix font size of service statistics table 1.1.12b2: Core, Setup, etc.: diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 974e4ea..815cfe7 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1789,6 +1789,9 @@ div.dashlet table.hoststats th, table.hoststats td { border-width: 1px; vertical-align: middle; } +div.dashlet table.hoststats.narrow th, table.hoststats.narrow td { + font-size: 8pt; +} div.dashlet div.nograph { background-color: white; diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index a2cb5a8..582d5ef 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -501,7 +501,8 @@ def render_statistics(what, table, filter): html.write('<canvas class=pie width=%d height=%d id=%s_stats style="float: left"></canvas>' % (pie_diameter, pie_diameter, what)) - html.write('<table class="hoststats narrow" style="float:left">') + html.write('<table class="hoststats%s" style="float:left">' % ( + len(pies) > 5 and " narrow" or "")) for (name, color, query), count in pies + [ ((_("Total"), "", ""), total) ]: html.write('<tr><th>%s</th><td class=color style="background-color: %s">' '</td><td>%d</td></tr>' % (name, color, count))

12 years, 8 months

Check_MK Git: check_mk: Updated ChangeLog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e37d7157a6cd7cf12f2312288f1b9fba3e14b6b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e37d7157a6cd7c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:59:22 2011 +0200 Updated ChangeLog --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93b4e74..ae932bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1.1.12: + Checks & Agents: + * dell_powerconnect_*: final fixed, added PNP-templates + 1.1.12b2: Core, Setup, etc.: * FIX: fix crash with umlauts in host aliases

12 years, 8 months

Check_MK Git: check_mk: Additional changes to the Dell PowerConnect Checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0edb0c898929ebb80f5b0ab1a4d09a3b4cc32325 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0edb0c898929eb… Author: Chris Bowlby <cbowlby(a)tenthpowertech.com> Date: Sun Oct 23 13:03:38 2011 -0300 Additional changes to the Dell PowerConnect Checks I have removed some old debugging code from the temperature check, as well as removed some state related perfdata that is redundant. I've also created pnp templates for the CPU and Temperature checks. --- checks/dell_powerconnect_fans | 12 +++-- checks/dell_powerconnect_psu | 10 +++- checks/dell_powerconnect_temp | 21 +++++++- pnp-templates/check_mk-dell_powerconnect_cpu.php | 55 +++++++++++++++++++++ pnp-templates/check_mk-dell_powerconnect_temp.php | 41 +++++++++++++++ 5 files changed, 129 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0edb0c8989…

12 years, 8 months

Check_MK Git: check_mk: dell_powerconnect_temp: remove space before (!) and (!!)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d8cf29131e6f3641aa7f41e15e41de2e30b41361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8cf29131e6f36… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 24 15:58:43 2011 +0200 dell_powerconnect_temp: remove space before (!) and (!!) --- checks/dell_powerconnect_temp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 53f5c44..23b6754 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -66,15 +66,15 @@ def check_dell_powerconnect_temp(item, params, info): dell_powerconnect_status = dell_powerconnect_temp_status_map[state] if state == 3: - sensor_info = " (!!)" + sensor_info = "(!!)" if int(temp) >= crit: status = 2 - temp_info = " (!!)" + temp_info = "(!!)" elif int(temp) >= warn: status = 1 - temp_info = " (!)" + temp_info = "(!)" else: status = dell_powerconnect_temp_status2nagios_map[dell_powerconnect_status]

12 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2011