Checkmk git commits October 2017

checkmk-commits@lists.checkmk.com

10 participants
288 discussions

by Manfred Brunner

Module: check_mk Branch: master Commit: 59749ee77470c64d88371fe3435449169dbb2ce0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59749ee77470c6… Author: Manfred Brunner <mb(a)mathias-kettner.de> Date: Fri Oct 20 09:36:54 2017 +0200 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index be10e3b..64b0edc 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -3001 +3011

6 years, 11 months

Fixed broken test

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ab2c948721daf8ceda833475606cf3e1670cbfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ab2c948721daf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 16:23:39 2017 +0200 Fixed broken test Change-Id: Iae327ad6d788675924f9d1c2f545cc654515a579 --- tests/web/test_webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/web/test_webapi.py b/tests/web/test_webapi.py index b1fcc27..61d7945 100644 --- a/tests/web/test_webapi.py +++ b/tests/web/test_webapi.py @@ -358,7 +358,7 @@ def test_get_graph(web, site): web.activate_changes() # Issue a reschedule - site.live.command("[%d] SCHEDULE_FORCED_SERVICE_CHECK;test-host-get-graph;Check_MK;%d" % (int(time.time), int(time.time()))) + site.live.command("[%d] SCHEDULE_FORCED_SERVICE_CHECK;test-host-get-graph;Check_MK;%d" % (int(time.time()), int(time.time()))) # Wait for RRD file creation # Isn't this a bug that the graph is not instantly available?

6 years, 11 months

Updated bug entries #2981

by Lars Michelsen

Module: check_mk Branch: master Commit: 695c0550c224fd8b67f84e70439289939179b421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=695c0550c224fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 15:45:48 2017 +0200 Updated bug entries #2981 Change-Id: Idb52755c2c4b93c16328942f7dfd0f0d61e8b7ba --- .bugs/2981 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/2981 b/.bugs/2981 new file mode 100644 index 0000000..b1f5bb8 --- /dev/null +++ b/.bugs/2981 @@ -0,0 +1,13 @@ +Title: table.cell(): Fix escaping of cell content +Component: multisite +State: open +Date: 2017-10-19 15:43:24 +Targetversion: 1.5.0 +Class: bug + +The content of the cell, that can be provided via argument, is not escaped by default. This opens +several places for XSS attacks. We need to make this method escape the content by default. In +case one wants to add HTML code there, it must be wrapped into a HTML() object or written out after +table.cell() with html.write(...). + +There may be several places where wanted HTML code is "destroyed". Can we somehow find these places?

6 years, 11 months

5399 SEC Fixed multiple stored XSS injections in WATO dialogs

by Lars Michelsen

Module: check_mk Branch: master Commit: 34f45715c2e5b4ee488ecd1cdf0d812cdd051c09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34f45715c2e5b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 15:41:40 2017 +0200 5399 SEC Fixed multiple stored XSS injections in WATO dialogs It was possible to inject Javascript code to using configuration fields of different objects (users, hosts, groups, roles, timeperiods). These issues could only be triggered by authenticated users that have permissons to use WATO and add/edit the objects mentioned above. Normally these are users with the roles admin or users. Change-Id: I6f14aac48ea05b23508aa8d9576b012cdc7ec84a --- .werks/5399 | 16 ++++++++++++++++ web/htdocs/valuespec.py | 2 +- web/htdocs/wato.py | 25 ++++++++++++------------- web/plugins/wato/builtin_attributes.py | 5 ++--- 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.werks/5399 b/.werks/5399 new file mode 100644 index 0000000..8c48462 --- /dev/null +++ b/.werks/5399 @@ -0,0 +1,16 @@ +Title: Fixed multiple stored XSS injections in WATO dialogs +Level: 1 +Component: wato +Class: security +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1508420225 + +It was possible to inject Javascript code to using configuration fields of different objects +(users, hosts, groups, roles, timeperiods). + +These issues could only be triggered by authenticated users that have permissons to use WATO +and add/edit the objects mentioned above. Normally these are users with the roles admin or +users. diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2f2cb3c..762c49a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3676,7 +3676,7 @@ class ElementSelection(ValueSpec): def value_to_text(self, value): self.load_elements() - return self._elements.get(value, value) + return html.attrencode(self._elements.get(value, value)) def from_html_vars(self, varprefix): return html.var(varprefix) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 24cf9be..b48b260 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -794,7 +794,7 @@ def show_hosts(folder): contact_group_names = userdb.load_group_information().get("contact", {}) def render_contact_group(c): display_name = contact_group_names.get(c, {'alias': c})['alias'] - return '<a href="wato.py?mode=edit_contact_group&edit=%s">%s</a>' % (c, display_name) + return html.render_a(display_name, "wato.py?mode=edit_contact_group&edit=%s" % c) host_errors = folder.host_validation_errors() rendered_hosts = [] @@ -853,7 +853,7 @@ def show_hosts(folder): else: tdclass, tdcontent = attr.paint(effective.get(attrname), hostname) tdclass += " inherited" - table.cell(attr.title(), tdcontent, css=tdclass) + table.cell(attr.title(), html.attrencode(tdcontent), css=tdclass) # Am I authorized? reason = host.reason_why_may_not("read") @@ -868,8 +868,8 @@ def show_hosts(folder): # Permissions and Contact groups - through complete recursion and inhertance permitted_groups, host_contact_groups, use_for_services = host.groups() - table.cell(_("Permissions"), ", ".join(map(render_contact_group, permitted_groups))) - table.cell(_("Contact Groups"), ", ".join(map(render_contact_group, host_contact_groups))) + table.cell(_("Permissions"), HTML(", ").join(map(render_contact_group, permitted_groups))) + table.cell(_("Contact Groups"), HTML(", ").join(map(render_contact_group, host_contact_groups))) if not config.wato_hide_hosttags: # Raw tags @@ -7212,8 +7212,8 @@ class ModeGroups(WatoMode): html.icon_button(clone_url, _("Create a copy of this group"), "clone") html.icon_button(delete_url, _("Delete"), "delete") - table.cell(_("Name"), name) - table.cell(_("Alias"), group['alias']) + table.cell(_("Name"), html.attrencode(name)) + table.cell(_("Alias"), html.attrencode(group['alias'])) def page(self): @@ -8894,8 +8894,8 @@ def mode_timeperiods(phase): html.icon_button(edit_url, _("Properties"), "edit") html.icon_button(delete_url, _("Delete"), "delete") - table.cell(_("Name"), name) - table.cell(_("Alias"), timeperiod.get("alias", "")) + table.cell(_("Name"), html.attrencode(name)) + table.cell(_("Alias"), html.attrencode(timeperiod.get("alias", ""))) table.end() @@ -10499,7 +10499,7 @@ def mode_users(phase): html.icon(_('Notifications are disabled'), 'notif_disabled') # Full name / Alias - table.cell(_("Alias"), user.get("alias", "")) + table.cell(_("Alias"), html.attrencode(user.get("alias", ""))) # Email table.cell(_("Email"), user.get("email", "")) @@ -11254,10 +11254,10 @@ def mode_roles(phase): html.icon_button(delete_url, _("Delete this role"), "delete") # ID - table.cell(_("Name"), id) + table.cell(_("Name"), html.attrencode(id)) # Alias - table.cell(_("Alias"), role["alias"]) + table.cell(_("Alias"), html.attrencode(role["alias"])) # Type table.cell(_("Type"), _("builtin") if role.get("builtin") else _("custom")) @@ -11268,8 +11268,7 @@ def mode_roles(phase): # Users table.cell(_("Users"), - ", ".join([ '<a href="%s">%s</a>' % (folder_preserving_link([("mode", "edit_user"), ("edit", user_id)]), - user.get("alias", user_id)) + HTML(", ").join([ html.render_a(user.get("alias", user_id), folder_preserving_link([("mode", "edit_user"), ("edit", user_id)])) for (user_id, user) in users.items() if (id in user["roles"])])) diff --git a/web/plugins/wato/builtin_attributes.py b/web/plugins/wato/builtin_attributes.py index 2b371da..03d91a5 100644 --- a/web/plugins/wato/builtin_attributes.py +++ b/web/plugins/wato/builtin_attributes.py @@ -220,10 +220,9 @@ class ParentsAttribute(ValueSpecAttribute): return "parents" def paint(self, value, hostname): - parts = [ '<a href="%s">%s</a>' % ( - "wato.py?" + html.urlencode_vars([("mode", "edit_host"), ("host", hn)]), hn) + parts = [ html.render_a(hn, "wato.py?" + html.urlencode_vars([("mode", "edit_host"), ("host", hn)])) for hn in value ] - return "", ", ".join(parts) + return "", HTML(", ").join(parts) declare_host_attribute(ParentsAttribute(),

6 years, 11 months

Reserved 20 bug IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ac7fd8fb3191a77023663e008782d2fffa3ced3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ac7fd8fb3191a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 15:43:12 2017 +0200 Reserved 20 bug IDS Change-Id: I4f12fe0f26e292da0ebc4ff5e98fd5cc36836b05 --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 2ef6209..be10e3b 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2981 +3001

6 years, 11 months

GUI: Show GPL license text on login screen only for raw edition

by Lars Michelsen

Module: check_mk Branch: master Commit: 045b65c64e6efd30b4d2882cad65a9ba89c87d6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=045b65c64e6efd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 19 14:46:29 2017 +0200 GUI: Show GPL license text on login screen only for raw edition Change-Id: I0e55adc5501c7f35cd48799f3ac76dadce6254ae --- web/htdocs/login.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/htdocs/login.py b/web/htdocs/login.py index 2c47fc6..4350cee 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -459,10 +459,13 @@ def normal_login_page(called_directly = True): html.open_div(id_="foot") html.write("Version: %s - © " % cmk.__version__) html.a("Mathias Kettner", href="https://mathias-kettner.com") - html.br() - html.br() - html.write(_('You can use, modify and distribute Check_MK under the terms of the <a href="%s">' - 'GNU GPL Version 2</a>.') % "https://mathias-kettner.com/gpl.html") + + if cmk.is_raw_edition(): + html.br() + html.br() + html.write(_('You can use, modify and distribute Check_MK under the terms of the <a href="%s">' + 'GNU GPL Version 2</a>.') % "https://mathias-kettner.com/gpl.html") + html.close_div() html.set_focus('_username')

6 years, 11 months

Build Windows agent as normal user within chroot

by Jukka Aro

Module: check_mk Branch: master Commit: 5c28d0690345977fb0cafc1ba943120f4e80cd4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c28d069034597… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Oct 19 11:46:25 2017 +0200 Build Windows agent as normal user within chroot Change-Id: I29983ac365eb565814ff633858d954ba34332abe --- agents/windows/Makefile.am | 11 ++++++----- agents/windows/chroot_version | 2 +- agents/windows/do-chroot | 11 +++++------ agents/windows/make-agent | 12 ++++-------- agents/windows/make-chroot | 7 +++++-- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/agents/windows/Makefile.am b/agents/windows/Makefile.am index 74dce65..4afc13e 100644 --- a/agents/windows/Makefile.am +++ b/agents/windows/Makefile.am @@ -25,10 +25,11 @@ check_mk_agent.res: check_mk_agent.rc $(VPATH)/check_mk_agent.ico cp $(VPATH)/check_mk_agent.ico check_mk_agent.ico $(WINDRES) $< -O coff -o $@ -# Wine seems to depend on X Window authorization. Quiet "No protocol specified" -# warning by setting the DISPLAY variable accordingly. +# Wine depends on X Server and may produce a number of warnings at startup. +# Using Xvfb does not work properly, either. Simply send those stderr warnings +# to /dev/null as the test output will go to stdout (and/or xml file) anyway. unittest: WindowsAgentTest$(EXEEXT) - DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) + DISPLAY="$$DISPLAY xterm" wine WindowsAgentTest$(EXEEXT) 2>/dev/null check_mk_agent_SOURCES = \ Configurable.cc \ @@ -92,8 +93,8 @@ wmitest_SOURCES = wmitest.cc stringutil.cc WinApi.cc wmiHelper.cc CLEANFILES = \ *.ico *.res *.rc config.* stamp-* Makefile \ - sections/.dirstamp \ - $$(find .deps/ sections/.deps -type f) \ + sections/.dirstamp test/.dirstamp \ + $$(find .deps/ sections/.deps test/.deps -type f) \ $(addprefix $(bindir)/,$(bin_PROGRAMS)) \ $(patsubst %$(EXEEXT),%-64$(EXEEXT),$(addprefix $(bindir)/,$(bin_PROGRAMS))) \ $(patsubst %$(EXEEXT),%.msi,$(addprefix $(bindir)/,$(bin_PROGRAMS))) diff --git a/agents/windows/chroot_version b/agents/windows/chroot_version index 7ed6ff8..1e8b314 100644 --- a/agents/windows/chroot_version +++ b/agents/windows/chroot_version @@ -1 +1 @@ -5 +6 diff --git a/agents/windows/do-chroot b/agents/windows/do-chroot index a7b2043..fec56fa 100755 --- a/agents/windows/do-chroot +++ b/agents/windows/do-chroot @@ -2,13 +2,13 @@ # $1: cmd(s) to be executed within chroot jail # if non-existent, enter chroot jail with 'bash -l' -CMD="$1" +CMD="$1" export HOSTNAME=cmk-windows-agent-chroot unset LANG CHROOTNAME=WinAgent -BASE="$(dirname "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")")" +BASE="$(realpath ../..)" if [ -z $CHROOT_PATH ]; then echo "ERROR: CHROOT_PATH not set" @@ -41,11 +41,10 @@ if [ ! -e $CHROOT_PATH/$CHROOT_BUILD_DIR/Makefile ] ; then fi if [ -n "$CMD" ] ; then - chroot $CHROOT_PATH \ - /usr/bin/env CHROOTNAME=$CHROOTNAME HOME=/root NEW_VERSION=$NEW_VERSION \ - bash -c "$CMD" + chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME \ + NEW_VERSION=$NEW_VERSION bash -c "$CMD" else - chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME HOME=/root bash -l + chroot $CHROOT_PATH /usr/bin/env CHROOTNAME=$CHROOTNAME bash -l fi umount $CHROOT_PATH/$CHROOT_BUILD_DIR diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 7603f03..3199353 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -16,7 +16,7 @@ parse-args "$@" chroot_dependencies=(debootstrap debian-archive-keyring) versionfile=chroot_version -base="$(dirname "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")")" +base="$(realpath ../..)" # May be set from external environment. Otherwise use chroot # directory in agents/windows @@ -49,15 +49,11 @@ else CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR ./make-chroot fi -# Build the Windows agent within chroot by calling the 'build-agent' script. +# Build the Windows agent within chroot by calling the 'build-agent' script as +# $SUDO_USER. CHROOT_PATH=$CHROOT_PATH CHROOT_BUILD_DIR=$CHROOT_BUILD_DIR \ NEW_VERSION=$NEW_VERSION ./do-chroot \ - "$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets" + "/bin/su - $SUDO_USER -m -c '$CHROOT_BUILD_DIR/agents/windows/build-agent -j${njobs} $targets'" EXIT_CODE=$? -# Some cleanup: chown build artifacts to the original user. -find . -maxdepth 1 -regextype egrep \ --regex '(.*\.(exe|msi|m4|cache|in))|.*\/.*build.*|.*plugins|.*Makefile.*|.*configure|.*comp.*|.*install.*|.*missing' \ --exec chown -R $USER:$USER {} \; - exit $EXIT_CODE diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 96f0528..dd95603 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -10,7 +10,7 @@ MIRROR=http://de.archive.ubuntu.com/ubuntu export HOSTNAME=cmk-windows-agent-chroot export LC_ALL=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 -BASE="$(dirname "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")")" +BASE="$(realpath ../..)" if [ -z $CHROOT_PATH ]; then echo "ERROR: CHROOT_PATH not set" @@ -78,7 +78,7 @@ package_names=( libio-socket-ssl-perl liblwp-mediatypes-perl liblwp-protocol-https-perl - libmailtools-perl + libmailtools-perl libnet-http-perl libnet-smtp-ssl-perl libnet-ssleay-perl @@ -144,6 +144,9 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi +# Add user for building windows agent without root privileges +./do-chroot "useradd -lmo -u $(id -u $SUDO_USER) -s /bin/bash $SUDO_USER" + # "Disable" apt privilege dropping in chroot sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd

6 years, 11 months

5322 fortigate_node_sessions: Now upper levels are configurable

by Simon Betz

Module: check_mk Branch: master Commit: 8187ebb49841217b2fcc3c0906ad55f9c7013724 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8187ebb4984121… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 18 09:25:22 2017 +0200 5322 fortigate_node_sessions: Now upper levels are configurable Change-Id: Ia6dacd911e488939e96f81334db66b8e69d19f6d --- .werks/5322 | 10 ++++++++++ checks/fortigate_node | 21 +++----------------- checks/fortigate_sessions | 20 ++++++------------- checks/fortigate_sessions.include | 38 ++++++++++++++++++++++++++++++++++++ checks/fortigate_sessions_base | 20 ++++++------------- web/plugins/wato/check_parameters.py | 26 ++++++++++++++++++------ 6 files changed, 83 insertions(+), 52 deletions(-) diff --git a/.werks/5322 b/.werks/5322 new file mode 100644 index 0000000..9e26c6e --- /dev/null +++ b/.werks/5322 @@ -0,0 +1,10 @@ +Title: fortigate_node_sessions: Now upper levels are configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508311477 +Class: feature + + diff --git a/checks/fortigate_node b/checks/fortigate_node index 4bc1b10..154b028 100644 --- a/checks/fortigate_node +++ b/checks/fortigate_node @@ -235,24 +235,7 @@ def check_fortigate_node_ses(item, params, parsed): if item in parsed["nodes"]: if type(params) == dict: params = params["levels"] - - warn, crit = map(int, params) - - current = parsed["nodes"][item]["sessions"] - - status = 0 - if current >= crit: - status = 2 - elif current >= warn: - status = 1 - - if status > 0: - wcsuffix = ", (warn/crit at %d/%d)" % (warn, crit) - else: - wcsuffix = "" - - return status, "%s Sessions%s" % (current, wcsuffix),\ - [("session", current, warn, crit)] + return fortigate_sessions(parsed["nodes"][item]["sessions"], params) check_info["fortigate_node.sessions"] = { @@ -260,4 +243,6 @@ check_info["fortigate_node.sessions"] = { "check_function" : check_fortigate_node_ses, "service_description" : "Sessions %s", "has_perfdata" : True, + "group" : "fortigate_node_sessions", + "includes" : ["fortigate_sessions.include"], } diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 529c58b..6526fb2 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -24,29 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + fortigate_sessions_default_levels = (100000, 150000) + def inventory_fortigate_sessions(info): return [(None, "fortigate_sessions_default_levels")] + def check_fortigate_sessions(item, params, info): try: - current = int(info[0][0]) + return fortigate_sessions(int(info[0][0]), params) except (IndexError, ValueError): return - warn, crit = params - state = 0 - icon = '' - if current >= warn: - state = 1 - icon = "(!)" - if current >= crit: - state = 2 - icon = "(!!)" - - perf = [("session", current, warn, crit)] - return state, "%d Session%s (warn/crit at %d/%d)" % (current, icon, warn, crit), perf check_info["fortigate_sessions"] = { "inventory_function" : inventory_fortigate_sessions, @@ -57,5 +48,6 @@ check_info["fortigate_sessions"] = { # uses mib FORTINET-MIB-280 "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ oid(".1.3.6.1.4.1.12356.1.10.0"), - "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), + "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), + "includes" : ["fortigate_sessions.include"], } diff --git a/checks/fortigate_sessions.include b/checks/fortigate_sessions.include new file mode 100644 index 0000000..d16b231 --- /dev/null +++ b/checks/fortigate_sessions.include @@ -0,0 +1,38 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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- +# tails. 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 fortigate_sessions(sessions, params): + warn, crit = params + infotext = "%d Sessions" % sessions + state = 0 + if sessions >= crit: + state = 2 + elif sessions >= warn: + state = 1 + if state: + infotext += " (warn/crit at %d/%d)" % (warn, crit) + return state, infotext, [("session", sessions, warn, crit)] diff --git a/checks/fortigate_sessions_base b/checks/fortigate_sessions_base index 23693c5..ae82092 100644 --- a/checks/fortigate_sessions_base +++ b/checks/fortigate_sessions_base @@ -24,26 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + fortigate_sessions_base_default_levels = (100000, 150000) + def inventory_fortigate_sessions_base(info): return [(None, "fortigate_sessions_base_default_levels")] -def check_fortigate_sessions_base(item, params, info): - warn, crit = params - current = int(info[0][0]) - status = 0 - if current >= crit: - status = 2 - elif current >= warn: - status = 1 - infotext = "%d active sessions" % current - if status: - infotext += " (warn/crit at %d/%d)" % (warn, crit) +def check_fortigate_sessions_base(item, params, info): + return fortigate_sessions(int(info[0][0]), params) - perfdata = [("session", current, warn, crit)] - return status, infotext, perfdata check_info["fortigate_sessions_base"] = { "inventory_function" : inventory_fortigate_sessions_base, @@ -54,5 +45,6 @@ check_info["fortigate_sessions_base"] = { # uses mib FORTINET-FORTIGATE-MIB "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), - "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 8 ]), + "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 8 ]), + "includes" : ["fortigate_sessions.include"], } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index c93e2be..f1c78c9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -228,22 +228,36 @@ register_check_parameters( 'dict' ) +fortigate_sessions_element = Tuple( + title = _(u"Levels for active sessions"), + elements = [ + Integer( title = _(u"Warning at"), default_value = 100000, size = 10 ), + Integer( title = _(u"Critical at"), default_value = 150000, size = 10 ), + ]) + register_check_parameters( subgroup_networking, "fortigate_sessions", _(u"Fortigate Active Sessions"), - Tuple( - title = _(u"Levels for active sessions"), - elements = [ - Integer( title = _(u"Warning at"), default_value = 100000, size = 10 ), - Integer( title = _(u"Critical at"), default_value = 150000, size = 10 ), - ]), + fortigate_sessions_element, None, "first" ) register_check_parameters( subgroup_networking, + "fortigate_node_sessions", + _(u"Fortigate Active Sessions"), + fortigate_sessions_element, + TextAscii( + title = _("Node name"), + allow_empty = False + ), + "first" +) + +register_check_parameters( + subgroup_networking, "f5_bigip_cluster_v11", _(u"Configuration Sync Status for F5 BigIP devices"), Dictionary(

6 years, 11 months

5260 FIX Fix presentation of mirrored areas

by Andreas Umbreit

Module: check_mk Branch: master Commit: 3ebc6c177df6ddcf05082e90bc616af3fc7d782b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ebc6c177df6dd… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Oct 19 14:06:53 2017 +0200 5260 FIX Fix presentation of mirrored areas This werk fixes a bug in Check_MK metrics system: When chosing "Mirrored Area" as a style in Graph Designer for multiple metrics, a "Mirrored Stacked" presentation got displayed instead. Change-Id: I343a34623bb144794acec0d406efa4227e72a9d4 --- .werks/5260 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/5260 b/.werks/5260 new file mode 100644 index 0000000..b50da3d --- /dev/null +++ b/.werks/5260 @@ -0,0 +1,11 @@ +Title: Fix presentation of mirrored areas +Level: 1 +Component: metrics +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1508413904 +Class: fix + +This werk fixes a bug in Check_MK metrics system: +When chosing "Mirrored Area" as a style in Graph Designer for multiple metrics, a "Mirrored Stacked" presentation got displayed instead.

6 years, 11 months

5094 lnx_distro: Prefers /etc/ os-release if available which is systemd-supported

by Simon Betz

Module: check_mk Branch: master Commit: c0cded62fc53437019c067a1f2a2f45a8d2ff873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0cded62fc5343… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 10 07:00:09 2017 +0200 5094 lnx_distro: Prefers /etc/os-release if available which is systemd-supported Change-Id: I64f8f10a9c65fe0663beb6d3cb087493ab063a3d --- .werks/5094 | 10 ++++++++++ agents/plugins/mk_inventory.linux | 5 +++-- inventory/lnx_distro | 23 ++++++++++++++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.werks/5094 b/.werks/5094 new file mode 100644 index 0000000..0cebd82 --- /dev/null +++ b/.werks/5094 @@ -0,0 +1,10 @@ +Title: lnx_distro: Prefers /etc/os-release if available which is systemd-supported +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1502340795 +Class: feature + + diff --git a/agents/plugins/mk_inventory.linux b/agents/plugins/mk_inventory.linux index c8ab766..6428a61 100755 --- a/agents/plugins/mk_inventory.linux +++ b/agents/plugins/mk_inventory.linux @@ -58,9 +58,10 @@ then # Information about distribution echo "<<<lnx_distro:sep(124):persist($UNTIL)>>>" - for f in {/etc/{oracle-release,debian_version,gentoo-release,lsb-release,redhat-release,SuSE-release},/usr/share/cma/version} ; do + for f in {/etc/{oracle-release,debian_version,gentoo-release,lsb-release,redhat-release,SuSE-release,os-release},/usr/share/cma/version} ; do if [ -e $f ] ; then - echo -n "$f|" ; tr \\n \| < $f | sed 's/|$//' ; echo + echo "[[[$f]]]" + tr \\n \| < $f | sed 's/|$//' ; echo fi done diff --git a/inventory/lnx_distro b/inventory/lnx_distro index 1ab82a2..4bbfccf 100644 --- a/inventory/lnx_distro +++ b/inventory/lnx_distro @@ -46,13 +46,21 @@ def inv_lnx_distro(info): parsed = {} + filename = None for line in info: - parsed.setdefault(line[0], line[1:]) + if line[0].startswith("[[[") and line[0].endswith("]]]"): + filename = line[0][3:-3] + elif filename is not None: + parsed.setdefault(filename, line) + elif filename is None: + # stay compatible to older versions of output + parsed.setdefault(line[0], line[1:]) node = inv_tree("software.os.") node["type"] = "Linux" for file_name, handler in [ ("/usr/share/cma/version", inv_lnx_parse_cma), + ("/etc/os-release", inv_lnx_parse_os), ("/etc/gentoo-release", inv_lnx_parse_gentoo), ("/etc/SuSE-release", inv_lnx_parse_suse), ("/etc/oracle-release", inv_lnx_parse_oracle_vm_server), @@ -65,6 +73,19 @@ def inv_lnx_distro(info): break +def inv_lnx_parse_os(node, line): + for entry in line: + k, v = map(lambda x: x.replace('"', ''), entry.split("=", 1)) + if k == "VERSION_ID": + node["version"] = v + elif k == "PRETTY_NAME": + node["name"] = v + elif k == "VERSION_CODENAME": + node["code_name"] = v.title() + elif k == "ID": + node["vendor"] = v.title() + + def inv_lnx_parse_suse(node, line): version = line[1].split()[-1] if len(line) >= 3:

6 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2017