Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

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; -} - """ }

10 years, 11 months

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; +} """ }

10 years, 11 months

Check_MK Git: check_mk: Fixed little problem with wiki_painter

by Bastian Kuhn

Module: check_mk Branch: master Commit: cca8a3df485bb83c3b8ad71c78ce5f6aec26825a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cca8a3df485bb8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Oct 1 09:19:33 2013 +0200 Fixed little problem with wiki_painter --- doc/treasures/wiki_painter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/treasures/wiki_painter.py b/doc/treasures/wiki_painter.py index c1ecae3..becbe39 100644 --- a/doc/treasures/wiki_painter.py +++ b/doc/treasures/wiki_painter.py @@ -5,6 +5,7 @@ def paint_wiki_notes(row): 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)

10 years, 11 months

Check_MK Git: check_mk: FIX: host notification email in html format: fixed formating error (typo in tag)

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 41561450502347ec59cc8856f573adaa2f1330e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41561450502347… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Oct 1 08:48:25 2013 +0200 FIX: host notification email in html format: fixed formating error (typo in tag) --- ChangeLog | 2 ++ notifications/mail | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5468cb9..ac14720 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * windows_agent: increased maximum plugin output buffer size to 2MB * 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..." diff --git a/notifications/mail b/notifications/mail index 08b6858..2891280 100755 --- a/notifications/mail +++ b/notifications/mail @@ -200,7 +200,7 @@ tmpl_host_html = tmpl_head_html + ''' <tr class="data odd0"> <td class=left>State</td> <td class="state hstate"> - <span class="hstate$LASTHOSTSTATE$">$LASTHOSTSTATE$>/span> → + <span class="hstate$LASTHOSTSTATE$">$LASTHOSTSTATE$</span> → <span class="hstate$HOSTSTATEID$">$HOSTSTATE$ ($NOTIFICATIONTYPE$)</span> since $LASTHOSTSTATECHANGE_REL$ </td>

10 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013