Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64178 discussions

Check_MK Git: check_mk: Fixed some typos

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 393c88fd3c0b78b54e091cdfaf5a49609a1278b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=393c88fd3c0b78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 08:26:22 2012 +0100 Fixed some typos --- web/htdocs/wato.py | 4 ++-- web/plugins/wato/check_parameters.py | 2 +- web/plugins/wato/globals_notification.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c2286a9..ab0afa8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6627,7 +6627,7 @@ def mode_edit_user(phase): # Authentication html.write("<tr><td class=legend>") - html.write(_("Authentication If you want to user to be able to login " + html.write(_("Authentication If you want the user to be able to login " "then specify a password here. Users without a login make sense " "if they are monitoring contacts that are just used for " "notifications. The repetition of the password is optional. " @@ -7914,7 +7914,7 @@ def mode_rulesets(phase): if phase == "title": if only_host: - return _("Rulesets for for hosts %s") % only_host + return _("Rulesets for hosts %s") % only_host else: return _("Rulesets for hosts and services") diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 02c40a9..8c1ff89 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -190,7 +190,7 @@ checkgroups.append(( ("5", _("noSync") ), ("6", _("inSync") ), ("7", _("portFault") ), - ("8", _("daigFault") ), + ("8", _("diagFault") ), ("9", _("lockRef") ), ] ), diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 5479b20..ea47a21 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -95,7 +95,7 @@ register_configvar(group, help = _ ("This template will be used as email body when sending notifications. " "Appended to it will be a specific body for either host or service " "notifications configured in two extra parameters. " - "The following macros are available all templates: " + "The following macros are available in all templates: " "<tt>$CONTACTNAME$</tt>: login name of the contact person, " "<tt>$CONTACTEMAIL$</tt>: email address of the contact person, " "<tt>$NOTIFICATIONTYPE$</tt>: one of PROBLEM, RECOVERY, ACKNOWLEDGEMENT, FLAPPINGSTART, FLAPPINGSTOP, FLAPPINGDISABLED, DOWNTIMESTART, DOWNTIMEEND, or DOWNTIMECANCELLED, "

12 years, 8 months

Check_MK Git: check_mk: FIX: Fixed problem with wato folder permissions in auth.php api

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6de1e44eaa34bb152ed787f5ffed98e7e05d7e8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6de1e44eaa34bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 08:54:28 2012 +0100 FIX: Fixed problem with wato folder permissions in auth.php api --- web/plugins/wato/auth.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/wato/auth.py b/web/plugins/wato/auth.py index f850df2..1139600 100644 --- a/web/plugins/wato/auth.py +++ b/web/plugins/wato/auth.py @@ -91,7 +91,7 @@ def create_php_file(users, role_permissions, folder_permissions): users[username].setdefault('language', config.default_language) file(g_auth_base_dir + '/auth.php', 'w').write('''<?php -global $mk_users, $mk_roles; +global $mk_users, $mk_roles, $mk_folders; $mk_users = %s; $mk_roles = %s; $mk_folders = %s;

12 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2328216a384fc57782cf4e0883baa25fb895fcc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2328216a384fc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 19 08:54:36 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Update of cmk benchmark - read delay precompile setting now, enable httpd on rhel, turn off iptables on rhel *and* set 0. 01min check interval for extra oomph.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3d6bcace2e568a0eee9c6dd642b6f8104f3cd566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d6bcace2e568a… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jan 18 23:38:00 2012 +0100 Update of cmk benchmark - read delay precompile setting now, enable httpd on rhel, turn off iptables on rhel *and* set 0.01min check interval for extra oomph. --- doc/opt/benchmark/bench.cfg | 5 +++-- doc/opt/benchmark/cmkbench.sh | 33 ++++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg index 89ee8f4..ba53018 100644 --- a/doc/opt/benchmark/bench.cfg +++ b/doc/opt/benchmark/bench.cfg @@ -1,10 +1,11 @@ # Config datei fuer Check_MK benchmark # pingonly deaktiviert "services" -_pingonly="no" +_pingonly="yes" _livecheck="yes" _livecheck_helpers=30 _central="zentrale" _sites=6 -_hosts=4000 +_hosts=800 _pnp="off" +_delay_precompile=False diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh index 410bc3b..a1e5336 100755 --- a/doc/opt/benchmark/cmkbench.sh +++ b/doc/opt/benchmark/cmkbench.sh @@ -15,6 +15,7 @@ fi #_sites=5 #_hosts=1000 #_pnp=on +#_delay_precompile=False central=${_central} @@ -22,6 +23,18 @@ pnp=${_pnp} pingonly=${_pingonly} +setup_apache() +{ +if [ -r /etc/redhat-release ]; then + # most OS don't just blindly enable and start a service. + chkconfig httpd on + service httpd start + # stop the firewall - i don't know how to carefully punch a hole. + chkconfig iptables off + service iptables stop +fi +} + gen_sites() { i=1 @@ -49,6 +62,7 @@ for site in ${sites} ; do omd config $site set LIVESTATUS_TCP on omd config $site set APACHE_TCP_PORT $(( 5000 + $i )) omd config $site set LIVESTATUS_TCP_PORT $(( 6557 + $i )) + # Bug - dont yet listen to livecheck y/n echo "broker_module=/omd/sites/${site}/lib/mk-livestatus/livestatus.o livecheck=/omd/versions/default/lib/mk-livestatus/livecheck num_livecheck_helpers=${_livecheck_helpers} num_client_threads=20 pnp_path=/omd/sites/${site}/var/pnp4nagios/perfdata /omd/sites/${site}/tmp/run/live event_broker_options=-1" > /omd/sites/$site/etc/mk-livestatus/nagios.cfg @@ -82,6 +96,7 @@ fi prepare() { get_cache + setup_apache config_omd_sites config_omd_central chmod u+s /opt/omd/versions/default/lib/mk-livestatus/livecheck @@ -126,7 +141,7 @@ add_hosts() for site in $sites ; do -echo "delay_precompile = True" > /omd/sites/$site/etc/check_mk/conf.d/options.mk +echo "delay_precompile = ${_delay_precompile}" > /omd/sites/$site/etc/check_mk/conf.d/options.mk cat <<EOF > /omd/sites/$site/etc/check_mk/conf.d/hosts.mk @@ -149,6 +164,15 @@ while _i < _hosts: "dummyhost%d" % _i : "127.0.0.1" }) EOF + +cat <<ZXY > /omd/sites/$site/etc/check_mk/conf.d/service.mk +extra_service_conf["normal_check_interval"] = [ + ( "0.01", ALL_HOSTS, [ "Ping" ] ), +] +legacy_checks += [ + (( "check-mk-ping", "Ping", True), ALL_HOSTS), +] +ZXY if [ $pingonly = "no" ]; then @@ -156,7 +180,7 @@ cat <<ABC > /omd/sites/$site/etc/check_mk/conf.d/datasources.mk datasource_programs += [( "cat /dev/shm/cmk.cache", ALL_HOSTS )] ABC -cat <<ZZZ > /omd/sites/$site/etc/check_mk/conf.d/service.mk +cat <<ZZZ >> /omd/sites/$site/etc/check_mk/conf.d/service.mk checks += [ (ALL_HOSTS, "cpu.loads", None, cpuload_default_levels), (ALL_HOSTS, "cpu.threads", None, threads_default_levels), @@ -174,9 +198,6 @@ checks += [ (ALL_HOSTS, "tcp_conn_stats", None, tcp_conn_stats_default_levels), (ALL_HOSTS, "uptime", None, None), ] -extra_service_conf["check_interval"] = [ - ( "0.1", ALL_HOSTS, [ "Ping"]), -] ZZZ fi @@ -186,6 +207,8 @@ done } + + prepare setup_central start_omds

12 years, 8 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9845d1b311dc864b724b927ae7f51e1e5ca98d50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9845d1b311dc86… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Jan 18 23:41:29 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 8 months

Check_MK Git: check_mk: Fixed shortly introduced problem with older python versions where the json module is missing

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: edcf0e023dcb8bfb48dcb88186c910ca3f6d1f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edcf0e023dcb8b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 16:23:16 2012 +0100 Fixed shortly introduced problem with older python versions where the json module is missing --- web/htdocs/wato.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8be9137..c2286a9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4001,16 +4001,18 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if topic == topics[-1]: html.write('<table class="form nomargin">') + def dump_json(obj): + return repr(obj).replace('None', 'null') + # Provide Javascript world with the tag dependency information # of all attributes. - import json html.javascript("var inherited_tags = %s;\n"\ "var wato_depends_on = %s;\n"\ "var volatile_topics = %s;\n"\ "wato_fix_visibility();\n" % ( - json.dumps(inherited_tags), - json.dumps(dependency_mapping), - json.dumps(volatile_topics))) + dump_json(inherited_tags), + dump_json(dependency_mapping), + dump_json(volatile_topics))) # Check if at least one host in a folder (or its subfolders)

12 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 089adbba9f8ab9c6c49d0447a4a3f4760bb85601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=089adbba9f8ab9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 17:03:54 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 8 months

Check_MK Git: check_mk: ValueSpec: fix bug in OptionalDropdownChoice rendering

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d6cab35045b4abfd35222e1f1b970849c30c654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d6cab35045b4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 17:03:34 2012 +0100 ValueSpec: fix bug in OptionalDropdownChoice rendering --- web/htdocs/valuespec.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4665def..b7bca58 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -702,6 +702,9 @@ class OptionalDropdownChoice(ValueSpec): html.write("") def value_to_text(self, value): + for val, title in self._choices: + if val == value: + return title return self._explicit.value_to_text(value) def from_html_vars(self, varprefix):

12 years, 8 months

Check_MK Git: check_mk: htmllib: new helper function icon()

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f6f02f5041975d5785bef176606d7a5b42f8ee8d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6f02f5041975d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 16:51:06 2012 +0100 htmllib: new helper function icon() --- web/htdocs/htmllib.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 148749f..d6b78d5 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -323,6 +323,10 @@ class html: (obj_id, style, title, disabled, text, href)) # self.write("<a href=\"%s\" class=button%s%s>%s</a>" % (href, obj_id, style, text)) + def icon(self, help, icon): + self.write('<img class=icon title="%s" src="images/icon_%s.png">' % ( + help, icon)) + def icon_button(self, url, help, icon): self.write('<a href="%s">' '<img class=iconbutton title="%s" src="images/button_%s_lo.png" '

12 years, 8 months

Check_MK Git: check_mk: ValueSpec: Listchoice gets render function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 525ccd9e37950dc2758b1d37fb4c38d0cf02843d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=525ccd9e37950d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jan 18 16:47:23 2012 +0100 ValueSpec: Listchoice gets render function --- web/htdocs/valuespec.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e72bf38..4665def 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -610,6 +610,8 @@ class ListChoice(ValueSpec): self._choices = kwargs.get("choices") self._columns = kwargs.get("columns", 1) self._loaded_at = None + self._render_function = kwargs.get("render_function", + lambda id, val: val) # In case of overloaded functions with dynamic elements def load_elements(self): @@ -640,7 +642,7 @@ class ListChoice(ValueSpec): def value_to_text(self, value): self.load_elements() d = dict(self._elements) - return ", ".join([ str(d.get(v,v)) for v in value ]) + return ", ".join([ self._render_function(v, d.get(v,v)) for v in value ]) def from_html_vars(self, varprefix): self.load_elements()

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits