Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Fixed wato folder painter format

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea1336be4e55373bb086110459964bb3120cd8aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea1336be4e5537… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 18 10:12:26 2012 +0100 Fixed wato folder painter format --- .bugs/617 | 8 ++++++++ web/plugins/views/wato.py | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/.bugs/617 b/.bugs/617 new file mode 100644 index 0000000..45d6d26 --- /dev/null +++ b/.bugs/617 @@ -0,0 +1,8 @@ +Title: Check bauen der offense Filedeskriptoren pro Prozess Check (oder in ps.perf einbauen) +Component: checks +State: open +Date: 2012-01-17 23:44:50 +Targetversion: future +Class: phantasm + +So mal als Idee. diff --git a/web/plugins/views/wato.py b/web/plugins/views/wato.py index 9993b9e..e684c19 100644 --- a/web/plugins/views/wato.py +++ b/web/plugins/views/wato.py @@ -110,7 +110,7 @@ def get_wato_folder(row, how, with_links = True): wato_path = filename[6:-9] title_path = wato.api.get_folder_title_path(wato_path, with_links) if how == "plain": - return "", title_path[-1] + return title_path[-1] elif how == "abs": return " / ".join(title_path) else:

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0593

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1680f535184175eed84992aae06e56295afc33bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1680f535184175… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 23:44:20 2012 +0100 Updated bug entries #0593 --- .bugs/593 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/593 b/.bugs/593 new file mode 100644 index 0000000..cb5172f --- /dev/null +++ b/.bugs/593 @@ -0,0 +1,9 @@ +Title: Permissions of snapshot dir are wrong after switch form OMD own to shared +Component: wato +State: open +Date: 2012-01-13 18:51:03 +Targetversion: 1.2.0 +Class: nastiness + +a chmod 775 is missing for the snapshot directory. +Maybe same for the auth directory and others.

12 years, 7 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: cc8d5f3822b7fe02bebe5dca73772bd5aaed2c3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc8d5f3822b7fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 23:44:27 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1539aeb7b6532184f6418f36fc1bb79ce825523 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1539aeb7b6532… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 17 23:44:35 2012 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/first_free b/.bugs/first_free index e110e8d..d8560d5 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -617 +627

12 years, 7 months

Check_MK Git: check_mk: Benchmarking script for creating OMD sites & configs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 09c231051ac1ec5ad1fd4b25465a84ef60328e6c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09c231051ac1ec… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jan 17 21:09:08 2012 +0100 Benchmarking script for creating OMD sites & configs --- doc/opt/benchmark/bench.cfg | 10 ++ doc/opt/benchmark/cmkbench.sh | 192 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 0 deletions(-) diff --git a/doc/opt/benchmark/bench.cfg b/doc/opt/benchmark/bench.cfg new file mode 100644 index 0000000..89ee8f4 --- /dev/null +++ b/doc/opt/benchmark/bench.cfg @@ -0,0 +1,10 @@ +# Config datei fuer Check_MK benchmark + +# pingonly deaktiviert "services" +_pingonly="no" +_livecheck="yes" +_livecheck_helpers=30 +_central="zentrale" +_sites=6 +_hosts=4000 +_pnp="off" diff --git a/doc/opt/benchmark/cmkbench.sh b/doc/opt/benchmark/cmkbench.sh new file mode 100755 index 0000000..410bc3b --- /dev/null +++ b/doc/opt/benchmark/cmkbench.sh @@ -0,0 +1,192 @@ +#!/bin/bash + +if test -r /etc/check_mk/bench.cfg ; then + . /etc/check_mk/bench.cfg +else + echo "keine config gefunden" +fi + + + +#_pingonly=yes +#_livecheck=yes +#_livecheck_helpers=20 +#_central=zentrale +#_sites=5 +#_hosts=1000 +#_pnp=on + + +central=${_central} +pnp=${_pnp} +pingonly=${_pingonly} + + +gen_sites() +{ +i=1 +while [ ${_sites} -ge $i ]; do + sites="$sites site${i}" + i=$(( $i + 1 )) +done +export sites +} + + +config_omd_sites() +{ + +gen_sites +i=0 +for site in ${sites} ; do + i=$(( $i + 1 )) + omd stop $site + echo yes | omd rm $site + omd create $site + omd config $site set AUTOSTART off + omd config $site set PNP4NAGIOS $pnp + omd config $site set APACHE_MODE shared + 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 )) + 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 + +done +} + + +config_omd_central() +{ + if ! omd sites | grep $central 2>&1 > /dev/null ; then + omd create $central + fi + omd stop $central + #omd config $central set CORE none + #omd config $central LIVESTATUS_TCP off 2>/dev/null +} + + +get_cache() +{ + +if [ -x `which check_mk_agent` ]; then + check_mk_agent > /dev/shm/cmk.cache +else + echo "Check_MK Agent fehlt" +fi + +} + + +prepare() +{ + get_cache + config_omd_sites + config_omd_central + chmod u+s /opt/omd/versions/default/lib/mk-livestatus/livecheck +} + + +setup_central() +{ + echo "all_hosts += [ 'localhost|tcp', ]" > /omd/sites/${central}/etc/check_mk/conf.d/server.mk + su - $central -c ". .profile && cmk -I" + + siteconfig=/omd/sites/${central}/etc/check_mk/multisite.d/connections.mk + echo "sites = {" > $siteconfig + echo " \"local\": { + \"alias\": \"Die Zentrale\", + }," >> $siteconfig + i=0 + for site in $sites ; do + i=$(( $i + 1 )) + echo " \"site${i}\": { + \"alias\": \"site${i}\", + \"socket\": \"tcp:127.0.0.1:$(( 6557 + $i ))\", + \"url_prefix\": \"http://192.168.10.65/site${i}\", + }," >> $siteconfig + done + echo "}" >> $siteconfig + +} + +start_omds() +{ + + for site in $central $sites ; do + omd start $site + done + +} + + +add_hosts() +{ + +for site in $sites ; do + +echo "delay_precompile = True" > /omd/sites/$site/etc/check_mk/conf.d/options.mk + + +cat <<EOF > /omd/sites/$site/etc/check_mk/conf.d/hosts.mk +execfile('/etc/check_mk/bench.cfg') + + +if _pingonly == "yes": + _tag = "ping" +else: + _tag = "tcp" + + +_i=0 +while _i < _hosts: + _i = _i + 1 + _hostdef = "dummyhost%d|%s" % (_i, _tag) + all_hosts += [ _hostdef ] + ipaddresses.update( + { + "dummyhost%d" % _i : "127.0.0.1" + }) +EOF + + if [ $pingonly = "no" ]; then + +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 +checks += [ + (ALL_HOSTS, "cpu.loads", None, cpuload_default_levels), + (ALL_HOSTS, "cpu.threads", None, threads_default_levels), + (ALL_HOSTS, "df", '/', {}), + (ALL_HOSTS, "df", '/opt', {}), + (ALL_HOSTS, "diskstat", 'SUMMARY', diskstat_default_levels), + (ALL_HOSTS, "kernel", 'Context Switches', kernel_default_levels), + (ALL_HOSTS, "kernel", 'Major Page Faults', kernel_default_levels), + (ALL_HOSTS, "kernel", 'Process Creations', kernel_default_levels), + (ALL_HOSTS, "kernel.util", None, kernel_util_default_levels), + (ALL_HOSTS, "mem.used", None, memused_default_levels), + (ALL_HOSTS, "mounts", '/', ['data=ordered', 'errors=remount-ro', 'relatime', 'rw']), + (ALL_HOSTS, "mounts", '/opt', ['attr2', 'noatime', 'nobarrier', 'nodiratime', 'noquota', 'rw']), + (ALL_HOSTS, "omd_status", 'zentrale', None), + (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 + + su - $site -c ". .profile && rm var/check_mk/autochecks/* 2>/dev/null; cmk -R" +done + +} + +prepare +setup_central +start_omds +add_hosts

12 years, 7 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: 98e2578bdd9dbbc78e46cbab959c279ed9f006de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98e2578bdd9dbb… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jan 17 21:15:45 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0601

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 416a9b412e36808b3cff3ee37086daa413baf7a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416a9b412e3680… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 17 11:45:14 2012 +0100 Updated bug entries #0601 --- .bugs/601 | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/601 b/.bugs/601 new file mode 100644 index 0000000..6f86b24 --- /dev/null +++ b/.bugs/601 @@ -0,0 +1,20 @@ +Title: Checkboxes in views and brower back in disharmony +Component: multisite +State: open +Date: 2012-01-17 11:43:07 +Targetversion: 1.2.0 +Class: bug + +Tested on IE8, but might be browser independent. +The following steps produce the problem: + +1. Open a view and activate checkboxes +2. Check one service +3. Select "Downtime 2hours" +4. When the question "Are you sure?" comes press the + browser "Back" button + -> The one service is still being displayed as + checks. Good. But internally it seems unchecked. +5. Now again select a command. + -> Now the command will be applied to *all* + services instead of the one.

12 years, 7 months

Check_MK Git: check_mk: new valuespec RadioChoice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5dc344efec14f7d4568c821e0a30138fb0b0d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5dc344efec14f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 17 10:56:53 2012 +0100 new valuespec RadioChoice --- web/htdocs/valuespec.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e498133..4edad63 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -562,6 +562,43 @@ class DropdownChoice(ValueSpec): raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % ", ".join([v for (v,t) in self._choices])) +# The same logic as the dropdown choice, but rendered +# as a group of radio buttons. +# columns == None or unset -> separate with " " +class RadioChoice(DropdownChoice): + def __init__(self, **kwargs): + DropdownChoice.__init__(self, **kwargs) + self._columns = kwargs.get("columns") + + def render_input(self, varprefix, value): + html.begin_radio_group() + if self._columns != None: + html.write("<table class=radiochoice>") + html.write("<tr>") + + for n, entry in enumerate(self._choices): + if self._columns != None: + html.write("<td>") + if len(entry) > 2: # icon! + label = '<img class=icon align=absmiddle src="images/icon_%s.png" title="%s">' % \ + ( entry[2], entry[1].encode("utf-8")) + else: + label = entry[1] + html.radiobutton(varprefix, str(n), value == entry[0], label) + if self._columns != None: + html.write("</td>") + if (n+1) % self._columns == 0 and (n+1) < len(self._choices)-1: + html.write("<tr></tr>") + else: + html.write(" ") + if self._columns != None: + mod = len(self._choices) % self._columns + if mod: + html.write("<td></td>" * (self._columns - mod - 1)) + html.write("</tr></table>") + html.end_radio_group() + + # A list of checkboxes representing a list of values class ListChoice(ValueSpec):

12 years, 7 months

Check_MK Git: check_mk: Forms: switch to hoverable help

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 979ec47a0260432733a0379b230e2ef47f6e4eee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979ec47a026043… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 16:19:38 2012 +0100 Forms: switch to hoverable help --- web/htdocs/forms.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index c39dc64..8775414 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -27,7 +27,7 @@ from lib import * -def edit_dictionary(entries, value, focus=None): +def edit_dictionary(entries, value, focus=None, hover_help=True): new_value = value.copy() if html.check_transaction(): messages = [] @@ -48,8 +48,12 @@ def edit_dictionary(entries, value, focus=None): html.write("<table class=form>\n") first = True for name, vs in entries: - html.write("<tr><td class=legend>%s" % vs.title()) - if vs.help(): + + html.write("<tr><td ") + if vs.help() and hover_help: + html.write('title="%s" ' % vs.help().replace('"', """)) + html.write("class=legend>%s" % vs.title()) + if vs.help() and not hover_help: html.write("<br><i>%s</i>" % vs.help()) html.write("</td><td class=content>") if name in value:

12 years, 7 months

Check_MK Git: check_mk: New valuespec for http urls

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c484cd2cab8f66a721459b9dcf8af93efec51ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c484cd2cab8f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 15:34:02 2012 +0100 New valuespec for http urls --- web/htdocs/valuespec.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 02bd5b5..e498133 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time, re +import math, os, time, re, urlparse from lib import * # Abstract base class of all value declaration classes. @@ -300,6 +300,44 @@ class EmailAddress(TextAscii): def value_to_text(self, value): return '<a href="mailto:%s">%s</a>' % (value, value) +# Valuespec for a HTTP Url (not HTTPS), that +# automatically adds http:// to the value +class HTTPUrl(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._target= kwargs.get("target") + + def validate_value(self, value, varprefix): + TextAscii.validate_value(self, value, varprefix) + if value: + if not value.startswith("http://"): + raise MKUserError(varprefix, _("The URL must begin with http://")) + + def from_html_vars(self, varprefix): + value = TextAscii.from_html_vars(self, varprefix) + if value: + if not "://" in value: + value = "http://" + value + return value + + def value_to_text(self, url): + if not url.startswith("http://"): + url = "http://" + url + try: + parts = urlparse.urlparse(url) + if parts.path in [ '', '/' ]: + text = parts.netloc + else: + text = url[7:] + except: + text = url[7:] + + # Remove trailing / if the url does not contain + # any path component + return '<a %shref="%s">%s</a>' % ( + (self._target and 'target="%s" ' % self._target or ""), + url, text) + class TextUnicode(TextAscii): def __init__(self, **kwargs):

12 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012