Checkmk git commits September 2012

checkmk-commits@lists.checkmk.com

1 participants
212 discussions

Check_MK Git: check_mk: FIX: Remove also user settings and event console rule on factory reset

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3584c594cac74802badb472d6db20094c5ba5892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3584c594cac748… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 10 15:48:59 2012 +0200 FIX: Remove also user settings and event console rule on factory reset --- ChangeLog | 1 + web/htdocs/wato.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40b9e07..9dff937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given + * FIX: Remove also user settings and event console rule on factory reset BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e078419..8d3cbc2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5135,14 +5135,20 @@ def factory_reset(): for id in users.keys(): if id != config.user_id: del users[id] - save_users(users) # this will cleanup htpasswd - for path in [ root_dir, multisite_dir, sites_mk, log_dir ]: + to_delete = [ path for c,n,path + in backup_paths + if n != "auth.secret" ] + [ log_dir ] + for path in to_delete: if os.path.isdir(path): shutil.rmtree(path) elif os.path.exists(path): os.remove(path) + make_nagios_directory(multisite_dir) + make_nagios_directory(root_dir) + + save_users(users) # make sure, omdadmin is present after this log_pending(SYNCRESTART, None, "factory-reset", _("Complete reset to factory settings."))

12 years

Check_MK Git: check_mk: Added IP address example to jolokia.cfg

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ca42d955594e48bb2e6e32a68c965415b9c7cda URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ca42d955594e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 10 11:33:25 2012 +0200 Added IP address example to jolokia.cfg --- agents/jolokia.cfg | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/agents/jolokia.cfg b/agents/jolokia.cfg index c54fe02..0cab344 100644 --- a/agents/jolokia.cfg +++ b/agents/jolokia.cfg @@ -2,6 +2,7 @@ # instance: # Settings for authentication +# server = "127.0.0.1" # user = "monitoring" # password = None # mode = "digest" @@ -16,6 +17,7 @@ instance = None # "instance" : "FOO", # }, # { +# "server" : "10.1.88.5", # "port" : 8081, # "instance" : "BAR", # "user" : "harri",

12 years

Check_MK Git: check_mk: zypper: new check and plugin mk_zypper for checking zypper updates.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e20adce58fd4936ef1e68c82bb5da90b2486afdf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e20adce58fd493… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 7 15:14:22 2012 +0200 zypper: new check and plugin mk_zypper for checking zypper updates. --- ChangeLog | 1 + agents/plugins/mk_zypper | 40 +++++++++++++++++++++ checkman/zypper | 17 +++++++++ checks/zypper | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d4d2e3..fa90330 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * Added Agent for OpenBSD * Added Checks for UPS devices * cisco_hsrp: New Check for monitoring HSRP groups on Cisco Routers. (SMIv2 version) + * zypper: new check and plugin mk_zypper for checking zypper updates. WATO: * Added permission to control the "clone host" feature in WATO diff --git a/agents/plugins/mk_zypper b/agents/plugins/mk_zypper new file mode 100755 index 0000000..64f7bb9 --- /dev/null +++ b/agents/plugins/mk_zypper @@ -0,0 +1,40 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +if type zypper > /dev/null ; then + echo '<<<zypper:sep(124)>>>' + if grep -q '^VERSION = 10' < /etc/SuSE-release + then + ZYPPER='waitmax 10 zypper --no-gpg-checks --non-interactive --terse' + $ZYPPER refresh > /dev/null + { $ZYPPER pchk || [ $? = 100 -o $? = 101 ] && $ZYPPER lu ; } \ + | egrep '(patches needed|\|)' | egrep -v '^(#|Repository |Catalog )' + else + ZYPPER='waitmax 10 zypper --no-gpg-checks --non-interactive --quiet' + $ZYPPER refresh > /dev/null + { { $ZYPPER pchk || [ $? = 100 -o $? = 101 ] && $ZYPPER lp ; } ; $ZYPPER ll ; } \ + | egrep '(patches needed|\|)' | egrep -v '^(#|Repository)' + fi +fi diff --git a/checkman/zypper b/checkman/zypper new file mode 100644 index 0000000..1044306 --- /dev/null +++ b/checkman/zypper @@ -0,0 +1,17 @@ +title: Check for (security) updates via Zypper +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check checks for available updates via {zypper} and SLES + and OPENSUSE distributions. You need to install the plugin {mk_zypper} + into the {plugins} directory of your agent. + + The check gets critical if there are security updates available. + It gets warning, if there are other updates available or if package + locks exist (created by {zypper addlock}). + +inventory: + One service will be created for each system where the {mk_zypper} + plugin produces a non-empty output. diff --git a/checks/zypper b/checks/zypper new file mode 100644 index 0000000..49a6a4c --- /dev/null +++ b/checks/zypper @@ -0,0 +1,88 @@ +#!/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. + +# <<<zypper:sep(124)>>> +# 5 patches needed (2 security patches) +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-326 | 1 | recommended | needed | Softwarestack update +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-316 | 1 | security | needed | bind: Fixed a remote denial of service +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-318 | 1 | recommended | needed | mdadm: fixed some race conditions during startup +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-320 | 1 | security | needed | update for libxml2 +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-321 | 1 | recommended | needed | sudo: fixed pam session leak and tls option handling +# Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-324 | 1 | recommended | needed | util-linux: make mount honor 'noexec' and 'user' option +# 1 | apache | package | (any) +# 2 | mysql | package | (any) + + +def inventory_zypper(info): + if len(info) > 0: + return [(None,{})] + +def check_zypper(_no_item, _no_params, info): + patch_types = {} + updates = 0 + locks = [] + for line in info: + # 5 patches needed (2 security patches) + if len(line) >= 6 and line[4].strip() == 'needed': + patch_type = line[3].strip() + patch_types.setdefault(patch_type, 0) + patch_types[patch_type] += 1 + updates += 1 + elif len(line) == 4: + locks.append(line[1]) + + if patch_types.get('security'): + state = 2 + elif updates: + state = 1 + else: + state = 0 + + infotext = nagios_state_names[state] + " - %d updates" % updates + if updates: + patch_items = patch_types.items() + patch_items.sort() + infos = [] + for t,c in patch_items: + infos.append("%s: %d(%s)" % (t, c, t == "security" and '!!' or '!')) + infotext += " (" + ", ".join(infos) + ")" + + if locks: + state = max(1, state) + infotext += ", %d locks(!)" % len(locks) + + return state, infotext + + + + return 3, "Hirni" + +check_info['zypper'] = { + "check_function" : check_zypper, + "inventory_function" : inventory_zypper, + "service_description" : "Zypper Updates", +} +

12 years

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: 85e2f1d7a6c7635da63e0c836a28214e0c5f6d68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85e2f1d7a6c763… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 10 12:05:51 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Contacts can now define *_notification_commands attributes which can now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e69be2ae37b2ad9267007cad4c233051557e9b25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e69be2ae37b2ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 13:56:30 2012 +0200 Contacts can now define *_notification_commands attributes which can now override the default notification command check-mk-notify --- ChangeLog | 2 ++ modules/check_mk.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4d4d2e3..2612221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ end of each rule. * parent scan: skip gateways that are reachable via PING * Allow subcheck to be in a separate file (e.g. foo.bar) + * Contacts can now define *_notification_commands attributes which can now + override the default notification command check-mk-notify Checks & Agents: * New Checks for Siemens Blades (BX600) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2f00b2b..46e01d2 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2087,7 +2087,7 @@ def create_nagios_config_contacts(outfile): no = "n" outfile.write(" %s_notification_options\t%s\n" % (what, ",".join(list(no)))) outfile.write(" %s_notification_period\t%s\n" % (what, contact.get("notification_period", "24X7"))) - outfile.write(" %s_notification_commands\tcheck-mk-notify\n" % what) + outfile.write(" %s_notification_commands\t%s\n" % (what, contact.get("%s_notification_commands" % what, "check-mk-notify"))) outfile.write(" contactgroups\t\t\t%s\n" % ", ".join(cgrs)) outfile.write("}\n\n")

12 years

Check_MK Git: check_mk: FIX: fixed logwatch loosing the master_url parameter in distributed setups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e12b897a36ef9afb73215a61017148447e7d5941 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e12b897a36ef9a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 14:23:21 2012 +0200 FIX: fixed logwatch loosing the master_url parameter in distributed setups --- ChangeLog | 1 + web/htdocs/logwatch.py | 39 +++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2612221..d48feba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored * FIX: fixed bug showing only sidebar after re-login in multisite + * FIX: fixed logwatch loosing the master_url parameter in distributed setups Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 6004d4e..0747285 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -63,7 +63,7 @@ def page_show(): raise MKAuthException(_("You are not allowed to access the logs of the host %s") % htmllib.attrencode(host)) if filename: - if html.has_var('ack') and not html.var("_do_actions") == _("No"): + if html.has_var('_ack') and not html.var("_do_actions") == _("No"): html.live.set_auth_domain('action') do_log_ack(host, filename) else: @@ -90,11 +90,11 @@ def show_log_list(): # Shows all problematic logfiles of a host def show_host_log_list(host): master_url = html.var('master_url', '') - html.header(_("Logfiles of host %s") % host, stylesheets = stylesheets) + html.header(_("Logfiles of Host %s") % host, stylesheets = stylesheets) html.begin_context_buttons() html.context_button(_("Services"), "%sview.py?view_name=host&site=&host=%s" % (master_url, htmllib.urlencode(host)), 'services') - html.context_button(_("All logfiles"), "logwatch.py") + html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) html.context_button(_("Analyze Host Patterns"), "%swato.py?mode=pattern_editor&host=%s" % (master_url, htmllib.urlencode(host)), 'analyze') html.end_context_buttons() @@ -131,8 +131,8 @@ def list_logs(host, logfiles): html.write("<tr class=%s%d>\n" % (rowno % 2 == 0 and "odd" or "even", state)) html.write("<td class=\"state%d\">%s</td>\n" % (state, state_name)) - html.write("<td><a href=\"logwatch.py?host=%s&file=%s\">%s</a></td>\n" % - (htmllib.urlencode(host), htmllib.urlencode(file_display),htmllib.attrencode(file_display))) + html.write("<td><a href=\"%s\">%s</a></td>\n" % + (html.makeuri([('host', host), ('file', file_display)]), htmllib.attrencode(file_display))) html.write("<td>%s</td><td>%s</td></tr>\n" % \ (form_datetime(last_log['datetime']), len(logs))) @@ -144,16 +144,16 @@ def show_file(host, filename): master_url = html.var('master_url', '') int_filename = form_file_to_int(filename) - html.header(_("Logfiles of host %s: %s") % (host, filename), stylesheets = stylesheets) + html.header(_("Logfiles of Host %s: %s") % (host, filename), stylesheets = stylesheets) html.begin_context_buttons() html.context_button(_("Services"), "%sview.py?view_name=host&site=&host=%s" % (master_url, htmllib.urlencode(host)), 'services') - html.context_button(_("All Logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) - html.context_button(_("All Logfiles"), "logwatch.py") + html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) + html.context_button(_("All Logfiles"), html.makeuri([('host', ''), ('file', '')])) html.context_button(_("Analyze Patterns"), "%swato.py?mode=pattern_editor&host=%s&file=%s" % (master_url, htmllib.urlencode(host), htmllib.urlencode(filename)), 'analyze') - if html.var('hidecontext', 'no') == 'yes': + if html.var('_hidecontext', 'no') == 'yes': hide_context_label = _('Show Context') hide_context_param = 'no' hide = True @@ -175,14 +175,13 @@ def show_file(host, filename): return if config.may("general.act") and may_see(host): - html.context_button(_("Clear Log"), "logwatch.py?host=%s&file=%s&ack=1" % \ - (htmllib.urlencode(host), htmllib.urlencode(filename) ), 'delete') + html.context_button( + _("Clear Log"), + html.makeuri([('_ack', '1')]), + 'delete' + ) - html.context_button(_("Context"), 'logwatch.py?host=%s&file=%s&hidecontext=%s">%s</a>' % \ - (htmllib.urlencode(host), \ - htmllib.urlencode(filename), \ - htmllib.urlencode(hide_context_param), \ - htmllib.attrencode(hide_context_label) )) + html.context_button(hide_context_label, html.makeuri([('_hidecontext', hide_context_param)])) html.end_context_buttons() @@ -215,13 +214,13 @@ def show_file(host, filename): def do_log_ack(host, filename): file = form_file_to_int(filename) file_display = form_file_to_ext(file) - html.header(_("Acknowledge logfile %s - %s") % (htmllib.attrencode(host), file_display), stylesheets = stylesheets) + html.header(_("Acknowledge Logfile %s - %s") % (htmllib.attrencode(host), file_display), stylesheets = stylesheets) html.begin_context_buttons() - html.context_button(_("All logfiles of Host"), "logwatch.py?host=%s" % htmllib.urlencode(host)) + html.context_button(_("All Logfiles of Host"), html.makeuri([('file', '')])) html.end_context_buttons() - ack = html.var('ack') + ack = html.var('_ack') if not html.confirm(_("Do you really want to acknowledge the log file <tt>%s</tt> by <b>deleting</b> all stored messages?") % filename): html.footer() return @@ -234,7 +233,7 @@ def do_log_ack(host, filename): # filter invalid values if ack != '1': - raise MKUserError('ack', _('Invalid value for ack parameter.')) + raise MKUserError('_ack', _('Invalid value for ack parameter.')) try: os.remove(defaults.logwatch_dir + '/' + host + '/' + file)

12 years

Check_MK Git: check_mk: Bugfix: Fixed doubled var in view editor ( site and siteopt filter)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e89eadd9a4d3d44018aa9ec4f929e819a92af7ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e89eadd9a4d3d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 16:04:40 2012 +0200 Bugfix: Fixed doubled var in view editor (site and siteopt filter) (View-Editor: siteopt und site Filter haben beide das Formularfeld "name". Eines ist eventuell versteckt und setzt einen anderen Wert, als das Feld, was man gerade gewählt hat) --- web/plugins/views/filters.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 4fe3a1b..0cc63b0 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -324,20 +324,20 @@ declare_filter(232, FilterNagiosExpression("service", "in_downtime", class FilterSite(Filter): def __init__(self, name, enforce): - Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, ["site"], []) + Filter.__init__(self, name, _("Site") + (enforce and _( " (enforced)") or ""), None, [name], []) self.enforce = enforce def visible(self): return config.is_multisite() def display(self): - site_selector(html, "site", self.enforce) + site_selector(html, self.name, self.enforce) def filter(self, infoname): if config.is_multisite(): - site = html.var("site") + site = html.var(self.name) if site: - return "Sites: %s\n" % (html.var("site", "")) + return "Sites: %s\n" % (html.var(self.name, "")) elif not self.enforce: return "" else: @@ -346,7 +346,7 @@ class FilterSite(Filter): return "" def heading_info(self, infoname): - current_value = html.var("site") + current_value = html.var(self.name) if current_value: alias = config.site(current_value)["alias"] return alias

12 years

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: 849992badbd6b769905e6fd2ce8d3e421950c84b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=849992badbd6b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 18:07:29 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: User managament: Added fields for editing host/ service notification commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: db80fb204bcaed7f9abf00ed0978c141af494164 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db80fb204bcaed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 16:55:01 2012 +0200 User managament: Added fields for editing host/service notification commands --- ChangeLog | 1 + web/htdocs/wato.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 724a7c4..a074bc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * new: search for rules in "Host & Service Configuration" * parent scan: new option "ping probes", that allows skipping unreachable gateways. + * User managament: Added fields for editing host/service notification commands * FIX: Removed double collect_hosts() call in activate changes hook * FIX: Fixed double hook execution when using localized multisite diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0eb9438..ff95d1d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7701,6 +7701,8 @@ def mode_edit_user(phase): for what, opts in [ ( "host", "durfs"), ("service", "wucrfs") ]: new_user[what + "_notification_options"] = "".join( [ opt for opt in opts if html.get_checkbox(what + "_" + opt) ]) + # FIXME: Validate notification commands. Do they really exist? + new_user[what + "_notification_commands"] = html.var(what + "_notification_commands") # Custom attributes for name, vs in user_attributes: @@ -7875,6 +7877,15 @@ def mode_edit_user(phase): "will be notified to this contact. Note: these settings will only be saved " "and used if the user is member of a contact group.")) + # Notification commands + # FIXME: Add dropdown. But where to get a list of notification commands? + forms.section(_("Notification Command for Hosts")) + html.text_input("host_notification_commands", user.get("host_notification_commands", "check-mk-notify")) + html.help(_("Use this Nagios command for sending host notifications.")) + forms.section(_("Notification Command for Services")) + html.text_input("service_notification_commands", user.get("service_notification_commands", "check-mk-notify")) + html.help(_("Use this Nagios command for sending service notifications.")) + forms.header(_("Personal Settings"), isopen = False) select_language(user.get('language', '')) for name, vs in user_attributes:

12 years

Check_MK Git: check_mk: Sidebar: Sorting aggregation groups in BI snapin now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e23fcba7e5f7efd8b92b36e5bcaf14a258fe82e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e23fcba7e5f7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 6 17:07:05 2012 +0200 Sidebar: Sorting aggregation groups in BI snapin now --- ChangeLog | 2 ++ web/plugins/sidebar/bi.py | 9 +++++---- web/plugins/sidebar/shipped.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a074bc6..913c60d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,8 @@ Multisite: * Added css class="dashboard_<name>" to the dashboard div for easier customization of the dashboard style of a special dashboard + * Sidebar: Sorting aggregation groups in BI snapin now + * Sidebar: Sorting sites in master control snapin case insensitive * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index f044c5f..fe34c6b 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -36,10 +36,11 @@ except NameError: def render_bi_groups(): bi.compile_forest(config.user_id) html.write("<ul>") - for group, trees in bi.g_user_cache["forest"].items(): - if len(trees) > 0: - bulletlink(group, "view.py?view_name=aggr_group&aggr_group=%s" % - htmllib.urlencode(group)) + group_names = [ group for group, trees in bi.g_user_cache["forest"].items() if trees ] + group_names = sorted(group_names, cmp = lambda a,b: cmp(a.lower(), b.lower())) + for group in group_names: + bulletlink(group, "view.py?view_name=aggr_group&aggr_group=%s" % + htmllib.urlencode(group)) html.write("</ul>") sidebar_snapins["biaggr_groups"] = { diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index de9d1a4..339aab2 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -381,7 +381,7 @@ def render_sitestatus(): sitenames = [] for sitename, site in config.allsites().iteritems(): sitenames.append((sitename, site['alias'])) - sitenames = sorted(sitenames, key=lambda k: k[1]) + sitenames = sorted(sitenames, key=lambda k: k[1], cmp = lambda a,b: cmp(a.lower(), b.lower())) for sitename, sitealias in sitenames: site = config.site(sitename)

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2012