Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: Fix: fst_temp: Wrong sensor ouput

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e5fd3fdbadec92293bac35b11c09b4d8ac5273f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5fd3fdbadec92… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 15:01:11 2012 +0200 Fix: fst_temp: Wrong sensor ouput --- checks/fsc_temp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/fsc_temp b/checks/fsc_temp index 0fc36d8..fc22977 100644 --- a/checks/fsc_temp +++ b/checks/fsc_temp @@ -37,7 +37,7 @@ def check_fsc_temp(item, _no_params, info): crit = int(line[3]) infotext = "%d C (levels at %d C / %d C)" % (current, warn, crit) perfdata = [ ("temp", current, warn, crit, 0 ) ] - if current == -1: + if current == -1 or current == 4294967295: return(3, "UNKNOWN - Problem with sensor") elif current >= crit and crit > 0: return (2, "CRIT - %s" % infotext, perfdata)

12 years, 2 months

Check_MK Git: check_mk: Updated bug entries #0743

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ecc1557d77ff3162c71a2a0ad7710e8c9189d994 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecc1557d77ff31… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 14:59:47 2012 +0200 Updated bug entries #0743 --- .bugs/743 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/743 b/.bugs/743 new file mode 100644 index 0000000..662a387 --- /dev/null +++ b/.bugs/743 @@ -0,0 +1,9 @@ +Title: Downtime Scheduler +Component: wato +State: open +Date: 2012-09-28 14:34:47 +Targetversion: future +Class: phantasm + +A Wato Future, to set automatic downtimes eg.: +Every day from 6am to 8am Backup time, every Saturday a reboot between 5 and 6 etc.

12 years, 2 months

Check_MK Git: check_mk: BI: Fixed logging call if logging disabled

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfd47d267a9f0978cff1ffbc56fe43189c25652e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfd47d267a9f09… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 28 14:43:23 2012 +0200 BI: Fixed logging call if logging disabled --- web/htdocs/bi.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index f6dbc32..33e6100 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -204,7 +204,8 @@ def compile_forest(user, only_hosts = None, only_groups = None): global g_cache, g_user_cache, g_compiled_everything def log(s): - file(config.bi_compile_log, "a").write(s) + if compile_logging(): + file(config.bi_compile_log, "a").write(s) new_config_information = cache_needs_update() if new_config_information:

12 years, 2 months

Check_MK Git: check_mk: FIXED: Fix for older versions of df that don' t support the -T option for including the file system type in the output.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1193d74968c351446035de7b200224b70f15fb7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1193d74968c351… Author: Max Matslofva <max.matslofva(a)gmail.com> Date: Thu Sep 27 17:07:00 2012 +0200 FIXED: Fix for older versions of df that don't support the -T option for including the file system type in the output. --- agents/check_mk_agent.freebsd | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 261e7b0..6172422 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -82,7 +82,13 @@ osver="$(uname -r)" echo '<<<df>>>' # no special zfs handling so far, the ZFS.pools plugin has been tested to # work on FreeBSD -df -kTP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' +df -T >/dev/null +if [ $? -eq 0 ] + then + df -kTP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' + else + df -kP -t ufs | egrep -v '(Filesystem|devfs|procfs|fdescfs|basejail)' | awk '{ print $1,"ufs",$2,$3,$4,$5,$6 }' +fi # Check NFS mounts by accessing them with stat -f (System # call statfs()). If this lasts more then 2 seconds we

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52b99008353f99fc57e2230c84f85cfba4e7646a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b99008353f99… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 12:27:22 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 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=d71002ec981669… Merge: 0113dac 30d2742 Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 28 11:49:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0113dacb4c35a6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 28 11:46:02 2012 +0200 livestatus: statehist table tolerates since values dating before the oldest logfile URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ac9e9ff3c379d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 28 11:03:26 2012 +0200 .gitignore: add eclipse debug path URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32843c169f9dd5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 26 16:47:39 2012 +0200 reformatted code URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20262a186e25d2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 26 16:41:39 2012 +0200 livestatus: Bugfix: do not omit first it_entry URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36ab0075c06587… Merge: a356f39 b85939d Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 25 15:37:48 2012 +0200 resolve merged conflicts from statehistory branch URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b85939d6cb90b3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 25 15:34:41 2012 +0200 livestatus SLA updates. using pointers instead of references URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b817680a45235e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 24 15:22:24 2012 +0200 datasources.py: comments added URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=848afe4c261a0a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:59:21 2012 +0200 livestatus: using strdup of check_output instead of LogEntry* URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7e3e81ce4e90… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:58:17 2012 +0200 livestatus: removed Locker() function URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4fc4e59d261aa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:56:52 2012 +0200 livestatus update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd81e0e9b83959… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:56:27 2012 +0200 livestatus: LogCache is now member of class Store URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53850342339187… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:55:06 2012 +0200 livestatus: Logfile.cc/h URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e9dc329aea377… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 21 11:50:08 2012 +0200 livestatus: Removed locker function, code cleanup URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2ea41af28d655… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:57:07 2012 +0200 livestatus Jasper-Interface, new query separator URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc3b7dc717101b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:56:20 2012 +0200 livestatus, module.c removed debug message URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=934b4391097031… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:47:22 2012 +0200 livestatus: statehist updates URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33561dc5f4023e… Merge: d8ad64d e4c2b13 Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:46:57 2012 +0200 resolved merge conflict ( livestatus version 1.2.1i1 ) URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8ad64d4a5c895… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:43:58 2012 +0200 livestatus experimental version 1.2.1i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30a792656497a9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:43:19 2012 +0200 livestatus experimental version 1.2.1i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dc8cfab8ce223… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 17 12:42:59 2012 +0200 livestatus experimental version 1.2.1i1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3062d2bb5f298… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Aug 5 22:44:21 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff7d05e600190d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 2 12:35:05 2012 +0200 livestatus update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3de6e5cc569bf4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 2 12:33:51 2012 +0200 WATO: host_tag_attribute now with editable option URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d18320b53d9d15… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 1 16:12:30 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cabe4109d71661… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 30 17:00:17 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15aac9b54785d4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jul 30 16:30:29 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee02f83b0259e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 20 17:34:02 2012 +0200 logging intial downtime of host/services URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0462703fe5fc5e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 17 18:10:10 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f39b0bf138313… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 13 14:44:06 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebff066bb534cf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 29 11:53:51 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cea49e8ceb0270… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 18:25:25 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fa5713a77d991… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 16:01:15 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc6f82156cca60… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 15:39:01 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=406a8e738735c3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 14:09:42 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8abd1aacba53a3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 13:44:55 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edf83889784d06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 11:33:35 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=796fde926d8646… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 11:30:40 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4633655d8d755d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 10:45:10 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd1cbc292ed3c2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 10:44:15 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21c30a410de343… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 10:30:05 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2306616b868624… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 10:28:21 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5101bc051f2730… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 09:44:21 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef8da52b6f17a0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 09:31:39 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf6daf47316bb9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 28 09:29:29 2012 +0200 .projects into .gitignore| URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93ae28298a47f7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:55:01 2012 +0200 .gitignore update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a0535f17593e4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:54:39 2012 +0200 update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22dba8fb2292cb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:40:46 2012 +0200 .gitignore update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88cbd7d705166c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:31:26 2012 +0200 .gitignore: add .metadata URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96456b115c1e86… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:30:27 2012 +0200 state history update URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb723d26155142… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jun 22 13:30:06 2012 +0200 statehistory initiale version

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 30d2742bf1eaf000e4d76df0b1f9114bd66fc33b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d2742bf1eaf0… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 11:42:39 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Fixed manpage of j4p_performance.mem

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 871f493ce1a446082c74d4b4e89f4e95e7e555bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=871f493ce1a446… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 28 11:42:28 2012 +0200 Fixed manpage of j4p_performance.mem --- checkman/j4p_performance.mem | 4 ++-- web/plugins/wato/check_mk_configuration.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/checkman/j4p_performance.mem b/checkman/j4p_performance.mem index dc7af58..22f2ec1 100644 --- a/checkman/j4p_performance.mem +++ b/checkman/j4p_performance.mem @@ -30,7 +30,7 @@ item: examples: # Set default levels for heap memory to 500 MB / 800 MB - j4p_mem_default_levels = (500, 800) + j4p_performance_mem_default_levels = (500, 800) perfdata: Two variables: the heap memory usage and the non heap memory usage @@ -46,5 +46,5 @@ warning (int): The warning level for used memory in MB critical (int): The critical level for used memory in MB [configuration] -j4p_mem_default_levels (int, int): Default levels for memory usage in MB. This +j4p_performance_mem_default_levels (int, int): Default levels for memory usage in MB. This is preset to {(1000, 2000)}. diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 7a7b1e8..8eed549 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -502,6 +502,19 @@ register_configvar(group, ), ) +register_configvar(group, + "logwatch_service_output", + DropdownChoice( + title = _("Service output of Logwatch"), + help = _("You can change the output of the logwatch service " + "between an view with oh"), + choices = [ + ( 'default' , _("Output last log message in service output") ), + ( 'small', _("Only print stats in service output")), + ], + default_value = 'default', + ), + ) register_configvar(group, "printer_supply_some_remaining_status",

12 years, 2 months

Check_MK Git: check_mk: BI: Next steps in improving BI performance

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 335840680aca00f144d75ecb57ec64332955d721 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=335840680aca00… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 16:16:21 2012 +0200 BI: Next steps in improving BI performance * BI: Added option bit_precompile_on_demand to split compilations of the aggregations in several fragments. If possible only the needed aggregations are compiled to reduce the time a user has to wait for BI based view. This optimizes BI related views which display information for a specific list of hosts or aggregation groups. * BI: Added new config option bi_compile_log to collect statistics about aggregation compilations --- ChangeLog | 7 + web/htdocs/bi.py | 336 ++++++++++++++++++++-------- web/htdocs/config.py | 5 +- web/plugins/icons/builtin.py | 7 +- web/plugins/sidebar/bi.py | 5 +- web/plugins/views/bi.py | 3 +- web/plugins/views/builtin.py | 12 +- web/plugins/wato/check_mk_configuration.py | 29 +++ 8 files changed, 300 insertions(+), 104 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=335840680a…

12 years, 2 months

Check_MK Git: check_mk: Added missing localizations

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ddd96745e99cb75f164bf399299a56db4cb6374a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddd96745e99cb7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 26 08:37:36 2012 +0200 Added missing localizations --- ChangeLog | 1 + web/htdocs/bi.py | 67 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2152120..ba2a79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0p3 Mulitisite * Added "view" parameter to dashlet_pnpgraph webservice + * BI: Added missing localizations WATO * FIX: It is now possible to create clusters in empty folders diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 79870d2..69ca6c0 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -36,16 +36,29 @@ try: except NameError: from sets import Set as set - -config.declare_permission_section("bi", "BI - Check_MK Business Intelligence") -config.declare_permission("bi.see_all", - "See all hosts and services", - "With this permission set, the BI aggregation rules are applied to all " +# Datastructures and functions needed before plugins can be loaded +loaded_with_language = False + +# Load all view plugins +def load_plugins(): + global loaded_with_language + if loaded_with_language == current_language: + return + + config.declare_permission_section("bi", _("BI - Check_MK Business Intelligence")) + config.declare_permission("bi.see_all", + _("See all hosts and services"), + _("With this permission set, the BI aggregation rules are applied to all " "hosts and services - not only those the user is a contact for. If you " "remove this permissions then the user will see incomplete aggregation " - "trees with status based only on those items.", + "trees with status based only on those items."), [ "admin", "guest" ]) + # 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 + # ____ _ _ # / ___|___ _ __ ___| |_ __ _ _ __ | |_ ___ # | | / _ \| '_ \/ __| __/ _` | '_ \| __/ __| @@ -202,8 +215,8 @@ def compile_forest(user): for entry in config.aggregations: if len(entry) < 3: - raise MKConfigError("<h1>Invalid aggregation <tt>%s</tt></h1>" - "must have at least 3 entries (has %d)" % (entry, len(entry))) + raise MKConfigError(_("<h1>Invalid aggregation <tt>%s</tt>'</h1>" + "Must have at least 3 entries (has %d)") % (entry, len(entry))) group = entry[0] new_entries = compile_rule_node(entry[1:], 0) @@ -224,7 +237,7 @@ def compile_forest(user): # Aggregations by last part of title (assumed to be host name) name = aggr["title"].split()[-1] cache["aggregations_by_hostname"].setdefault(name, []).append((group, aggr)) - + # All single-host aggregations looked up per host if len(req_hosts) == 1: host = req_hosts[0] # pair of (site, host) @@ -252,8 +265,8 @@ def compile_rule_node(calllist, lvl): # Lookup rule source code rulename, arglist = calllist[-2:] if rulename not in config.aggregation_rules: - raise MKConfigError("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" - "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>" % + raise MKConfigError(_("<h1>Invalid configuration in variable <tt>aggregations</tt></h1>" + "There is no rule named <tt>%s</tt>. Available are: <tt>%s</tt>") % (rulename, "</tt>, </tt>".join(config.aggregation_rules.keys()))) rule = config.aggregation_rules[rulename] @@ -288,7 +301,7 @@ def find_matching_services(what, calllist): required_tags = [] if len(calllist) == 0: - raise MKConfigError("Invalid syntax in FOREACH_...") + raise MKConfigError(_("Invalid syntax in FOREACH_...")) host_re = calllist[0] if what in [ config.FOREACH_HOST, config.FOREACH_CHILD, config.FOREACH_PARENT ]: @@ -419,7 +432,7 @@ def make_arginfo(arglist, args): expansion = MULTIPLE name = name[:-1] else: - raise MKConfigError("Invalid argument name %s. Must begin with 'a' or end with 's'." % name) + raise MKConfigError(_("Invalid argument name %s. Must begin with 'a' or end with 's'.") % name) arginfo[name] = (expansion, value) return arginfo @@ -469,24 +482,24 @@ def compile_aggregation_rule(rule, args, lvl = 0): g_remaining_refs = [] if len(rule) != 4: - raise MKConfigError("<h3>Invalid aggregation rule</h1>" + raise MKConfigError(_("<h3>Invalid aggregation rule</h1>" "Aggregation rules must contain four elements: description, argument list, " "aggregation function and list of nodes. Your rule has %d elements: " - "<pre>%s</pre>" % (len(rule), pprint.pformat(rule))) + "<pre>%s</pre>") % (len(rule), pprint.pformat(rule))) if lvl == 50: - raise MKConfigError("<h3>Depth limit reached</h3>" + raise MKConfigError(_("<h3>Depth limit reached</h3>" "The nesting level of aggregations is limited to 50. You either configured " - "too many levels or built an infinite recursion. This happened in rule <pre>%s</pre>" + "too many levels or built an infinite recursion. This happened in rule <pre>%s</pre>") % pprint.pformat(rule)) description, arglist, funcname, nodes = rule # check arguments and convert into dictionary if len(arglist) != len(args): - raise MKConfigError("<h1>Invalid rule usage</h1>" + raise MKConfigError(_("<h1>Invalid rule usage</h1>" "The rule '%s' needs %d arguments: <tt>%s</tt><br>" - "You've specified %d arguments: <tt>%s</tt>" % ( + "You've specified %d arguments: <tt>%s</tt>") % ( description, len(arglist), repr(arglist), len(args), repr(args))) arginfo = dict(zip(arglist, args)) @@ -714,7 +727,7 @@ def regex(r): try: rx = re.compile(r) except Exception, e: - raise MKConfigError("Invalid regular expression '%s': %s" % (r, e)) + raise MKConfigError(_("Invalid regular expression '%s': %s") % (r, e)) regex_cache[r] = rx return rx @@ -785,19 +798,19 @@ def execute_leaf_node(node, status_info): state = {"state":state, "output":output} if state_assumption != None: assumed_state = {"state":state_assumption, - "output" : "Assumed to be %s" % service_state_names[state_assumption]} + "output" : _("Assumed to be %s") % service_state_names[state_assumption]} else: assumed_state = None return (state, assumed_state, node) - return ({"state":MISSING, "output": "This host has no such service"}, None, node) + return ({"state":MISSING, "output": _("This host has no such service")}, None, node) else: aggr_state = {0:OK, 1:CRIT, 2:UNKNOWN}[host_state] state = {"state":aggr_state, "output" : host_output} if state_assumption != None: assumed_state = {"state": state_assumption, - "output" : "Assumed to be %s" % host_state_names[state_assumption]} + "output" : _("Assumed to be %s") % host_state_names[state_assumption]} else: assumed_state = None return (state, assumed_state, node) @@ -811,7 +824,7 @@ def execute_rule_node(node, status_info): funcargs = parts[1:] func = config.aggregation_functions.get(funcname) if not func: - raise MKConfigError("Undefined aggregation function '%s'. Available are: %s" % + raise MKConfigError(_("Undefined aggregation function '%s'. Available are: %s") % (funcname, ", ".join(config.aggregation_functions.keys()))) # prepare information for aggregation function @@ -983,18 +996,18 @@ def aggr_running_on(nodes, regex): # if not found, then do normal aggregation with 'worst' if not mo or len(mo.groups()) == 0: state = config.aggregation_functions['worst'](nodes[1:]) - state["output"] += ", running nowhere" + state["output"] += _(", running nowhere") return state running_on = mo.groups()[0] for state, node in nodes[1:]: for site, host in node["reqhosts"]: if host == running_on: - state["output"] += ", running on %s" % running_on + state["output"] += _(", running on %s") % running_on return state # host we run on not found. Strange... - return {"state": UNKNOWN, "output": "running on unknown host '%s'" % running_on } + return {"state": UNKNOWN, "output": _("running on unknown host '%s'") % running_on } config.aggregation_functions['running_on'] = aggr_running_on

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012