Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: Updated bug entries #1056

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 30d82773f7778cbe601347925f33f715b26a1484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30d82773f7778c… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 15:01:19 2013 +0200 Updated bug entries #1056 --- .bugs/1056 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.bugs/1056 b/.bugs/1056 new file mode 100644 index 0000000..b180e82 --- /dev/null +++ b/.bugs/1056 @@ -0,0 +1,17 @@ +Title: dependency to perl-Time-HiRes is missing in omd builds for centOS +Component: core +State: open +Date: 2013-10-01 14:38:34 +Targetversion: 1.2.3i3 +Class: bug + +the omd packages for CentOS/RHEL (at least for CentOS 6.4 64bit) do not have a dependency to +perl-Time-HiRes package. Without PNP graphs are not generated + +OMD[demo]:~/var/pnp4nagios/log$ tail npcd.log +[10-01-2013 14:42:16] NPCD: ERROR: Executed command exits with return code '2' +[10-01-2013 14:42:16] NPCD: ERROR: Command line was '/omd/sites/demo/lib/pnp4nagios/process_perfdata.pl -n -c /omd/sites/demo/etc/pnp4nagios/process_perfdata.cfg -b /omd/sites/demo/var/pnp4nagios/spool//perfdata.1380629800' + +OMD[demo]:~/var/pnp4nagios/log$ /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl +Can't locate Time/HiRes.pm in @INC (@INC contains: /omd/versions/1.2.3i2.dmmk/lib/perl5/lib/perl5/x86_64-linux-thread-multi /omd/versions/1.2.3i2.dmmk/lib/perl5/lib/perl5 /omd/sites/demo/local/lib/perl5/lib/perl5 /omd/sites/demo/lib/perl5/lib/perl5/x86_64-linux-thread-multi /omd/sites/demo/lib/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl line 31. +BEGIN failed--compilation aborted at /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl line 31.

11 years

Check_MK Git: check_mk: Updated bug entries #1056

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5233fcc66ef8577e41eb256c1edcbcd9e32add24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5233fcc66ef857… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 15:02:57 2013 +0200 Updated bug entries #1056 --- .bugs/1056 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1056 b/.bugs/1056 index b180e82..4ed278f 100644 --- a/.bugs/1056 +++ b/.bugs/1056 @@ -1,9 +1,9 @@ Title: dependency to perl-Time-HiRes is missing in omd builds for centOS Component: core -State: open +Class: bug +State: done Date: 2013-10-01 14:38:34 Targetversion: 1.2.3i3 -Class: bug the omd packages for CentOS/RHEL (at least for CentOS 6.4 64bit) do not have a dependency to perl-Time-HiRes package. Without PNP graphs are not generated @@ -15,3 +15,6 @@ OMD[demo]:~/var/pnp4nagios/log$ tail npcd.log OMD[demo]:~/var/pnp4nagios/log$ /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl Can't locate Time/HiRes.pm in @INC (@INC contains: /omd/versions/1.2.3i2.dmmk/lib/perl5/lib/perl5/x86_64-linux-thread-multi /omd/versions/1.2.3i2.dmmk/lib/perl5/lib/perl5 /omd/sites/demo/local/lib/perl5/lib/perl5 /omd/sites/demo/lib/perl5/lib/perl5/x86_64-linux-thread-multi /omd/sites/demo/lib/perl5/lib/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl line 31. BEGIN failed--compilation aborted at /omd/sites/demo/lib/pnp4nagios/process_perfdata.pl line 31. + +2013-10-01 15:02:24: changed state open -> done +added dependency to package

11 years

Check_MK Git: check_mk: Fix typo in log message

by Mathias Kettner

Module: check_mk Branch: master Commit: 7fda9e36654a705f95e06f640253ed663b344938 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fda9e36654a70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 14:50:44 2013 +0200 Fix typo in log message --- livestatus/src/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index a3f9cd8..ca74945 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -510,7 +510,7 @@ int broker_event(int event_type __attribute__ ((__unused__)), void *data) if (g_thread_running == 1 ) livestatus_log_initial_states(); else if (log_initial_states == 1) // initi - write_to_all_logs("logging intitial states", LG_INFO); // initial info during startup + write_to_all_logs("logging initial states", LG_INFO); // initial info during startup } update_timeperiods_cache(ts->timestamp.tv_sec); return 0;

11 years

Check_MK Git: check_mk: Remove unused code

by Mathias Kettner

Module: check_mk Branch: master Commit: 1aa327a0485e34494b483da27a39ba9d4b42cc1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1aa327a0485e34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 14:50:36 2013 +0200 Remove unused code --- livestatus/src/LogEntry.cc | 149 -------------------------------------------- 1 file changed, 149 deletions(-) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index e25d328..67437fc 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -259,155 +259,6 @@ inline bool LogEntry::handleStatusEntry() return false; } -// Function is UNUSED and under DEVELOPMENT -// Might replace the handleStatusEntry function one day -// Its purpose is to reduce the amount of strcmp to speedup -// the read process. Risk: LOGCLASS Classification accuracy might suffer -inline bool LogEntry::handleStatusEntryBetter() -{ - int len_text = strlen(_text); - if (len_text < 12) - return false; - - // Patterns -// "INITIAL SERVICE STATE: " -// "CURRENT SERVICE STATE: " -// "SERVICE ALERT: " -// "SERVICE DOWNTIME ALERT: " -// "SERVICE FLAPPING ALERT: " -// "TIMEPERIOD TRANSITION: " -// "INITIAL HOST STATE: " -// "CURRENT HOST STATE: " -// "HOST ALERT: " -// "HOST DOWNTIME ALERT: " -// "HOST FLAPPING ALERT: " - - // SERVICES - if (!strncmp(_text, "SERVICE", 7) || !strncmp(_text + 8, "SERVICE", 7)) { - bool is_state = false; - if (!strncmp(_text, "INITIAL", 7)) { - _logclass = LOGCLASS_STATE; - _type = STATE_SERVICE_INITIAL; - is_state = true; - } else if (!strncmp(_text + 8, "ALERT", 5)) { - _logclass = LOGCLASS_ALERT; - _type = ALERT_SERVICE; - is_state = true; - } else if (!strncmp(_text, "CURRENT", 7)) { - _logclass = LOGCLASS_STATE; - _type = STATE_SERVICE; - is_state = true; - } - if (is_state) { - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _svc_desc = next_token(&scan, ';'); - _state = serviceStateToInt(save_next_token(&scan, ';')); - _state_type = next_token(&scan, ';'); - _attempt = atoi(save_next_token(&scan, ';')); - _check_output = next_token(&scan, ';'); - return true; - } - - if (!strncmp(_text + 8, "DOWNTIME", 8)){ - _logclass = LOGCLASS_ALERT; - _type = DOWNTIME_ALERT_SERVICE; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _svc_desc = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; - return true; - } else if (!strncmp(_text + 8, "FLAPPING", 8)) { - _logclass = LOGCLASS_ALERT; - _type = FLAPPING_SERVICE; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _svc_desc = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; - return true; - } - } else if (!strncmp(_text, "HOST", 5) || !strncmp(_text + 8, "HOST", 5)) { - bool is_state = false; - if (!strncmp(_text, "INITIAL", 7)) { - _logclass = LOGCLASS_STATE; - _type = STATE_HOST_INITIAL; - is_state = true; - } else if (!strncmp(_text + 6, "ALERT", 5)) { - _logclass = LOGCLASS_ALERT; - _type = ALERT_HOST; - is_state = true; - } else if (!strncmp(_text, "CURRENT", 7)) { - _logclass = LOGCLASS_STATE; - _type = STATE_HOST; - is_state = true; - } - if (is_state) { - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _svc_desc = next_token(&scan, ';'); - _state = serviceStateToInt(save_next_token(&scan, ';')); - _state_type = next_token(&scan, ';'); - _attempt = atoi(save_next_token(&scan, ';')); - _check_output = next_token(&scan, ';'); - return true; - } - else if (!strncmp(_text + 6, "DOWNTIME", 8)) - { - _logclass = LOGCLASS_ALERT; - _type = DOWNTIME_ALERT_HOST; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; - return true; - } - else if (!strncmp(_text + 6, "HOST FLAPPING ALERT: ", 8)) - { - _logclass = LOGCLASS_ALERT; - _type = FLAPPING_HOST; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _host_name = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); - _comment = next_token(&scan, ';') + 1; - return true; - } - - } - else if (!strncmp(_text, "TIMEPERIOD TRANSITION: ", 23)) - { - _logclass = LOGCLASS_STATE; - _type = TIMEPERIOD_TRANSITION; - char *scan = _text; - _text = next_token(&scan, ':'); - scan++; - - _command_name = next_token(&scan, ';'); - _check_output = next_token(&scan, ';'); - _state_type = next_token(&scan, ';'); - return true; - } - return false; -} inline bool LogEntry::handleNotificationEntry()

11 years

Check_MK Git: check_mk: FIX: avoid duplicate output of log message in log tables

by Mathias Kettner

Module: check_mk Branch: master Commit: bde146209259f584404e54e5240af2b9e0b7a674 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bde146209259f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 14:45:45 2013 +0200 FIX: avoid duplicate output of log message in log tables --- ChangeLog | 1 + web/plugins/views/painters.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 72e4315..e50833d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Multisite: * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None + * FIX: avoid duplicate output of log message in log tables 1.2.3i2: Core: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index d459b13..142532d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1626,7 +1626,10 @@ def paint_log_plugin_output(row): else: return "", _("The %s started flapping") % what - return "", (lst + " - " + log_type) + elif lst: + return "", (lst + " - " + log_type) + else: + return "", "" multisite_painters["log_plugin_output"] = {

11 years

Check_MK Git: check_mk: Reserved 10 bug IDS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c4a5d3dfc3a5e75319c20558a1bedb3b080e76c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4a5d3dfc3a5e7… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 14:38:13 2013 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 3680448..e255a85 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -1062 +1072

11 years

Check_MK Git: check_mk: check_icmp: New WATO rule for custom PING checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 0955d471405a6b4498b5b89641fba0f8c5b69569 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0955d471405a6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 1 11:55:01 2013 +0200 check_icmp: New WATO rule for custom PING checks --- ChangeLog | 2 + checks/check_icmp | 52 ++++++++++++++++++++++++++ pnp-templates/check_mk_active-icmp.php | 1 + web/plugins/wato/active_checks.py | 64 ++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 40 +------------------- 5 files changed, 121 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac14720..72e4315 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,13 @@ 1.2.3i3: Checks & Agents: * windows_agent: increased maximum plugin output buffer size to 2MB + * check_icmp: New WATO rule for custom PING checks * FIX: windows_agent: fixed bug in cleanup of open thread handles * FIX: cups default printer is now monitored again in linux agent * FIX: host notification email in html format: fixed formating error (typo in tag) + Multisite: * FIX: add missing service icons to view "All Services with this descr..." * FIX: ldap attribute plugins: fixed crash when parameters are None diff --git a/checks/check_icmp b/checks/check_icmp new file mode 100644 index 0000000..cd8eeee --- /dev/null +++ b/checks/check_icmp @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def check_icmp_arguments(params): + args = [] + rta = 200, 500 + loss = 80, 100 + for key, value in params.items(): + if key == "timeout": + args.append("-t %d" % value) + elif key == "packets": + args.append("-n %d" % value) + elif key == "rta": + rta = value + elif key == "loss": + loss = value + args.append("-w %.2f,%.2f%%" % (rta[0], loss[0])) + args.append("-c %.2f,%.2f%%" % (rta[1], loss[1])) + args.append("'$HOSTADDRESS$'") + return " ".join(args) + + +active_check_info['icmp'] = { + "command_line" : '$USER1$/check_icmp $ARG1$', + "argument_function" : check_icmp_arguments, + "service_description" : lambda args: args.get("description", "PING"), + "has_perfdata" : True, +} + diff --git a/pnp-templates/check_mk_active-icmp.php b/pnp-templates/check_mk_active-icmp.php new file mode 120000 index 0000000..98c29f2 --- /dev/null +++ b/pnp-templates/check_mk_active-icmp.php @@ -0,0 +1 @@ +check-mk-ping.php \ No newline at end of file diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1ee64a0..a622d4f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -29,6 +29,70 @@ register_rulegroup("activechecks", _("Configure active networking checks like HTTP and TCP")) group = "activechecks" +# This elements are also used in check_parameters.py +check_icmp_params = [ + ( "rta", + Tuple( + title = _("Round trip average"), + elements = [ + Float(title = _("Warning if above"), unit = "ms", default_value = 200.0), + Float(title = _("Critical if above"), unit = "ms", default_value = 500.0), + ])), + ( "loss", + Tuple( + title = _("Packet loss"), + help = _("When the percentual number of lost packets is equal or greater then " + "the level, then the according state is triggered. The default for critical " + "is 100%. That means that the check is only critical if <b>all</b> packets " + "are lost."), + elements = [ + Percentage(title = _("Warning if above"), default_value = 80.0), + Percentage(title = _("Critical if above"), default_value = 100.0), + ])), + + ( "packets", + Integer( + title = _("Number of packets"), + help = _("Number ICMP echo request packets to send to the target host on each " + "check execution. All packets are sent directly on check execution. Afterwards " + "the check waits for the incoming packets."), + minvalue = 1, + maxvalue = 20, + default_value = 5, + )), + + ( "timeout", + Integer( + title = _("Total timeout of check"), + help = _("After this time (in seconds) the check is aborted, regardless " + "of how many packets have been received yet."), + minvalue = 1, + )), +] + + +register_rule(group, + "active_checks:icmp", + Dictionary( + title = _("Check hosts with PING (ICMP Echo Request)"), + help = _("This ruleset allows you to configure explizit PING monitoring of hosts. " + "Usually a PING is being used as a host check, so this is not neccessary. " + "There are some situations, however, where this can be useful. One of them " + "is when using the Check_MK Micro Core with SMART Ping and you want to " + "track performance data of the PING to some hosts, nevertheless."), + elements = [ + ( "description", + TextUnicode( + title = _("Service Description"), + allow_empty = False, + default_value = "PING", + )) + ] + check_icmp_params, + match = "all", + ) +) + + register_rule(group, "active_checks:dns", Tuple( diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3b6995c..438e24a 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -50,44 +50,8 @@ register_rule(group + "/" + subgroup_networking, help = _("This rule sets the parameters for the host checks (via <tt>check_icmp</tt>) " "and also for PING checks on ping-only-hosts. For the host checks only the " "critical state is relevant, the warning levels are ignored."), - elements = [ - ( "rta", - Tuple( - title = _("Round trip average"), - elements = [ - Float(title = _("Warning if above"), unit = "ms"), - Float(title = _("Critical if above"), unit = "ms"), - ])), - ( "loss", - Tuple( - title = _("Packet loss"), - help = _("When the percentual number of lost packets is equal or greater then " - "the level, then the according state is triggered. The default for critical " - "is 100%. That means that the check is only critical if <b>all</b> packets " - "are lost."), - elements = [ - Percentage(title = _("Warning if above")), - Percentage(title = _("Critical if above")), - ])), - - ( "packets", - Integer( - title = _("Number of packets"), - help = _("Number ICMP echo request packets to send to the target host on each " - "check execution. All packets are sent directly on check execution. Afterwards " - "the check waits for the incoming packets."), - minvalue = 1, - maxvalue = 20, - )), - - ( "timeout", - Integer( - title = _("Total timeout of check"), - help = _("After this time (in seconds) the check is aborted, regardless " - "of how many packets have been received yet."), - minvalue = 1, - )), - ]), + elements = check_icmp_params, + ), match="dict") register_rule(group + '/' + subgroup_applications,

11 years

Check_MK Git: check_mk: statehist: fixed bug where entries of vanished services got assigned to hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: a648d7cd47e50684fa7717c16ae57f6276eee3f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a648d7cd47e506… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 1 11:47:39 2013 +0200 statehist: fixed bug where entries of vanished services got assigned to hosts --- livestatus/src/TableStateHistory.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index fa8522e..56bae27 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -414,22 +414,23 @@ void TableStateHistory::answerQuery(Query *query) in_nagios_initial_states = false; } + key = 0; + bool is_service = false; switch (entry->_type) { - case DOWNTIME_ALERT_SERVICE: - case DOWNTIME_ALERT_HOST: + case ALERT_SERVICE: case STATE_SERVICE: case STATE_SERVICE_INITIAL: + case DOWNTIME_ALERT_SERVICE: + case FLAPPING_SERVICE: + key = entry->_service; + is_service = true; + case ALERT_HOST: case STATE_HOST: case STATE_HOST_INITIAL: - case ALERT_SERVICE: - case ALERT_HOST: + case DOWNTIME_ALERT_HOST: case FLAPPING_HOST: - case FLAPPING_SERVICE: { - key = 0; - if (entry->_service != 0) - key = entry->_service; - else if (entry->_host != 0) + if (!is_service) key = entry->_host; if (key == 0)

11 years

Check_MK Git: check_mk: Improvments for wiki snapin and painter

by Bastian Kuhn

Module: check_mk Branch: master Commit: f7db7e241207e914d87f9950155000d2eb3ba2c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7db7e241207e9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 1 11:29:36 2013 +0200 Improvments for wiki snapin and painter --- doc/treasures/wiki_painter.py | 2 +- doc/treasures/wiki_snapin.py | 100 +++++++++++++++++++++++++---------------- 2 files changed, 62 insertions(+), 40 deletions(-) diff --git a/doc/treasures/wiki_painter.py b/doc/treasures/wiki_painter.py index becbe39..9f35443 100644 --- a/doc/treasures/wiki_painter.py +++ b/doc/treasures/wiki_painter.py @@ -5,7 +5,7 @@ def paint_wiki_notes(row): svc = svc.replace(':','') svc = svc.replace('/','') svc = svc.replace('\\','') - svc = svc.replace('','_') + svc = svc.replace(' ','_') svc = svc.lower() host = host.lower() filename = defaults.omd_root + '/var/dokuwiki/data/pages/docu/%s/%s.txt' % (host, svc) diff --git a/doc/treasures/wiki_snapin.py b/doc/treasures/wiki_snapin.py index fdb5021..f95a099 100644 --- a/doc/treasures/wiki_snapin.py +++ b/doc/treasures/wiki_snapin.py @@ -31,10 +31,37 @@ #a the dokuwiki navigation menu if set #Place the file to ~/local/share/check/web/plugins/sidebar #and restart apacher. +#Example Sidebar: +#Heading1: +# * [[link1]] +# * [[link2]] +# +#---- +# +#Heading2: +# * [[link3]] +# * [[link4]] def render_wiki(): import re filename = defaults.omd_root + '/var/dokuwiki/data/pages/sidebar.txt' + html.write("<div>") + html.javascript(""" + function wiki_search() + { + var oInput = document.getElementById('wiki_search_field'); + top.frames["main"].location.href = + "/%s/wiki/doku.php?do=search&id=" + escape(oInput.value); + } + """ % defaults.omd_site) + html.write('<form onSubmit="wiki_search()"') + html.write('<div id="wiki_search"> \n') + html.write('<input id="wiki_search_field" type="text" name="wikisearch"/>\n') + html.icon_button("#", _("Search"), "quicksearch", onclick="wiki_search();") + html.write('</div>\n<div class="mk_side_clear"></div>\n') + html.write('</form><br><br>') + + html.write("<div id='wiki_navigation'>") start_ul = True ul_started = False try: @@ -88,20 +115,9 @@ def render_wiki(): html.write("</ul>") except IOError: html.write("You have to create a sidebar first") + html.write("</div>") #Navigation + html.write("</div>") #Snapin total - html.write("<hr>") - html.javascript(""" - function wiki_search() - { - var oInput = document.getElementById('wikisearch_input'); - top.frames["main"].location.href = - "/%s/wiki/doku.php?do=search&id=" + escape(oInput.value); - } - """ % defaults.omd_site) - html.begin_form("wikisearch", onsubmit="wiki_search();") - html.text_input("wikisearch", "", id="wikisearch_input", ) - html.icon_button("#", _("Search"), "wikisearch", onclick="wiki_search();") - html.end_form() if defaults.omd_root: sidebar_snapins["wiki"] = { @@ -114,35 +130,41 @@ if defaults.omd_root: font-weight: bold; color: white; } - input#wikisearch_input { - # margin-top: 3px; - # width: 222px; - margin: 0; - padding: 0px 5px; - font-size: 8pt; - width: 194px; - height: 25px; - background-image: url("images/quicksearch_field_bg.png"); - background-repeat: no-repeat; - -moz-border-radius: 0px; - border-style: none; - float: left; + + #wiki_navigation { + text-align: left; + } + + #wiki_search { + width: 232px; + padding: 0; + } + + #mk_side_clear { + clear: both; } - #snapin_container_wiki hr { - margin: 5px 2px; + + #wiki_search img.iconbutton { + width: 33px; + height: 26px; + margin-top: -25px; + left: 196px; + float:right; + z-index:100; } - #snapin_container_wiki ul { - margin: 1px; + + #wiki_search input { + margin: 0; + padding: 0px 5px; + font-size: 8pt; + width: 194px; + height: 25px; + background-image: url("images/quicksearch_field_bg.png"); + background-repeat: no-repeat; + -moz-border-radius: 0px; + border-style: none; + float: left; } -#wikisearch img.iconbutton { - width: 33px; - height: 26px; - margin-top: -25px; - left: 196px; - float:right; - z-index:100; -} - """ }

11 years

Check_MK Git: check_mk: And now fixed the wiki_snapin bug really

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3c00ed965b2e46735b19032039ab95359ed152b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c00ed965b2e46… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 1 10:11:52 2013 +0200 And now fixed the wiki_snapin bug really --- doc/treasures/wiki_snapin.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/treasures/wiki_snapin.py b/doc/treasures/wiki_snapin.py index 1520d35..fdb5021 100644 --- a/doc/treasures/wiki_snapin.py +++ b/doc/treasures/wiki_snapin.py @@ -100,6 +100,7 @@ def render_wiki(): """ % defaults.omd_site) html.begin_form("wikisearch", onsubmit="wiki_search();") html.text_input("wikisearch", "", id="wikisearch_input", ) + html.icon_button("#", _("Search"), "wikisearch", onclick="wiki_search();") html.end_form() if defaults.omd_root: @@ -114,8 +115,18 @@ if defaults.omd_root: color: white; } input#wikisearch_input { - margin-top: 3px; - width: 222px; + # margin-top: 3px; + # width: 222px; + margin: 0; + padding: 0px 5px; + font-size: 8pt; + width: 194px; + height: 25px; + background-image: url("images/quicksearch_field_bg.png"); + background-repeat: no-repeat; + -moz-border-radius: 0px; + border-style: none; + float: left; } #snapin_container_wiki hr { margin: 5px 2px; @@ -123,6 +134,14 @@ if defaults.omd_root: #snapin_container_wiki ul { margin: 1px; } +#wikisearch img.iconbutton { + width: 33px; + height: 26px; + margin-top: -25px; + left: 196px; + float:right; + z-index:100; +} """ }

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits