Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: Availability: add summary line to table

by Mathias Kettner

Module: check_mk Branch: master Commit: 44ddff698635134c0858143d382eb827de944d1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44ddff69863513… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 14:31:28 2013 +0100 Availability: add summary line to table --- web/htdocs/views.css | 12 +++++++ web/plugins/views/availability.py | 63 +++++++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3a82d5a..46fa294 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -485,6 +485,17 @@ table.data.availability td.unused { text-shadow: 1px 1px 0.5px #fff; } +table.data.availability tr.summary { + background-color: #bbb; +} +table.data.availability tr.summary td { + border-top: 1px solid black; + font-weight: bold; + border-bottom-style: none; + padding-bottom: 1px; + padding-top: 1px; +} + table.data td.flapping, table.timeline td.flapping { /* background-image: url("images/bg_flapping.png"); background-repeat: repeat; */ @@ -520,6 +531,7 @@ div#avoptions_on { margin-right: 3px; } + table.timeline { width: 800px; margin-bottom: 20px; diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 17c90a0..bf2c401 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -242,6 +242,21 @@ avoption_entries = [ title = _("Phase Merging"), label = _("Do not merge consecutive phases with equal state")), ), + + # Summary line + ( "summary", + "single", + DropdownChoice( + title = _("Summary line"), + choices = [ + ( None, _("Do not show a summary line") ), + ( "sum", _("Display total sum (for % the average)") ), + ( "average", _("Display average") ), + ], + default_value = sum, + ) + ), + ] @@ -267,6 +282,7 @@ def render_availability_options(): }, "short_intervals" : 0, "dont_merge" : False, + "summary" : "sum", }) is_open = False @@ -679,8 +695,25 @@ def render_availability_table(availability, from_time, until_time, range_title, sg = avoptions["state_grouping"] state_groups = [ sg["warn"], sg["unknown"], sg["host_down"] ] + # Helper function, needed in row and in summary line + def cell_active(sid): + if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: + return False + elif sid == "in_downtime" and avoptions["downtimes"]["include"] == "ignore": + return False + elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: + return False + elif sid == "flapping" and not avoptions["consider"]["flapping"]: + return False + elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: + return False + else: + return True + # Render the stuff availability.sort() + show_summary = what != "bi" and avoptions.get("summary") + summary = {} table.begin(_("Availability") + " " + range_title, css="availability") for site, host, service, states, considered_duration in availability: table.row() @@ -712,20 +745,32 @@ def render_availability_table(availability, from_time, until_time, range_title, availability_columns = host_availability_columns for sid, css, sname, help in availability_columns: - if sid == "outof_notification_period" and not avoptions["consider"]["notification_period"]: - continue - elif sid == "in_downtime" and avoptions["downtimes"]["include"] == "ignore": - continue - elif sid == "unmonitored" and not avoptions["consider"]["unmonitored"]: - continue - elif sid == "flapping" and not avoptions["consider"]["flapping"]: - continue - elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: + if not cell_active(sid): continue number = states.get(sid, 0) if not number: css = "unused" + elif show_summary: + summary.setdefault(sid, 0.0) + summary[sid] += number + table.cell(sname, render_number(number, considered_duration), css="number " + css, help=help) + + if show_summary: + table.row(css="summary") + table.cell("") + table.cell("", _("Summary")) + if what == "service": + table.cell("", "") + considered_duration = until_time - from_time + + for sid, css, sname, help in availability_columns: + number = summary.get(sid, 0) + if show_summary == "average" or avoptions["timeformat"].startswith("percentage"): + number /= len(availability) + if not number: + css = "unused" table.cell(sname, render_number(number, considered_duration), css="number " + css, help=help) + table.end()

11 years, 6 months

Check_MK Git: check_mk: Views: new permission general.see_user_views

by Mathias Kettner

Module: check_mk Branch: master Commit: 9281588f2b5c092e9297aa24aebcbf0543ea7caa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9281588f2b5c09… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 13:55:49 2013 +0100 Views: new permission general.see_user_views --- ChangeLog | 3 +++ web/htdocs/default_permissions.py | 5 +++++ web/htdocs/views.py | 20 +++++++++++--------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e72926..6d1eedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,9 +7,12 @@ * New availability view for arbitrary host/service collections * New option auth_by_http_header to use the value of a HTTP header variable for authentication (Useful in reverse proxy environments) + * New permission that is needed for seeing views that other users + have defined (per default this is contained in all roles) Event Console: * New rule feature: automatically delete event after actions + * New filter for maximum services level (minimum already existed) Checks & Agents: * solaris_mem: New check for memory and swap for Solaris agent diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py index 43761d8..ce35a3c 100644 --- a/web/htdocs/default_permissions.py +++ b/web/htdocs/default_permissions.py @@ -67,6 +67,11 @@ def load(): _("Make views visible and usable for other users"), [ "admin", "user" ]) + config.declare_permission("general.see_user_views", + _("See user views"), + _("Is needed for seeing views that other users have created."), + [ "admin", "user", "guest" ]) + config.declare_permission("general.force_views", _("Modify builtin views"), _("Make own published views override builtin views for all users"), diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d20b603..db2602f 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -293,15 +293,17 @@ def available_views(): views[n] = view # 4. other users views, if public. Sill make sure we honor permission - # for builtin views - for (u, n), view in html.multisite_views.items(): - if n not in views and view["public"] and config.user_may(u, "general.publish_views"): - # Is there a builtin view with the same name? If yes, honor permissions. - permname = "view.%s" % n - if config.permission_exists(permname) \ - and not config.may(permname): - continue - views[n] = view + # for builtin views. Also the permission "general.see_user_views" is + # necessary. + if config.may("general.see_user_views"): + for (u, n), view in html.multisite_views.items(): + if n not in views and view["public"] and config.user_may(u, "general.publish_views"): + # Is there a builtin view with the same name? If yes, honor permissions. + permname = "view.%s" % n + if config.permission_exists(permname) \ + and not config.may(permname): + continue + views[n] = view return views

11 years, 6 months

Check_MK Git: check_mk: EC: New filter for maximum service level

by Mathias Kettner

Module: check_mk Branch: master Commit: 5a85734608101610d9faeacafa044d60ccf534b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a857346081016… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 13:14:27 2013 +0100 EC: New filter for maximum service level --- mkeventd/web/plugins/views/mkeventd.py | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 91d869a..4abfef0 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -333,30 +333,35 @@ if mkeventd_enabled: class EventFilterDropdown(Filter): - def __init__(self, name, title, choices, operator = '='): - Filter.__init__(self, "event_" + name, title, "event", [ "event_" + name ], [ "event_" + name ]) - self._choices = choices - self._varname = "event_" + name + def __init__(self, name, title, choices, operator = '=', column=None): + if column == None: + column = name + self._varname = "event_" + name + Filter.__init__(self, "event_" + name, title, "event", [ self._varname ], [ "event_" + column ]) + self._choices = choices + self._column = column self._operator = operator - + def display(self): if type(self._choices) == list: choices = self._choices else: choices = self._choices() html.select(self._varname, [ ("", "") ] + [(str(n),t) for (n,t) in choices]) - + def filter(self, infoname): return "" - + def event_headers(self): - val = html.var(self._varname) + val = html.var(self._varname) if val: - return "Filter: %s %s %s\n" % (self._varname, self._operator, val) + return "Filter: event_%s %s %s\n" % (self._column, self._operator, val) + declare_filter(210, EventFilterDropdown("facility", _("Syslog Facility"), mkeventd.syslog_facilities)) declare_filter(211, EventFilterDropdown("sl", _("Service Level at least"), mkeventd.service_levels, operator='>=')) + declare_filter(211, EventFilterDropdown("sl_max", _("Service Level at most"), mkeventd.service_levels, operator='<=', column="sl")) #. # .--Painters------------------------------------------------------------. @@ -841,6 +846,7 @@ if mkeventd_enabled: 'event_priority', 'event_facility', 'event_sl', + 'event_sl_max', 'hostregex', ], 'hard_filtervars': [ @@ -883,6 +889,7 @@ if mkeventd_enabled: 'event_priority', 'event_facility', 'event_sl', + 'event_sl_max', ], 'hide_filters': [ 'site', @@ -921,6 +928,7 @@ if mkeventd_enabled: 'event_priority', 'event_facility', 'event_sl', + 'event_sl_max', ], 'hide_filters': [ 'site', @@ -1005,6 +1013,7 @@ if mkeventd_enabled: 'event_priority', 'event_facility', 'event_sl', + 'event_sl_max', 'history_time', 'history_who', 'history_what', @@ -1120,6 +1129,7 @@ if mkeventd_enabled: 'event_priority', 'event_facility', 'event_sl', + 'event_sl_max', 'history_time', 'history_who', 'history_what',

11 years, 6 months

Check_MK Git: check_mk: Remove OMD integration from .f12 of mkeventd

by Mathias Kettner

Module: check_mk Branch: master Commit: b7f33710b552aeec92da7e44be55020dd6e1d110 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7f33710b552ae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 13:01:11 2013 +0100 Remove OMD integration from .f12 of mkeventd --- mkeventd/.f12 | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/mkeventd/.f12 b/mkeventd/.f12 index c70a0e3..4e8d41f 100644 --- a/mkeventd/.f12 +++ b/mkeventd/.f12 @@ -12,10 +12,6 @@ sudo install -m 755 bin/mkeventd src/mkeventd_open514 src/mkevent $OMD_ROOT/bin/ sudo chown root.omd $OMD_ROOT/bin/mkeventd_open514 sudo chmod 4750 $OMD_ROOT/bin/mkeventd_open514 sudo touch $OMD_ROOT/share/check_mk/web/htdocs/*.py -sudo install -m 755 omd/mkeventd.init $OMD_ROOT/etc/init.d/mkeventd -sudo sed -i "s@###ROOT###@$OMD_ROOT@g" $OMD_ROOT/etc/init.d/mkeventd -sudo ln -sfn ../init.d/mkeventd $OMD_ROOT/etc/rc.d/10-mkeventd -sudo install -m 755 omd/MKEVENTD.hook $OMD_ROOT/lib/omd/hooks/MKEVENTD sudo touch $OMD_ROOT/etc/check_mk/mkeventd.mk sudo install -m 755 lib/check_mkevents $OMD_ROOT/lib/nagios/plugins sudo install -m 644 checks/* $OMD_ROOT/share/check_mk/checks

11 years, 6 months

Check_MK Git: check_mk: Slight improve of layout of EC filters

by Mathias Kettner

Module: check_mk Branch: master Commit: 3dae64ec8c55974d68531925ab2dd85b0e62e93a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dae64ec8c5597… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 13:01:30 2013 +0100 Slight improve of layout of EC filters --- mkeventd/web/plugins/views/mkeventd.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkeventd/web/plugins/views/mkeventd.py b/mkeventd/web/plugins/views/mkeventd.py index 7dfcad5..91d869a 100644 --- a/mkeventd/web/plugins/views/mkeventd.py +++ b/mkeventd/web/plugins/views/mkeventd.py @@ -292,7 +292,7 @@ if mkeventd_enabled: for name, title in self._choices: c += 1 html.checkbox(self._name + "_" + str(name), True, label=title) - if c == 3: + if c == 4: html.write("<br>") c = 0 html.end_checkbox_group()

11 years, 6 months

Check_MK Git: check_mk: FIX: active checks were disabled for custom active checks

by Mathias Kettner

Module: check_mk Branch: master Commit: a33841c40062afd990f16425625822c5ecfafe6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a33841c40062af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 12:19:57 2013 +0100 FIX: active checks were disabled for custom active checks --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 52ef4a8..684c79c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1967,7 +1967,7 @@ define service { active_checks_enabled\t\t%d %s%s} """ % (template, hostname, description, simulate_command(command), - (command_line and not "freshness") and 1 or 0, extraconf, freshness)) + (command_line and not freshness) and 1 or 0, extraconf, freshness)) # Levels for host check if is_cluster(hostname):

11 years, 6 months

Check_MK Git: check_mk: Added skeleton for empty check

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b98d47e5880afc87984d6de678ad21408d6f0ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b98d47e5880af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 09:02:54 2013 +0100 Added skeleton for empty check --- doc/skeleton_check | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/doc/skeleton_check b/doc/skeleton_check new file mode 100644 index 0000000..be9172f --- /dev/null +++ b/doc/skeleton_check @@ -0,0 +1,43 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +# Example output from agent: +# Put here the example output from your TCP-Based agent. If the +# check is SNMP-Based, then remove this section + +def inventory_foobars(info): + return [] + +def check_foobar(item, _no_params, info): + return 3, "UNKNOWN - Check no implemented" + +check_info["foobar"] = { + "check_function" : check_foobar, + "inventory_function" : inventory_foobar, + "service_description" : "FOOBAR", + "has_perfdata" : False, +} +

11 years, 6 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: ff79eb7650aafe71c5fae633fdafe804bb0b95f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff79eb7650aafe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 09:02:59 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Check_MK Git: check_mk: FIX: check_mk: improved support of utf-8 characters in extra_service_conf

by Andreas Boesl

Module: check_mk Branch: master Commit: ff327e6c5ff242e84fab36b308afef19ed80060e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff327e6c5ff242… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 26 18:02:21 2013 +0100 FIX: check_mk: improved support of utf-8 characters in extra_service_conf --- ChangeLog | 1 + modules/check_mk.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0e730d..6e72926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * FIX: allow unicode encoded extra_service_conf * FIX: no default PING service if custom checks are defined * FIX: check_mk_base: fixed rounding error in get_bytes_human_readable + * FIX: check_mk: improved support of utf-8 characters in extra_service_conf * New configuration variable contactgroup_members Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index 07fa1b4..52ef4a8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1253,7 +1253,7 @@ def extra_service_conf_of(hostname, description): if define_servicegroups: servicegroups_to_define.update(sergr) conf += extra_conf_of(extra_service_conf, hostname, description) - return conf + return conf.encode("utf-8") def extra_summary_service_conf_of(hostname, description): return extra_conf_of(extra_summary_service_conf, hostname, description) @@ -1747,7 +1747,7 @@ def create_nagios_servicedefs(outfile, hostname): } """ % ( template, hostname, description, logwatch, - extra_service_conf_of(hostname, description).encode("utf-8"), checkname )) + extra_service_conf_of(hostname, description), checkname )) checknames_to_define.add(checkname) have_at_least_one_service = True @@ -1809,7 +1809,7 @@ define service { host_name\t\t\t%s %s service_description\t\tCheck_MK } -""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK").encode("utf-8"))) +""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK"))) # Inventory checks - if user has configured them. Not for clusters. if inventory_check_interval and not is_cluster(hostname): outfile.write("""

11 years, 6 months

Check_MK Git: check_mk: FixedValue: support Unicode

by Mathias Kettner

Module: check_mk Branch: master Commit: a16d8128350d064fbb6b478de97aec3a85b865eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a16d8128350d06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 26 16:21:34 2013 +0100 FixedValue: support Unicode --- web/htdocs/valuespec.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a229732..a2526ea 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -122,6 +122,8 @@ class FixedValue(ValueSpec): def value_to_text(self, value): if self._totext != None: return self._totext + elif type(value) == unicode: + return value else: return str(value)

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013