Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64439 discussions

Check_MK Git: check_mk: Remove obsolete -lower option for vsphere agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e99e3840027cb5ba0c5fc3bea349582777dda2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e99e3840027cb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 28 09:13:41 2013 +0100 Remove obsolete -lower option for vsphere agent Is now done by piggyback option. --- agents/special/agent_vsphere | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5630ed1..5cfff53 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -31,7 +31,6 @@ parser = argparse.ArgumentParser(description='Check_MK vSphere Agent') group = parser.add_argument_group() group.add_argument('-p', type=int, help="Port Number of vSphere Server") group.add_argument('-i', help="Check the hostsystem and or virtualmachine. Comma separated") -group.add_argument('-lower', action="store_true", help="Convert the name attributes of each MOR to lower case") parser.add_argument('-u', help="Username") parser.add_argument('-s', help="Secret") parser.add_argument('Hostname', help="Hostname") @@ -79,8 +78,6 @@ def output_mors(what, properties): # Get the name of this Host/VirtualMachine # May there a comments in the field, so split at whitespace name = data["name"].split()[0] - if params['lower']: - name = name.lower() object_collection[name] = (what, data['name'])

11 years, 7 months

Check_MK Git: check_mk: Fixed .f12 helper for main directory

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c25f0b62f42f9576f2306b8611704bf511e42f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c25f0b62f42f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 15:52:14 2013 +0100 Fixed .f12 helper for main directory This now calls all .f12 files from all subdirectories --- .f12 | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.f12 b/.f12 index bd23f86..3871f7d 100644 --- a/.f12 +++ b/.f12 @@ -1,14 +1,9 @@ -#!/bin/bash -SITE=${SITE:-$(omd sites --bare | head -n 1)} -set -xe - -sed -e "s#@BINDIR@#/omd/sites/$SITE/bin#g" \ - -e "s#@VARDIR@#/omd/sites/$SITE/var/check_mk#g" \ - -e "s#@CHECK_ICMP@#/omd/sites/$SITE/lib/nagios/plugins/check_icmp#g" \ - -e "s#@PNPURL@#/$SITE/pnp4nagios/#g" \ - -e "s#@CGIURL@#/$SITE/nagios/cgi-bin#g" \ - < check_mk_templates.cfg > /tmp/check_mk_templates.cfg - -sudo mv /tmp/check_mk_templates.cfg /omd/sites/$SITE/etc/nagios/conf.d -sudo omd restart $SITE nagios -echo 'location.reload();' | nc -w 0 localhost 32000 +(cd web ; bash .f12) +(cd modules ; bash .f12) +(cd checks ; bash .f12) +(cd checkman ; bash .f12) +(cd mkeventd ; bash .f12) +(cd notifications ; bash .f12) +(cd agents ; bash .f12) +(cd livestatus ; bash .f12) +(cd pnp-templates ; bash .f12)

11 years, 7 months

Check_MK Git: check_mk: Back to view optionally with checkboxes cleared

by Mathias Kettner

Module: check_mk Branch: master Commit: 25dabeb656fee544579862b17ae56bc9f929dd11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25dabeb656fee5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 14:48:04 2013 +0100 Back to view optionally with checkboxes cleared --- ChangeLog | 4 +++- web/htdocs/views.py | 5 +++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea8d1d3..79beb2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,9 +6,11 @@ Multisite: * 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) + 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) + * New path back to the view after command exection with all + checkboxes cleared Event Console: * New rule feature: automatically delete event after actions diff --git a/web/htdocs/views.py b/web/htdocs/views.py index db2602f..025eff0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2199,6 +2199,11 @@ def do_actions(view, what, action_rows, backurl): if message: if html.output_format == "html": # sorry for this hack message += '<br><a href="%s">%s</a>' % (backurl, _('Back to view')) + if html.var("show_checkboxes") == "1": + html.del_var("selection") + weblib.selection_id() + backurl += "&selection=" + html.var("selection") + message += '<br><a href="%s">%s</a>' % (backurl, _('Back to view with checkboxes reset')) html.message(message) return True

11 years, 7 months

Check_MK Git: check_mk: resolve merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: 00bb7f94561a2ca47fe947208babd765c58ca1a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00bb7f94561a2c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 14:28:48 2013 +0100 resolve merge conflict --- ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d1eedb..ea8d1d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 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 + * FIX: livestatus: table statehist now able to check AuthUser permissions Checks & Agents: * FIX: smart - not trying to parse unhandled lines to prevent errors diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index c3c578f..8068286 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -615,21 +615,14 @@ void TableStateHistory::process(Query *query, HostServiceState *hs_state) bool TableStateHistory::isAuthorized(contact *ctc, void *data) { - LogEntry *entry = (LogEntry *)data; + HostServiceState *entry = (HostServiceState *)data; service *svc = entry->_service; host *hst = entry->_host; if (hst || svc) return is_authorized_for(ctc, hst, svc); - // suppress entries for messages that belong to - // hosts that do not exist anymore. - else if (entry->_logclass == LOGCLASS_ALERT - || entry->_logclass == LOGCLASS_NOTIFICATION - || entry->_logclass == LOGCLASS_PASSIVECHECK - || entry->_logclass == LOGCLASS_STATE) - return false; else - return true; + return false; } Column *TableStateHistory::column(const char *colname)

11 years, 7 months

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 44d8e21a62d4b402bac8c2eace7e0935a4133115 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44d8e21a62d4b4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 27 14:33:09 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

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, 7 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, 7 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, 7 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, 7 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, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits