Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64278 discussions

Check_MK Git: check_mk: Fixed sidebar styling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3bc80134bdfa8330af9652ae1b95193a70c268d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc80134bdfa83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 14:49:43 2012 +0200 Fixed sidebar styling --- web/htdocs/js/sidebar.js | 6 ------ web/htdocs/sidebar.css | 18 ++++++++++++++---- web/htdocs/sidebar.py | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 7000dff..d624d49 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -172,12 +172,6 @@ function snapinDrag(event) { var line = document.createElement('div'); line.setAttribute('id', 'snapinDragIndicator'); - line.style.height = '3px'; - line.style.lineHeight = '1px'; - line.style.fontSize = '1px'; - line.style.width = '250px'; - line.style.backgroundColor = '#fff'; - line.style.margin = '1px 0px 0px 5px'; var o = getSnapinTargetPos(); if (o != null) { snapinAddBefore(o.parentNode, o, line); diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index aa5ad81..be43f85 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -84,8 +84,7 @@ body.side { height: 500px; overflow: hidden; color: #000000; - padding-top: 60px; - padding-bottom: 8px; + padding-top: 55px; } /* The footer of the sidebar */ @@ -293,9 +292,9 @@ div.snapin div.footnotelink a { border-style: solid; background-color: #497e95; border-color: #86a9b8 #22404d #22414d #86a9b8; - box-shadow: 0 0 0.5px #444444; + box-shadow: 0 0 1.5px #000; font-size: 7pt; - border-radius: 4px; + border-radius: 5px; padding: 2px 6px; margin-left: 5px; } @@ -335,6 +334,17 @@ div.statebullet { box-shadow: 0px 0px 1px #123a4a; } +div#snapinDragIndicator { + height: 2px; + line-height: 1px; + font-size: 1px; + width: 249px; + background-color: #fff; + margin: 0px 0px 0px 10px; + border-radius: 3px; + box-shadow: 0px 0px 5px #ffffff; +} + /*-------------------------------------------------------------------------. | _ _ _ _ | diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 7453d5f..097bd40 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -167,7 +167,7 @@ def page_side(): restart = sidebar_snapins.get(name, {}).get('restart', False) if restart: restart_snapins.append(name) - html.write('<br></div>') + html.write('</div>') sidebar_foot() html.write('</div>')

12 years, 4 months

Check_MK Git: check_mk: Finished formalization of check_ldap

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b812ad97d5664852279507db616333dd9d450777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b812ad97d56648… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 12:10:29 2012 +0200 Finished formalization of check_ldap --- ChangeLog | 1 + checks/check_ldap | 63 +++++++++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 4 ++ 3 files changed, 68 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09215ae..c537cf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles * FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name + * New active check via WATO: check_ldap BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checks/check_ldap b/checks/check_ldap new file mode 100644 index 0000000..8f46f8c --- /dev/null +++ b/checks/check_ldap @@ -0,0 +1,63 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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_ldap_arguments(params): + name, basedn, settings = params + args = ' -b %s' % quote_shell_string(basedn) + + if "response_time" in settings: + args += ' -w %f -c %f' % ( + settings["response_time"][0]/1000.0, + settings["response_time"][1]/1000.0) + + if "timeout" in settings: + args += ' -t %d' % settings["timeout"] + + if "attribute" in settings: + args += ' -a %s' % quote_shell_string(settings["attribute"]) + + if "authentication" in settings: + binddn, password = settings["authentication"] + args += ' -D %s -P %s' % ( + quote_shell_string(binddn), + quote_shell_string(password)) + + if "port" in settings: + args += ' -p %d' % settings["port"] + + if settings.get("ssl"): + args += ' --ssl' + + return args + + +active_check_info['ldap'] = { + "command_line" : '$USER1$/check_ldap -H $HOSTADDRESS$ $ARG1$', + "argument_function" : check_ldap_arguments, + "service_description" : lambda args: "LDAP " + args[0], + "has_perfdata" : True, +} + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 0308db4..ea82ea6 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -391,6 +391,10 @@ register_rule(group, "Nagios plugins in order to try the response of an LDAP " "server."), elements = [ + TextUnicode( + title = _("Name"), + help = _("The service description will be <b>LDAP</b> plus this name"), + allow_empty = False), TextAscii( title = _("Base DN"), help = _("LDAP base, e.g. ou=Development, o=Mathias Kettner GmbH, c=de"),

12 years, 4 months

Check_MK Git: check_mk: Fix styling problem in ValueSpec Tuple

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c7b5400cd112b30f19c94660f7bc2da698517ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c7b5400cd112b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 12:13:56 2012 +0200 Fix styling problem in ValueSpec Tuple --- web/htdocs/check_mk.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 71f2b62..2e6d3f3 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -361,11 +361,11 @@ div.dictelement { table.valuespec_tuple td.tuple_left { padding-right: 8px; + padding-top: 5px; } table.valuespec_tuple td.tuple_right, table.valuespec_tuple td.tuple_left { - vertical-align: middle; padding-bottom: 3px; }

12 years, 4 months

Check_MK Git: check_mk: WATO formalization of check_ldap

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4027c1bab238c180d188e14230c1243b91da6354 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4027c1bab238c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 11:15:17 2012 +0200 WATO formalization of check_ldap Check definition still missing --- web/plugins/wato/active_checks.py | 100 +++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1de87fd..0308db4 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -383,6 +383,106 @@ register_rule(group, ), match = 'all') +register_rule(group, + "active_checks:ldap", + Tuple( + title = _("Check access to LDAP service"), + help = _("This check uses <tt>check_ldap</tt> from the standard " + "Nagios plugins in order to try the response of an LDAP " + "server."), + elements = [ + TextAscii( + title = _("Base DN"), + help = _("LDAP base, e.g. ou=Development, o=Mathias Kettner GmbH, c=de"), + allow_empty = False, + size = 60), + Dictionary( + title = _("Optional parameters"), + elements = [ + ( "attribute", + TextAscii( + title = _("Attribute to search"), + help = _("LDAP attribute to search, " + "The default is <tt>(objectclass=*)</tt>."), + size = 40, + allow_empty = False, + default_value = "(objectclass=*)", + ) + ), + ( "authentication", + Tuple( + title = _("Authentication"), + elements = [ + TextAscii( + title = _("Bind DN"), + help = _("Distinguished name for binding"), + allow_empty = False, + size = 60, + ), + TextAscii( + title = _("Password"), + help = _("Password for binding, if you server requires an authentication"), + allow_empty = False, + size = 20, + ) + ] + ) + ), + ( "port", + Integer( + title = _("TCP Port"), + help = _("Default is 389 for normal connetions and 636 for SSL connections."), + minvalue = 1, + maxvalue = 65535, + default_value = 389) + ), + ( "ssl", + FixedValue( + value = True, + totext = _("Use SSL"), + title = _("Use LDAPS (SSL)"), + help = _("Use LDAPS (LDAP SSLv2 method). This sets the default port number to 636")) + + ), + ( "version", + DropdownChoice( + title = _("LDAP Version"), + help = _("The default is to use version 2"), + choices = [ + ( "v2", _("Version 2") ), + ( "v3", _("Version 3") ), + ( "v3tls", _("Version 3 and TLS") ), + ], + default_value = "v2", + ) + ), + ( "response_time", + Tuple( + title = _("Expected response time"), + elements = [ + Float( + title = _("Warning at"), + unit = "ms", + default_value = 1000.0), + Float( + title = _("Critical at"), + unit = "ms", + default_value = 2000.0), + ]) + ), + ( "timeout", + Integer( + title = _("Seconds before connection times out"), + unit = _("sec"), + default_value = 10, + ) + ), + ]) + ]), + match = 'all' +) + + register_rule(group, "custom_checks",

12 years, 4 months

Check_MK Git: check_mk: Changed icon for clusters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc7e01c903b46fcc750290adf5d2e69cd51ab711 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc7e01c903b46f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 19:18:34 2012 +0200 Changed icon for clusters The nice heart was disliked by an unnamed person ;-) --- web/htdocs/images/icon_cluster.png | Bin 3507 -> 3465 bytes web/htdocs/images/icon_new_cluster.png | Bin 4055 -> 3383 bytes web/htdocs/images/new.png | Bin 0 -> 2699 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_cluster.png b/web/htdocs/images/icon_cluster.png index dcadad7..8467ec1 100644 Binary files a/web/htdocs/images/icon_cluster.png and b/web/htdocs/images/icon_cluster.png differ diff --git a/web/htdocs/images/icon_new_cluster.png b/web/htdocs/images/icon_new_cluster.png index a954968..074fe56 100644 Binary files a/web/htdocs/images/icon_new_cluster.png and b/web/htdocs/images/icon_new_cluster.png differ diff --git a/web/htdocs/images/new.png b/web/htdocs/images/new.png new file mode 100644 index 0000000..4019f3f Binary files /dev/null and b/web/htdocs/images/new.png differ

12 years, 4 months

Check_MK Git: check_mk: Fixed sidebar styling: add spacing at bottom

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a88ef5fce20a775529ef0a2b7ad5d4e41945e059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a88ef5fce20a77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 19:11:07 2012 +0200 Fixed sidebar styling: add spacing at bottom --- web/htdocs/js/sidebar.js | 3 +-- web/htdocs/sidebar.css | 2 +- web/htdocs/sidebar.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 0ec43e4..7000dff 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -397,8 +397,7 @@ function setSidebarHeight() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 0) + 'px'; - + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight + 0) + 'px'; oFooter = null; oContent = null; diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 7c66307..aa5ad81 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -85,7 +85,7 @@ body.side { overflow: hidden; color: #000000; padding-top: 60px; - padding-bottom: 5px; + padding-bottom: 8px; } /* The footer of the sidebar */ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 097bd40..7453d5f 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -167,7 +167,7 @@ def page_side(): restart = sidebar_snapins.get(name, {}).get('restart', False) if restart: restart_snapins.append(name) - html.write('</div>') + html.write('<br></div>') sidebar_foot() html.write('</div>')

12 years, 4 months

Check_MK Git: check_mk: Minor layout fix: prevent bookmarks from wrapping

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7ac930dd056990d508655ed6221c3624534292a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ac930dd056990… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 18:50:24 2012 +0200 Minor layout fix: prevent bookmarks from wrapping --- web/htdocs/sidebar.css | 1 + web/plugins/sidebar/shipped.py | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 88f731b..7c66307 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -321,6 +321,7 @@ div.snapin img.iconbutton { div.snapin img.iconbutton.bookmark { width: 16px; height: 16px; + margin: 0px -1px; } /* state bullets at problem host or all hosts snapin */ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 4cf53e0..b896407 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1050,7 +1050,7 @@ def render_bookmarks(): bookmarks = load_bookmarks() n = 0 for title, href in bookmarks: - html.write("<div id=\"bookmark_%d\">" % n) + html.write("<div class=bookmark id=\"bookmark_%d\">" % n) iconbutton(_("delete"), "del_bookmark.py?num=%d" % n, "side", "updateContents", 'snapin_bookmarks', css_class = 'bookmark') iconbutton(_("edit"), "edit_bookmark.py?num=%d" % n, "main", css_class = 'bookmark') html.write(link(title, href)) @@ -1130,6 +1130,17 @@ sidebar_snapins["bookmarks"] = { "author" : "Mathias Kettner", "render" : render_bookmarks, "allowed": [ "user", "admin", "guest" ], + "styles" : """ +div.bookmark { + width: 230px; + max-width: 230px; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + white-space: nowrap; + color: white; +} +""" }

12 years, 4 months

Check_MK Git: check_mk: Layout fix: prevent header from wrapping

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 430e14c404260dec944117b430427efdcf4650ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=430e14c404260d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 18:44:52 2012 +0200 Layout fix: prevent header from wrapping --- web/htdocs/htmllib.py | 6 +++--- web/htdocs/pages.css | 42 +++++++++++++++++++++++------------------- web/htdocs/wato.css | 6 ++---- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index e83f455..5a130c3 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -792,9 +792,9 @@ class html: login_text += ')' else: login_text = _("not logged in") - self.write("<table class=header><tr><td class=left>%s</td><td class=right>" - "%s     <b id=headertime>%s</b>" % - (title, login_text, time.strftime("%H:%M"))) + self.write('<table class=header><tr><td width="*" class=heading>%s</td>' % title) + self.write('<td width=240 class=right>%s   <b id=headertime>%s</b>' % + (login_text, time.strftime("%H:%M"))) self.help_visible = config.load_user_file("help", False) # cache for later usage cssclass = self.help_visible and "active" or "passive" self.write('<a id=helpbutton class=%s href="#" onclick="help_toggle();" style="display: none"></a>' % diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 037ccb0..1d2be12 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -58,38 +58,30 @@ body.main div.main { /* The content page header containing the title, user, date */ body.main table.header { width: 100%; + max-width: 100%; margin: 0 0 10px 0; padding: 0px 0px 10px 0px; border-spacing: 0px; color: #fff; } -body.main hr.header { - background-color: #fff; - height: 1px; - position: absolute; - width: 100%; - left: 0px; - padding: 0; - margin: 0; - border: 0; - top: 42px; - /* Needed for older IE versions */ +body.main table.header td { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + vertical-align: bottom; color: #fff; } - -body.main table.header td.left { +body.main table.header td.heading { font-size: 15pt; - /*font-weight: bold;*/ - vertical-align: bottom; padding-left: 0px; height: 31px; + max-width: 100px; } body.main table.header td.right { text-align: right; - vertical-align: bottom; - color: #fff; font-size: 10pt; } @@ -99,6 +91,20 @@ body.main table.header td.right img { top: 5px; } +body.main hr.header { + background-color: #fff; + height: 1px; + position: absolute; + width: 100%; + left: 0px; + padding: 0; + margin: 0; + border: 0; + top: 42px; + /* Needed for older IE versions */ + color: #fff; +} + body.main div.urldebug { color: white; width: 100%; @@ -432,8 +438,6 @@ td.content hr { } td.legend { - /* padding-top: 3px; */ - color: #884; width: 150px; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index ae0446a..46cc711 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -477,10 +477,8 @@ table.validationerror img { .wato div.info { margin-top: 10px; margin-bottom: 10px; - padding: 5px 8px; - -moz-border-radius: 3px; - background-image: url("images/form_background.png"); - background-repeat: repeat; + padding-left: 1px; + color: white; } /* Controls for the audit log paged mechanism */

12 years, 4 months

Check_MK Git: check_mk: Cleaned up, improved layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da873d7be47f4784a74df8e8836d049346504594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da873d7be47f47… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 13:39:20 2012 +0200 Cleaned up, improved layout --- web/htdocs/check_mk.css | 9 +++++- web/htdocs/pages.css | 1 - web/htdocs/valuespec.py | 3 +- web/htdocs/wato.py | 11 +++----- web/plugins/wato/check_parameters.py | 50 ++++++++++++++++----------------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index a0a1c01..71f2b62 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -78,6 +78,11 @@ input[type=text] { input[type=password] { box-shadow: 0.1px 1.2px 1.8px 0 #800 inset; } +input[type=text],input[type=text] { + height: 15px; + padding: 2px 3px; + vertical-align: middle; +} select { padding: 1px 3px; @@ -355,12 +360,12 @@ div.dictelement { } table.valuespec_tuple td.tuple_left { - padding-right: 10px; + padding-right: 8px; } table.valuespec_tuple td.tuple_right, table.valuespec_tuple td.tuple_left { - vertical-align: top; + vertical-align: middle; padding-bottom: 3px; } diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index c4c052a..037ccb0 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -457,7 +457,6 @@ div.textinputlegend { } input.date, input.time { - padding: 0ex 0.5ex; font-family: monospace; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 568b035..6200d08 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -179,7 +179,8 @@ class Integer(ValueSpec): self._display_format = kwargs.get("display_format", "%d") if "size" not in kwargs and "maxvalue" in kwargs: - self._size = 1 + int(math.log10(self._maxvalue)) + self._size = 1 + int(math.log10(self._maxvalue)) + \ + (type(self._maxvalue) == float and 3 or 0) def canonical_value(self): if self._minvalue: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 68bc94f..8e96ce8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5076,12 +5076,9 @@ def edit_value(valuespec, value, title=""): title = title + "<br>" help = valuespec.help() or "" html.write('<tr>') - if help: - html.write('<td class=legend>%s' % title) - html.help(help) - html.write("</td><td class=content>") - else: - html.write('<td colspan=2 class=content>') + html.write('<td class=legend>%s' % title) + html.help(help) + html.write("</td><td class=content>") valuespec.render_input("ve", value) html.write("</td></tr>") @@ -9338,7 +9335,7 @@ def mode_rulesets(phase): if '/' in groupname: subgroupname = groupname.split("/", 1)[1] else: - subgroupname = groupname + subgroupname = title # if do_folding: # html.begin_foldable_container("rulesets", groupname, False, subgroupname, indent=False) html.write("<h3>%s</h3>" % subgroupname) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f5c1640..e280f1e 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -34,17 +34,15 @@ register_rulegroup("checkparams", _("Parameters for Inventorized Checks"), group = "checkparams" subgroup_networking = _("Networking") -subgroup_windows = _("Windows") +# subgroup_windows = _("Windows") subgroup_storage = _("Storage, Filesystems and Files") -subgroup_cpumem = _("Memory, CPU, Kernel resources") -subgroup_time = _("Time synchronization") +subgroup_os = _("Operating System Ressources") +# subgroup_time = _("Time synchronization") subgroup_printing = _("Printers") subgroup_environment = _("Temperature, Humidity, etc.") -subgroup_database = _("SQL Databases") -subgroup_applications = _("Various applications") +subgroup_applications = _("Applications, Processes & Services") subgroup_virt = _("Virtualization") subgroup_hardware = _("Hardware, BIOS") -subgroup_ps = _("Processes and Services") register_rule(group + "/" + subgroup_networking, "ping_levels", @@ -138,7 +136,7 @@ register_rule(group + '/' + subgroup_applications, checkgroups = [] checkgroups.append(( - subgroup_windows, + subgroup_applications, "ad_replication", _("Active Directory Replication"), Tuple( @@ -317,7 +315,7 @@ checkgroups.append(( checkgroups.append(( - subgroup_time, + subgroup_os, "systemtime", _("System time offset"), Tuple( @@ -334,7 +332,7 @@ checkgroups.append(( checkgroups.append(( subgroup_storage, "fileinfo", - _("Fileinfo"), + _("Size and age of single files"), Dictionary( elements = [ ( "minage", @@ -411,7 +409,7 @@ register_rule(group + '/' + subgroup_storage, checkgroups.append(( subgroup_storage, "fileinfo-groups", - _("Fileinfo Groups"), + _("Size, age and count of file groups"), Dictionary( elements = [ ( "minage_oldest", @@ -495,7 +493,7 @@ checkgroups.append(( )) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "memory_pagefile_win", _("Memory and pagefile levels for Windows"), Dictionary( @@ -636,7 +634,7 @@ checkgroups.append(( )) checkgroups.append(( - subgroup_windows, + subgroup_applications, "msx_queues", _("MS Exchange message queues"), Tuple( @@ -690,8 +688,8 @@ checkgroups.append(( help = _("The filesystem levels will never fall below these values, when using " "the magic factor and the filesystem is very small."), elements = [ - Percentage(title = _("Warning at"), label = _("% usage"), allow_int = True), - Percentage(title = _("Critical at"), label = _("% usage"), allow_int = True)])), + Percentage(title = _("Warning at"), label = _("usage"), allow_int = True), + Percentage(title = _("Critical at"), label = _("usage"), allow_int = True)])), ( "trend_range", Optional( Integer( @@ -831,7 +829,7 @@ checkgroups.append(( checkgroups.append(( - subgroup_cpumem, + subgroup_os, "memory", _("Main memory usage (Linux / UNIX)"), Alternative( @@ -870,7 +868,7 @@ checkgroups.append(( )) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "cpu_load", _("CPU load (not utilization!)"), Tuple( @@ -886,7 +884,7 @@ checkgroups.append(( None, None)) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "cpu_utilization", _("CPU utilization (percentual)"), Optional( @@ -901,7 +899,7 @@ checkgroups.append(( None, None)) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "cpu_iowait", _("CPU utilization (disk wait)"), Optional( @@ -939,7 +937,7 @@ checkgroups.append(( None)) checkgroups.append(( - subgroup_database, + subgroup_applications, "oracle_logswitches", _("Oracle Logswitches"), Tuple( @@ -958,7 +956,7 @@ checkgroups.append(( checkgroups.append(( - subgroup_windows, + subgroup_applications, "win_dhcp_pools", _("Windows DHCP Pool"), Tuple( @@ -974,7 +972,7 @@ checkgroups.append(( None)) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "threads", _("Number of threads"), Tuple( @@ -986,7 +984,7 @@ checkgroups.append(( None, None)) checkgroups.append(( - subgroup_cpumem, + subgroup_os, "vm_counter", _("Number of kernel events per second"), Tuple( @@ -1070,7 +1068,7 @@ checkgroups.append(( None, None)) checkgroups.append(( - subgroup_time, + subgroup_os, "uptime", _("Display the system's uptime as a check"), None, @@ -1148,7 +1146,7 @@ checkgroups.append(( checkgroups.append(( - subgroup_ps, + subgroup_applications, "services", _("Windows services"), None, @@ -1237,7 +1235,7 @@ checkgroups.append(( checkgroups.append(( - subgroup_ps, + subgroup_applications, "wmic_process", _("Memory and CPU of processes on Windows"), Tuple( @@ -1308,7 +1306,7 @@ group = "static" # Add checks that have parameters but are only configured as manual checks checkgroups.append(( - subgroup_ps, + subgroup_applications, "ps", _("State and count of processes"), Tuple(

12 years, 4 months

Check_MK Git: check_mk: Minor layout improvement for sidebar butons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2afb1d51e447999934ef962dc4ac075ded2e8e24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2afb1d51e44799… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 12 13:13:11 2012 +0200 Minor layout improvement for sidebar butons --- web/htdocs/sidebar.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 03b68fe..88f731b 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -296,7 +296,7 @@ div.snapin div.footnotelink a { box-shadow: 0 0 0.5px #444444; font-size: 7pt; border-radius: 4px; - padding: 1px 4px; + padding: 2px 6px; margin-left: 5px; }

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits