Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Now really fixed make mrproper

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 124deaba0684cf1fc7538998ba6e4e6c9e1093e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=124deaba0684cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:48:31 2012 +0200 Now really fixed make mrproper --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c51bafe..0067e9f 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ clean: find -name "*~" | xargs rm -f mrproper: - git clean -xfd .bugs + git clean -xfd -e .bugs || git clean -xfd check: @set -e ; for checkfile in *.HS ; do \

12 years, 4 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: 08f0ed2310458dc3542bcd2d6f2bc5ffd3695f8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08f0ed2310458d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:48:59 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: Makefile ---

12 years, 4 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c298906f6b44c031e162dc96dcec150278363b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c298906f6b44c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:46:40 2012 +0200 Merge branch 'master' of /var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fixed make mrproper

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 064eee6f237ca561f5e6c2686df18b7fe69f19bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=064eee6f237ca5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:44:45 2012 +0200 Fixed make mrproper --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 384913f..925d366 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,8 @@ clean: mrproper: git clean -xfd .bugs + rm -f *.rpm *.tar.gz *.deb *.exe + check: @set -e ; for checkfile in *.HS ; do \

12 years, 4 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: 7e4875e4173c4443310b82219a2e3fee113a1a6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4875e4173c44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:42:25 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f9c49c564f8b40d451e47f6545a74c2687193137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c49c564f8b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:42:16 2012 +0200 minor layout fixes --- web/htdocs/pages.css | 16 +++++++++++----- web/plugins/views/layouts.py | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 62c8683..5c6ecae 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -247,7 +247,6 @@ table.data .checkbox_hover { table.data th { font-weight: normal; - border-left: 1px solid #ccc; border-right: 1px solid #ccc; background-color: #999; padding: 2px 2px; @@ -255,6 +254,9 @@ table.data th { color: #fff; vertical-align: middle; } +table.data th:last-child { + border-right-style: none; +} /* Two-lined header, for example in WATO: ChangeLog->Site Status */ table.data tr.dualheader th { @@ -289,12 +291,14 @@ table.data th.tablegap { } table.data tr.data td { - border-left: 1px solid #ccc; border-right: 1px solid #ccc; padding: 2px 4px; height: 22px; vertical-align: middle; } +table.data tr.data td:last-child { + border-right-style: none; +} table.data a { text-decoration: none; @@ -344,7 +348,7 @@ table.data td.singleicon { table.groupheader { margin: 0px; border: 0px; - padding: 0px; + padding: 6px 0px 3px 0px; } tr.groupheader td { @@ -365,9 +369,11 @@ tr.groupheader a:hover { /* state in group header must have fixed width */ .groupheader td.state { - width: 50px; + border: 1px solid #000000; + border-radius: 5px 5px 5px 5px; + box-shadow: 1px 1px 2px #444444; padding: 2px 5px; - border: 1px solid #fff; + width: 50px; } img.iconbutton { diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 592a8c4..8418616 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -162,7 +162,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show # render one group def render_group(header, rows): - html.write("<table class=groupheader><tr class=groupheader>") + html.write("<table class=groupheader cellspacing=0 cellpadding=0 border=0><tr class=groupheader>") painted = False for p in group_painters: if painted: @@ -393,7 +393,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ group_open = True visible_row_number = 0 html.write("<tr class=groupheader>") - html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % + html.write("<td class=groupheader colspan=%d><table class=groupheader cellspacing=0 cellpadding=0 border=0><tr>" % (num_painters * (num_columns + 2) + (num_columns - 1))) painted = False for p in group_painters:

12 years, 4 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5118122f795028b84f949a437e08ddbe7ad95f91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5118122f795028… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:32:51 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b519b9..ede25ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) * FIX: fix configuration of passive checks via custom_checks + * Added NOTIFICATIONTYPE to host/service mail bodies WATO: * Site management: "disabled" only applies to Livestatus now

12 years, 4 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: 2fdb012d03254131a076517a274337e8cf5c55e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fdb012d032541… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:33:01 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fixed spaces after gettext function call

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 661ea82bafc44815da7919f21534b62d5d6e62a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=661ea82bafc448… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:31:05 2012 +0200 Fixed spaces after gettext function call --- web/plugins/wato/globals_notification.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py index 9857039..af3db6c 100644 --- a/web/plugins/wato/globals_notification.py +++ b/web/plugins/wato/globals_notification.py @@ -47,7 +47,7 @@ register_configvar(group, "notification_mail_command", TextUnicode( title = _("Email command line used for notifications"), - help = _ ("This command will be executed whenever a notification should be done. " + help = _("This command will be executed whenever a notification should be done. " "The command will receive the notification text body on standard input. " "The macro <tt>$SUBJECT$</tt> will be replaced by a text configured " "with " @@ -67,7 +67,7 @@ register_configvar(group, "notification_host_subject", TextUnicode( title = _("Email subject to use for host notifications"), - help = _ ("This template will be used as <tt>$SUBJECT$</tt> in email notifications " + help = _("This template will be used as <tt>$SUBJECT$</tt> in email notifications " "that deal with host alerts. The variable <tt>$SUBJECT$</tt> will then " "be available in <a href=\"%s\"><tt>notification_common_body</tt></a>." % ( "wato.py?mode=edit_configvar&varname=notification_common_body", @@ -79,7 +79,7 @@ register_configvar(group, "notification_service_subject", TextUnicode( title = _("Email subject to use for service notifications"), - help = _ ("This template will be used as <tt>$SUBJECT$</tt> in email notifications " + help = _("This template will be used as <tt>$SUBJECT$</tt> in email notifications " "that deal with service alerts. The variable <tt>$SUBJECT$</tt> will then " "be available in <a href=\"%s\"><tt>notification_common_body</tt></a>." % ( "wato.py?mode=edit_configvar&varname=notification_common_body", @@ -92,7 +92,7 @@ register_configvar(group, "notification_common_body", TextAreaUnicode( title = _("Email body to use for both host and service notifications"), - help = _ ("This template will be used as email body when sending notifications. " + 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 in all templates:<br><br>" @@ -128,7 +128,7 @@ register_configvar(group, "notification_host_body", TextAreaUnicode( title = _("Email body to use for host notifications"), - help = _ ("This template will be appended to the <a href=\"%s\"><tt>" + help = _("This template will be appended to the <a href=\"%s\"><tt>" "notification_common_body</tt></a> when host notifications are sent." % "wato.py?mode=edit_configvar&varname=notification_common_body" ), @@ -139,7 +139,7 @@ register_configvar(group, "notification_service_body", TextAreaUnicode( title = _("Email body to use for service notifications"), - help = _ ("This template will be appended to the <a href=\"%s\"><tt>" + help = _("This template will be appended to the <a href=\"%s\"><tt>" "notification_common_body</tt></a> when service notifications are sent." % "wato.py?mode=edit_configvar&varname=notification_common_body" ),

12 years, 4 months

Check_MK Git: check_mk: Added NOTIFICATIONTYPE to host/service mail bodies

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e28fa561d0913a0c1b31002499c94796988f6087 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e28fa561d0913a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:31:24 2012 +0200 Added NOTIFICATIONTYPE to host/service mail bodies --- modules/notify.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index f15ba30..600a0c9 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -51,7 +51,7 @@ Alias: $HOSTALIAS$ Address: $HOSTADDRESS$ """ -notification_host_body = u"""State: $LASTHOSTSTATE$ -> $HOSTSTATE$ +notification_host_body = u"""State: $LASTHOSTSTATE$ -> $HOSTSTATE$ ($NOTIFICATIONTYPE$) Command: $HOSTCHECKCOMMAND$ Output: $HOSTOUTPUT$ Perfdata: $HOSTPERFDATA$ @@ -59,7 +59,7 @@ $LONGHOSTOUTPUT$ """ notification_service_body = u"""Service: $SERVICEDESC$ -State: $LASTSERVICESTATE$ -> $SERVICESTATE$ +State: $LASTSERVICESTATE$ -> $SERVICESTATE$ ($NOTIFICATIONTYPE$) Command: $SERVICECHECKCOMMAND$ Output: $SERVICEOUTPUT$ Perfdata: $SERVICEPERFDATA$

12 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012