Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Max. number of queued connections on status sockets is configurable now

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5eced094c9e7982c06c267159dbb4c199dae6b3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eced094c9e798… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 09:47:31 2012 +0200 Max. number of queued connections on status sockets is configurable now --- .bugs/869 | 8 ++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 4 ++-- mkeventd/web/plugins/wato/mkeventd.py | 16 ++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.bugs/869 b/.bugs/869 new file mode 100644 index 0000000..b3b84ec --- /dev/null +++ b/.bugs/869 @@ -0,0 +1,8 @@ +Title: number of rows in header is not updated during content reload +Component: multisite +State: open +Date: 2012-10-26 09:34:50 +Targetversion: future +Class: bug + +The "x rows" label does not seem to be updated after content reload of views. diff --git a/ChangeLog b/ChangeLog index 82270c7..2d3f64b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * New global option for enabling log entries for rule hits (debugging) * New icon linking to event views for the event services * check_mkevents outputs last worst line in service output + * Max. number of queued connections on status sockets is configurable now Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 9a63bfb..9027c47 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1148,7 +1148,7 @@ class StatusServer: os.remove(g_socket_path) self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self._socket.bind(g_socket_path) - self._socket.listen(10) + self._socket.listen(g_config['socket_queue_len']) if g_config["remote_status"]: try: @@ -1161,7 +1161,7 @@ class StatusServer: self._tcp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._tcp_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self._tcp_socket.bind(("0.0.0.0", self._tcp_port)) - self._tcp_socket.listen(10) + self._tcp_socket.listen(g_config['socket_queue_len']) log("Going to listen for status queries on TCP port %d" % self._tcp_port) except Exception, e: if opt_debug: diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 1ec46b2..67b40c4 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1248,6 +1248,22 @@ if mkeventd_enabled: ), domain = "mkeventd") + register_configvar(group, + "socket_queue_len", + Integer( + title = _("Max. number of pending connections to the status socket"), + help = _("When the Multisite GUI or the active check check_mkevents connects " + "to the socket of the event daemon in order to retrieve information " + "about current and historic events then its connection request might " + "be queued before being processed. This defines the number of unaccepted " + "connections to be queued before refusing new connections."), + minvalue = 1, + default_value = 10, + label = "max.", + unit = "pending connections", + ), + domain = "mkeventd" + ) # Settings that should also be avaiable on distributed Sites that

11 years, 11 months

Check_MK Git: check_mk: New icon linking to event views for the event services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f9c0cf787c6d5287d5538a94bc12534c52dfc20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f9c0cf787c6d5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 14:42:27 2012 +0200 New icon linking to event views for the event services --- ChangeLog | 1 + mkeventd/web/plugins/icons/mkeventd.py | 84 ++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4da1dc..c635862 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * New feature of hiding certain actions from the commands in the status GUI * FIX: rule simulator ("Try out") now handles cancelling rules correctly * New global option for enabling log entries for rule hits (debugging) + * New icon linking to event views for the event services Multisite: * Enable automation login with _username= and _secret=, while diff --git a/mkeventd/web/plugins/icons/mkeventd.py b/mkeventd/web/plugins/icons/mkeventd.py new file mode 100644 index 0000000..b87a5cc --- /dev/null +++ b/mkeventd/web/plugins/icons/mkeventd.py @@ -0,0 +1,84 @@ +#!/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. + +import mkeventd + +try: + mkeventd_enabled = config.mkeventd_enabled +except: + mkeventd_enabled = False + +def paint_mkeventd(what, row, tags, custom_vars): + # show for services based on the mkevents active check + command = row[what + '_check_command'] + + if what != 'service' or not command.startswith('check_mk_active-mkevents'): + return + + if '!' not in command: + return + + host = None + app = None + + # Extract parameters from check_command: + args = command.split('!')[1].split(' ', 1) + if not args: + return + + if len(args) >= 1: + if args[0] == '$HOSTNAME$': + host = row['host_name'] + elif args[0] == '$HOSTADDRESS$': + host = row['host_address'] + else: + host = args[0] + + # It is possible to have a central event console, this is the default case. + # Another possible architecture is to have an event console in each site in + # a distributed environment. For the later case the base url need to be + # constructed here + site = html.site_status[row['site']]["site"] + url_prefix = '' + if getattr(config, 'mkeventd_distributed', False): + url_prefix = site['url_prefix'] + 'check_mk/' + + title = _('Events of Host %s') % (host) + url = 'view.py?view_name=ec_events_of_host&event_host=' + host + + if len(args) >= 2: + app = args[1].strip('\'') + title = _('Events of Application "%s" on Host %s') % (app, host) + url += '&event_application=' + app + + return '<a href="%s"><img class=icon title="%s" src="images/icon_mkeventd.png" /></a>' % \ + (url_prefix + url, title) + +if mkeventd_enabled: + multisite_icons.append({ + 'host_columns': [ 'address' ], + 'paint': paint_mkeventd, + })

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0868

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c41598a5f7b09ad8f9c8cf0d300e6ae6502f427b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c41598a5f7b09a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 08:40:25 2012 +0200 Updated bug entries #0868 --- .bugs/868 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/868 b/.bugs/868 new file mode 100644 index 0000000..4624e59 --- /dev/null +++ b/.bugs/868 @@ -0,0 +1,10 @@ +Title: Distributed WATO setup - error message during setting up slaves +Component: wato +State: open +Date: 2012-10-26 08:38:47 +Targetversion: future +Class: bug + +In current version, when setting up the local site and a slave site in the main site, +the main site reports that it is not the "preferred peer" while there is no peer setup. +Seems like the naming of the site is somewhat relevant here.

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0867

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67c8dbb54066cbc98c594add754f0390a488c01c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c8dbb54066cb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 15:47:06 2012 +0200 Updated bug entries #0867 --- .bugs/867 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/867 b/.bugs/867 new file mode 100644 index 0000000..0f6210a --- /dev/null +++ b/.bugs/867 @@ -0,0 +1,8 @@ +Title: All rules get the dict key "docu_url" - is it really wanted? +Component: wato +State: open +Date: 2012-10-25 15:45:59 +Targetversion: future +Class: cleanup + +Since the comment and docu url have been implemented, the rules always get the dict added with an empty 'docu_url' key/value.

11 years, 11 months

Check_MK Git: check_mk: Dashboard globes can now be filtered by host_contact_group/ service_contact_group

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 384af8cfaa9f30554db61bd72f252e15d178c5d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=384af8cfaa9f30… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 11:09:50 2012 +0200 Dashboard globes can now be filtered by host_contact_group/service_contact_group --- web/htdocs/dashboard.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index b3c3c14..dbec35f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -553,6 +553,10 @@ def render_statistics(pie_id, what, table, filter): for (name, color, viewurl, query), count in table_entries: url = "view.py?view_name=" + viewurl + "&filled_in=filter&search=1&wato_folder=" \ + htmllib.urlencode(html.var("wato_folder", "")) + if host_contact_group: + url += '&opthost_contactgroup=' + host_contact_group + if service_contact_group: + url += '&optservice_contactgroup=' + service_contact_group html.write('<tr><th><a href="%s">%s</a></th>' % (url, name)) style = '' if color:

11 years, 11 months

Check_MK Git: check_mk: Dashboard "iframe" attribute can now be rendered dynamically using the

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c9664c23f0e8d3c63fcc5c26118ee9eb27b8997 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c9664c23f0e8d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 12:17:47 2012 +0200 Dashboard "iframe" attribute can now be rendered dynamically using the "iframefunc" attribute in the dashlet declaration --- ChangeLog | 2 ++ web/htdocs/dashboard.py | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7273308..66bb2fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,8 @@ "Host check command expanded" * FIX: Corrected garbled description for sorter "Service Performance data" * Dashboard globes can now be filtered by host_contact_group/service_contact_group + * Dashboard "iframe" attribute can now be rendered dynamically using the + "iframefunc" attribute in the dashlet declaration Livestatus: * Added new table statehist, used for SLA queries diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index dbec35f..2bb4e12 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -196,6 +196,10 @@ def render_dashlet(nr, dashlet, wato_folder): bg = "" html.write('<div class="dashlet_inner%s" id="dashlet_inner_%d">' % (bg, nr)) + # Optional way to render a dynamic iframe URL + if "iframefunc" in dashlet: + dashlet["iframe"] = dashlet["iframefunc"]() + # The method "view" is a shortcut for "iframe" with a certain url if "view" in dashlet: dashlet["iframe"] = "view.py?view_name=%s&display_options=HRSIXL&_body_class=dashlet" % dashlet["view"]

11 years, 11 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: 2cbcb01352e4cf5d13ceb1a2f0beebb3547f79a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cbcb01352e4cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Oct 27 18:20:35 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0870, #0871

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3ea6c97234229e9009ff79e7f6278300cbacb966 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea6c97234229e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 26 12:45:11 2012 +0200 Updated bug entries #0870, #0871 --- .bugs/870 | 12 ++++++++++++ .bugs/871 | 10 ++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/.bugs/870 b/.bugs/870 new file mode 100644 index 0000000..89b9435 --- /dev/null +++ b/.bugs/870 @@ -0,0 +1,12 @@ +Title: livestatus.log is spammed with "Time to process request" +Component: livestatus +State: open +Date: 2012-10-26 12:31:04 +Targetversion: future +Class: cleanup + +Seems on each livestatus request a log entry + +"2012-10-26 12:25:49 Time to process request" + +is sent to the livestatus logfile. This entry is not very informative, why not simply drop it? diff --git a/.bugs/871 b/.bugs/871 new file mode 100644 index 0000000..11593c4 --- /dev/null +++ b/.bugs/871 @@ -0,0 +1,10 @@ +Title: When adding a new site all sites are marked as dirty +Component: wato +State: open +Date: 2012-10-26 12:43:07 +Targetversion: future +Class: nastiness + +When adding a new site or changing the configuration of a site, all sites +are marked as dirty. It would be better to only mark the master site (currently editing on) +and the modified site as dirty.

11 years, 11 months

Check_MK Git: check_mk: zfsget: next try: replace zfslist with zfsget

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9da95e75a2a27844c7f461a7e72a523f81622128 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9da95e75a2a278… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 26 18:00:22 2012 +0200 zfsget: next try: replace zfslist with zfsget --- ChangeLog | 2 +- agents/check_mk_agent.freebsd | 4 +- agents/check_mk_agent.linux | 4 +- agents/check_mk_agent.solaris | 4 +- checkman/zfsget | 34 ++++++ checkman/zfslist | 13 -- checks/zfsget | 123 ++++++++++++++++++++ checks/zfslist | 82 ------------- .../{check_mk-zfslist.php => check_mk-zfsget.php} | 0 web/plugins/perfometer/check_mk.py | 2 +- 10 files changed, 165 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9da95e75a2…

11 years, 11 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: c6a09979d42e9c8325f7b15427ce5369bb3c107c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6a09979d42e9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 26 18:00:26 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 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 2012