Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

net-snmp: Fix compilation with OpenSSL 1.1 (for Ubuntu bionic)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2dc9c6a3b6c717acefb7f4b0a7794205d746df6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dc9c6a3b6c717… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 13:24:19 2018 +0200 net-snmp: Fix compilation with OpenSSL 1.1 (for Ubuntu bionic) Change-Id: Ic86d8b9bad293fbe0cd1f4da85de709e32adc432 --- ...4-Port-OpenSSL-1.1.0-with-support-for-1.0.2.dif | 169 +++++++++++++++++++++ .../patches/0015-Another-OpenSSL-1.1.0-fix.dif | 34 +++++ 2 files changed, 203 insertions(+) diff --git a/omd/packages/net-snmp/patches/0014-Port-OpenSSL-1.1.0-with-support-for-1.0.2.dif b/omd/packages/net-snmp/patches/0014-Port-OpenSSL-1.1.0-with-support-for-1.0.2.dif new file mode 100644 index 0000000..f8d42ee --- /dev/null +++ b/omd/packages/net-snmp/patches/0014-Port-OpenSSL-1.1.0-with-support-for-1.0.2.dif @@ -0,0 +1,169 @@ +diff -Nur net-snmp-734f855.orig/apps/snmpusm.c net-snmp-734f855/apps/snmpusm.c +--- net-snmp-734f855.orig/apps/snmpusm.c 2016-11-09 22:22:30.000000000 +0100 ++++ net-snmp-734f855/apps/snmpusm.c 2018-04-23 12:44:30.975474955 +0200 +@@ -183,6 +183,31 @@ + } + + #if defined(HAVE_OPENSSL_DH_H) && defined(HAVE_LIBCRYPTO) ++ ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++ ++static void DH_get0_pqg(const DH *dh, ++ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) ++{ ++ if (p != NULL) ++ *p = dh->p; ++ if (q != NULL) ++ *q = dh->q; ++ if (g != NULL) ++ *g = dh->g; ++} ++ ++static void DH_get0_key(const DH *dh, const BIGNUM **pub_key, ++ const BIGNUM **priv_key) ++{ ++ if (pub_key != NULL) ++ *pub_key = dh->pub_key; ++ if (priv_key != NULL) ++ *priv_key = dh->priv_key; ++} ++ ++#endif ++ + int + get_USM_DH_key(netsnmp_variable_list *vars, netsnmp_variable_list *dhvar, + size_t outkey_len, +@@ -190,7 +215,7 @@ + oid *keyoid, size_t keyoid_len) { + u_char *dhkeychange; + DH *dh; +- BIGNUM *other_pub; ++ const BIGNUM *p, *g, *pub_key, *other_pub; + u_char *key; + size_t key_len; + +@@ -205,25 +230,29 @@ + dh = d2i_DHparams(NULL, &cp, dhvar->val_len); + } + +- if (!dh || !dh->g || !dh->p) { ++ if (dh) ++ DH_get0_pqg(dh, &p, NULL, &g); ++ ++ if (!dh || !g || !p) { + SNMP_FREE(dhkeychange); + return SNMPERR_GENERR; + } + +- DH_generate_key(dh); +- if (!dh->pub_key) { ++ if (!DH_generate_key(dh)) { + SNMP_FREE(dhkeychange); + return SNMPERR_GENERR; + } + +- if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) { ++ DH_get0_key(dh, &pub_key, NULL); ++ ++ if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) { + SNMP_FREE(dhkeychange); + fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n", +- (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key)); ++ (unsigned long)vars->val_len, BN_num_bytes(pub_key)); + return SNMPERR_GENERR; + } + +- BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len); ++ BN_bn2bin(pub_key, dhkeychange + vars->val_len); + + key_len = DH_size(dh); + if (!key_len) { +diff -Nur net-snmp-734f855.orig/configure.d/config_os_libs2 net-snmp-734f855/configure.d/config_os_libs2 +--- net-snmp-734f855.orig/configure.d/config_os_libs2 2016-11-09 22:22:30.000000000 +0100 ++++ net-snmp-734f855/configure.d/config_os_libs2 2018-04-23 12:45:06.638357434 +0200 +@@ -325,12 +325,6 @@ + AC_CHECK_DECL([EVP_sha384], + [AC_DEFINE([HAVE_EVP_SHA384], 1, [Define if you have EVP_sha384/512 in openssl])],, + [[#include <openssl/evp.h>]]) +- +- AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, +- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], +- [Define to 1 if you have the `EVP_MD_CTX_create' function.]) +- AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [], +- [Define to 1 if you have the `EVP_MD_CTX_destroy' function.])) + fi + if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then + AC_CHECK_LIB(ssl, DTLSv1_method, +diff -Nur net-snmp-734f855.orig/snmplib/keytools.c net-snmp-734f855/snmplib/keytools.c +--- net-snmp-734f855.orig/snmplib/keytools.c 2016-11-09 22:22:30.000000000 +0100 ++++ net-snmp-734f855/snmplib/keytools.c 2018-04-23 12:47:07.858563349 +0200 +@@ -176,13 +176,13 @@ + QUITFUN(SNMPERR_GENERR, generate_Ku_quit); + } + +-#ifdef HAVE_EVP_MD_CTX_CREATE ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + ctx = EVP_MD_CTX_create(); + #else +- ctx = malloc(sizeof(*ctx)); +- if (!EVP_MD_CTX_init(ctx)) +- return SNMPERR_GENERR; ++ ctx = EVP_MD_CTX_new(); + #endif ++ if (!ctx) ++ return SNMPERR_GENERR; + if (!EVP_DigestInit(ctx, hashfn)) + return SNMPERR_GENERR; + +@@ -278,11 +278,10 @@ + memset(buf, 0, sizeof(buf)); + #ifdef NETSNMP_USE_OPENSSL + if (ctx) { +-#ifdef HAVE_EVP_MD_CTX_DESTROY ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_destroy(ctx); + #else +- EVP_MD_CTX_cleanup(ctx); +- free(ctx); ++ EVP_MD_CTX_free(ctx); + #endif + } + #endif +diff -Nur net-snmp-734f855.orig/snmplib/scapi.c net-snmp-734f855/snmplib/scapi.c +--- net-snmp-734f855.orig/snmplib/scapi.c 2016-11-09 22:22:30.000000000 +0100 ++++ net-snmp-734f855/snmplib/scapi.c 2018-04-23 12:44:30.979474830 +0200 +@@ -627,15 +627,10 @@ + return SNMPERR_GENERR; + + /** initialize the pointer */ +-#ifdef HAVE_EVP_MD_CTX_CREATE ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + cptr = EVP_MD_CTX_create(); + #else +- cptr = malloc(sizeof(*cptr)); +-#if defined(OLD_DES) +- memset(cptr, 0, sizeof(*cptr)); +-#else +- EVP_MD_CTX_init(cptr); +-#endif ++ cptr = EVP_MD_CTX_new(); + #endif + if (!EVP_DigestInit(cptr, hashfn)) { + /* requested hash function is not available */ +@@ -648,13 +643,11 @@ + /** do the final pass */ + EVP_DigestFinal(cptr, MAC, &tmp_len); + *MAC_len = tmp_len; +-#ifdef HAVE_EVP_MD_CTX_DESTROY ++ ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_destroy(cptr); + #else +-#if !defined(OLD_DES) +- EVP_MD_CTX_cleanup(cptr); +-#endif +- free(cptr); ++ EVP_MD_CTX_free(cptr); + #endif + return (rval); + diff --git a/omd/packages/net-snmp/patches/0015-Another-OpenSSL-1.1.0-fix.dif b/omd/packages/net-snmp/patches/0015-Another-OpenSSL-1.1.0-fix.dif new file mode 100644 index 0000000..9516215 --- /dev/null +++ b/omd/packages/net-snmp/patches/0015-Another-OpenSSL-1.1.0-fix.dif @@ -0,0 +1,34 @@ +commit ee4effd7d2cceb950629c0066c15257093ecbfe1 +Author: Bart Van Assche <bvanassche(a)acm.org> +Date: Sat Nov 26 20:20:39 2016 -0800 + + Win32, snmp-lib: Fix sc_get_openssl_hashfn() declaration + + On Unix systems EVP_MD is an alias for struct env_md_st. On Windows + systems EVP_MD is an alias for evp_md_st (Shining Light Productions + OpenSSL v1.1.0c). Hence use EVP_MD in the scapi.h header file. + +diff --git a/include/net-snmp/library/scapi.h b/include/net-snmp/library/scapi.h +index 82cabcaab..8fb522ab2 100644 +--- a/include/net-snmp/library/scapi.h ++++ b/include/net-snmp/library/scapi.h +@@ -10,6 +10,10 @@ + #ifndef _SCAPI_H + #define _SCAPI_H + ++#ifdef NETSNMP_USE_OPENSSL ++#include <openssl/ossl_typ.h> /* EVP_MD */ ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -50,7 +54,7 @@ extern "C" { + int sc_get_proper_priv_length(const oid * privtype, + u_int privtype_len); + #ifdef NETSNMP_USE_OPENSSL +- const struct env_md_st *sc_get_openssl_hashfn(int auth_type); ++ const EVP_MD *sc_get_openssl_hashfn(int auth_type); + #endif + + NETSNMP_IMPORT

6 years, 2 months

Improved wording a bit. Fixed a few typos.

by Sven Panne

Module: check_mk Branch: master Commit: 619fcb9e31b24ca044ba6664477a4299d5343801 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=619fcb9e31b24c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 23 14:26:57 2018 +0200 Improved wording a bit. Fixed a few typos. Change-Id: I9aef5740f2a99088aa0ca9bca3d49f2580485d3e --- .werks/4989 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.werks/4989 b/.werks/4989 index cdc5df9..07d5839 100644 --- a/.werks/4989 +++ b/.werks/4989 @@ -8,27 +8,27 @@ Date: 1499935734 Class: feature The Event Console is now saving whether or not a host that can be found in the core -was in downtime or not. Based on this information the event handling can be influenced +was in downtime or not. Based on this information, the event handling can be influenced in different ways. -The idea is: In the moment a host is in downtime all events generated by the host are -"handled problems". The events should be created and be visible during the downtime to -assist during maintenance. After maintenance the events that have been created in the -downtime are not interesting anymore. +The idea is: In the moment a host is in downtime, all events generated by the +host are "handled problems". The events are still created, and they are visible +during the downtime to assist maintenance. After the maintenance, the events +that have been created during the downtime are not interesting anymore. What has changed: <ul> -<li>Each event has a new attribute <tt>event_host_in_downtime</tt>. Assuming <i>0</i> +<li>Each event has a new attribute <tt>event_host_in_downtime</tt>, assuming <i>0</i> (no) for existing events.</li> -<li>It is possible to filter event views by this information</li> -<li>Separate counting events are created for in downtime / not in downtime</li> -<li>Events are added during downtime and visible in the default events views<li> -<li>The tactical overview does not count events created in host downtime in the -"handled problems" column</li> -<li>Events created during downtime will be archived automatically after the host -left the downtime</li> -<li>Actions are handled independent of the downtime by default. But you have the +<li>It is possible to use this information in event view filters.</li> +<li>Separate counting events are created for "in downtime" / "not in downtime".</li> +<li>Events are added during downtime, and they are visible in the default events views.</li> +<li>The tactical overview does not count events created during a host downtime in the +"Unhandled" column.</li> +<li>Events created during a host downtime will be archived automatically after the host +left the downtime.</li> +<li>Actions are handled independently of the host downtime by default, but you have the option to only execute actions when the host was not in downtime</li> </ul>

6 years, 2 months

5802 FIX Graph rendering: fixed automatically scaling of vertical axis

by Andreas Boesl

Module: check_mk Branch: master Commit: dadecb584701de57f7070302d440994f3c3575fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dadecb584701de… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 23 11:54:59 2018 +0200 5802 FIX Graph rendering: fixed automatically scaling of vertical axis The graph viewport of some metrics was not computed correctly. So the min and max value did not show up, unless the user manually scrolled the graph to the correct value. Change-Id: I0517a72c1999f50d91ee51afd54c654743de6ad9 --- .werks/5802 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.werks/5802 b/.werks/5802 new file mode 100644 index 0000000..c984f36 --- /dev/null +++ b/.werks/5802 @@ -0,0 +1,12 @@ +Title: Graph rendering: fixed automatically scaling of vertical axis +Level: 1 +Component: metrics +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.6.0i1 +Date: 1524477101 + +The graph viewport of some metrics was not computed correctly. So the min and max value did not show up, +unless the user manually scrolled the graph to the correct value.

6 years, 2 months

Update for WK5979 FIX Availability: Highlighting was still broken for timeranges with service period gaps

by Andreas Boesl

Module: check_mk Branch: master Commit: fc3a2e35bd18e0fe6fab42e0f13955af36c7f33f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc3a2e35bd18e0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 20 13:17:10 2018 +0200 Update for WK5979 FIX Availability: Highlighting was still broken for timeranges with service period gaps Change-Id: Iaa5710ab972539997b9c444b567a1f5be3b86c8c --- web/plugins/views/availability.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 877f838..f4425b0 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -463,12 +463,14 @@ def render_timeline_bar(timeline_layout, style): "style": "width: %.3f%%" % width, "title": title, "class": css, - "id_": "timeline_%d" % row_nr, } - if style == "standalone" and row_nr is not None: - td_attrs.update({"onmouseover": "timeline_hover(%d, 1);" % row_nr, - "onmouseout" : "timeline_hover(%d, 0);" % row_nr, }) + if row_nr is not None: + td_attrs.update({"id_": "timeline_%d" % row_nr}) + + if style == "standalone": + td_attrs.update({"onmouseover": "timeline_hover(%d, 1);" % row_nr, + "onmouseout" : "timeline_hover(%d, 0);" % row_nr, }) html.td('', **td_attrs)

6 years, 2 months

docker_node_network: Changed HW/ SW inventory data structure to workaround tree merge issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 087338802631cc7f424e9a359ada038d2c5a1e1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=087338802631cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 10:14:03 2018 +0200 docker_node_network: Changed HW/SW inventory data structure to workaround tree merge issues Change-Id: I9d457177e805e710501a3bfe5eed199d79d8b919 --- inventory/docker_node_network | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inventory/docker_node_network b/inventory/docker_node_network index 0dba8d9..90e45f7 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -33,8 +33,8 @@ def _parse_docker_node_network(info): def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): parsed = _parse_docker_node_network(info) - inventory_networks = inventory_tree.get_list("software.applications.docker.networks:") - status_networks = status_data_tree.get_list("software.applications.docker.networks:") + inventory_networks = inventory_tree.get_dict("software.applications.docker.networks.") + status_networks = status_data_tree.get_dict("software.applications.docker.networks.") for network in parsed: labels = sorted(["%s: %s" % (k,v) for k,v in network["Labels"].items()]) @@ -49,18 +49,18 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): "mac_address" : container["MacAddress"], }) - status_networks.append({ + status_networks[network["Name"]] = { "name" : network["Name"], "containers" : containers, - }) + } - inventory_networks.append({ + inventory_networks[network["Name"]] = { "name" : network["Name"], "host_ifname" : network["Options"]["com.docker.network.bridge.name"], "labels" : ", ".join(labels), "network_id" : network["Id"][:12], "scope" : network["Scope"], - }) + } inv_info["docker_node_network.networks"] = {

6 years, 2 months

6026 FIX Updated pnp4nagios to 0.6.26

by Lars Michelsen

Module: check_mk Branch: master Commit: c895bd775e3f1b35b9b803447b8f816243baeffa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c895bd775e3f1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 08:40:39 2018 +0200 6026 FIX Updated pnp4nagios to 0.6.26 Change-Id: Ib760ea9da065edef5d2ae9113e8669a2e8025ddb --- .werks/6026 | 11 +++++++++++ omd/packages/pnp4nagios/Makefile | 2 +- omd/packages/pnp4nagios/pnp4nagios-0.6.25.tar.gz | Bin 2921072 -> 0 bytes omd/packages/pnp4nagios/pnp4nagios-0.6.26.tar.gz | Bin 0 -> 3039265 bytes 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6026 b/.werks/6026 new file mode 100644 index 0000000..e5d2641 --- /dev/null +++ b/.werks/6026 @@ -0,0 +1,11 @@ +Title: Updated pnp4nagios to 0.6.26 +Level: 1 +Component: packages +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1524465618 + + diff --git a/omd/packages/pnp4nagios/Makefile b/omd/packages/pnp4nagios/Makefile index 60e4335..fdb21dd 100644 --- a/omd/packages/pnp4nagios/Makefile +++ b/omd/packages/pnp4nagios/Makefile @@ -3,7 +3,7 @@ include ../../Makefile.omd .PHONY: skel NAME = pnp4nagios -VERSION = 0.6.25 +VERSION = 0.6.26 DIR = $(NAME)-$(VERSION) # Unset CONFIG_SITE CONFIG_SITE = '' diff --git a/omd/packages/pnp4nagios/pnp4nagios-0.6.25.tar.gz b/omd/packages/pnp4nagios/pnp4nagios-0.6.25.tar.gz deleted file mode 100644 index a27c06e..0000000 Binary files a/omd/packages/pnp4nagios/pnp4nagios-0.6.25.tar.gz and /dev/null differ diff --git a/omd/packages/pnp4nagios/pnp4nagios-0.6.26.tar.gz b/omd/packages/pnp4nagios/pnp4nagios-0.6.26.tar.gz new file mode 100644 index 0000000..b8413b2 Binary files /dev/null and b/omd/packages/pnp4nagios/pnp4nagios-0.6.26.tar.gz differ

6 years, 2 months

Fixed test_text_input unit test

by Lars Michelsen

Module: check_mk Branch: master Commit: 0210c723aa2dcab1d2a7b916582d7adbbec6ba71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0210c723aa2dca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 08:33:51 2018 +0200 Fixed test_text_input unit test Change-Id: I9249cc6fcbf2edc4dd2f183d563c642147c3abda --- tests/unit/web/unittest_files/text_input.unittest | 432 +++++++++++----------- 1 file changed, 216 insertions(+), 216 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0210c723aa…

6 years, 2 months

6024 docker_container_network: Show nodes networks and ports

by Lars Michelsen

Module: check_mk Branch: master Commit: 78146957ae75c8ce630c095de7aa013d05d4554e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78146957ae75c8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 07:22:10 2018 +0200 6024 docker_container_network: Show nodes networks and ports Change-Id: Ib81a13e403006c9da20c7d9ca023c6c9340de9ea --- .werks/6024 | 10 +++++ agents/check_mk_agent.linux | 4 ++ inventory/docker_container_labels | 4 +- inventory/docker_container_network | 76 ++++++++++++++++++++++++++++++++++++++ web/plugins/views/inventory.py | 16 ++++++++ 5 files changed, 108 insertions(+), 2 deletions(-) diff --git a/.werks/6024 b/.werks/6024 new file mode 100644 index 0000000..dbbf4e3 --- /dev/null +++ b/.werks/6024 @@ -0,0 +1,10 @@ +Title: docker_container_network: Show nodes networks and ports +Level: 1 +Component: inv +Compatible: compat +Edition: cre +Version: 1.5.0b2 +Date: 1524345439 +Class: feature + + diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b172403..28fb702 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -1007,6 +1007,10 @@ if type docker > /dev/null 2>&1 ; then echo "<<<docker_container_labels>>>" docker inspect "$CONTAINER_ID" --format='{{json .Config.Labels}}' + + echo "<<<docker_container_network>>>" + docker inspect "$CONTAINER_ID" --format='{{json .NetworkSettings}}' + echo "<<<<>>>>" done diff --git a/inventory/docker_container_labels b/inventory/docker_container_labels index 1469423..9b0021d 100644 --- a/inventory/docker_container_labels +++ b/inventory/docker_container_labels @@ -28,8 +28,8 @@ def inv_docker_container_labels(info, inventory_tree): import json data = json.loads(" ".join(info[0])) - container_labels = inventory_tree.get_dict("software.applications.docker.container.") - container_labels["labels"] = ", ".join(["%s: %s" % (k,v) for k,v in data.items()]) + container = inventory_tree.get_dict("software.applications.docker.container.") + container["labels"] = ", ".join(["%s: %s" % (k,v) for k,v in data.items()]) inv_info['docker_container_labels'] = { diff --git a/inventory/docker_container_network b/inventory/docker_container_network new file mode 100644 index 0000000..ce77be6 --- /dev/null +++ b/inventory/docker_container_network @@ -0,0 +1,76 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 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 _parse_docker_container_network(info): + import json + return json.loads(" ".join(info[0])) + + +def inv_docker_container_network_networks(info, inventory_tree): + parsed = _parse_docker_container_network(info) + + networks = inventory_tree.get_list("software.applications.docker.container.networks:") + + for network_name, network in parsed["Networks"].items(): + networks.append({ + "name" : network_name, + "network_id" : network["NetworkID"], + "ip_address" : network["IPAddress"], + "ip_prefixlen" : network["IPPrefixLen"], + "gateway" : network["Gateway"], + "mac_address" : network["MacAddress"], + }) + + +inv_info["docker_container_network.networks"] = { + "inv_function": inv_docker_container_network_networks, +} + + +def inv_docker_container_network_ports(info, inventory_tree): + parsed = _parse_docker_container_network(info) + + ports = inventory_tree.get_list("software.applications.docker.container.ports:") + + for container_port_spec, host_ports in parsed["Ports"].items(): + port, proto = container_port_spec.split("/", 1) + + if host_ports: + host_addresses = ", ".join([ "%s:%s" % (hp["HostIp"], hp["HostPort"]) for hp in host_ports ]) + else: + host_addresses = "" + + ports.append({ + "port" : int(port), + "protocol" : proto, + "host_addresses" : host_addresses, + }) + + +inv_info["docker_container_network.ports"] = { + "inv_function": inv_docker_container_network_ports, +} diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index e7098f1..12e69de 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -690,6 +690,22 @@ inventory_displayhints.update({ }, ".software.applications.check_mk.cluster.nodes:" : { "title" : _("Nodes"),}, + ".software.applications.docker.container.": { + "title" : _("Container"), + }, + ".software.applications.docker.container.node_name": { + "title" : _("Node name"), + }, + ".software.applications.docker.container.networks:": { + "title" : _("Networks"), + "keyorder" : [ "name", "ip_address", "ip_prefixlen", "gateway", + "mac_address", "network_id" ], + }, + ".software.applications.docker.container.ports:": { + "title" : _("Ports"), + "keyorder" : [ "port", "protocol", "host_addresses" ], + }, + ".software.applications.citrix." : { "title" : _("Citrix") }, ".software.applications.citrix.controller." : { "title" : _("Controller") }, ".software.applications.citrix.controller.controller_version" : { "title" : _("Controller Version"), },

6 years, 2 months

Updated python-module cryptography to 1.9 for Ubuntu 18.04 support

by Lars Michelsen

Module: check_mk Branch: master Commit: bb1499bdec508baa72226ab09eaa36f6dfeca60e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb1499bdec508b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 18:30:22 2018 +0200 Updated python-module cryptography to 1.9 for Ubuntu 18.04 support Updated dependencies: ipaddress-1.0.22 cffi-1.11.5 asn1crypto-0.24.0 Change-Id: Ic15713fe0a2f02c04e33c6dfab5639351b6b9d54 --- omd/packages/python-modules/Makefile | 11 ++++++----- .../python-modules/src/asn1crypto-0.24.0.tar.gz | Bin 0 -> 104964 bytes omd/packages/python-modules/src/cffi-1.11.4.tar.gz | Bin 436857 -> 0 bytes omd/packages/python-modules/src/cffi-1.11.5.tar.gz | Bin 0 -> 438498 bytes .../python-modules/src/cryptography-1.9.tar.gz | Bin 0 -> 409664 bytes .../python-modules/src/ipaddress-1.0.19.tar.gz | Bin 32854 -> 0 bytes .../python-modules/src/ipaddress-1.0.22.tar.gz | Bin 0 -> 33051 bytes 7 files changed, 6 insertions(+), 5 deletions(-) diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile index ed313bb..89bd41d 100644 --- a/omd/packages/python-modules/Makefile +++ b/omd/packages/python-modules/Makefile @@ -42,7 +42,7 @@ MODULES += psycopg2-2.6.2.tar.gz # needed by check_sql MODULES += dicttoxml-1.7.4.tar.gz # needed by inventory XML export MODULES += pycparser-2.18.tar.gz # needed for cffi MODULES += enum34-1.1.6.tar.gz # needed for cffi -MODULES += cffi-1.11.4.tar.gz # needed by e.g. Pillow +MODULES += cffi-1.11.5.tar.gz # needed by e.g. Pillow MODULES += Pillow-5.0.0.tar.gz # needed by reportlab (pillow>=2.4.0) MODULES += pip-9.0.1.tar.gz # needed by reportlab (pip>=1.4.1) MODULES += reportlab-3.4.0.tar.gz # needed by reporting @@ -82,7 +82,7 @@ MODULES += psutil-5.4.3.tar.gz # needed for mkbench # so we need to patch one more time. MODULES += six-1.11.0.tar.gz -MODULES += ipaddress-1.0.19.tar.gz +MODULES += ipaddress-1.0.22.tar.gz MODULES += netifaces-0.10.6.tar.gz # needed for LDAP (nearest DC detection) MODULES += dnspython-1.15.0.zip # needed for LDAP (nearest DC detection) @@ -94,9 +94,10 @@ ifneq ($(filter $(DISTRO_CODE),el5 lucid sles11sp1 sles11sp2 sles11sp3 sles11sp4 PATCHES += patches/0005-NID_ecdsa_with_SHA-fix.patch PATCHES += patches/0009-cryptography-1.4-disable-version-warning.patch else - MODULES += cryptography-1.5.3.tar.gz - PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch - PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch + MODULES += cryptography-1.9.tar.gz + MODULES += asn1crypto-0.24.0.tar.gz + #PATCHES += patches/0004-CMS_DEBUG_DECRYPT-fix.patch + #PATCHES += patches/0009-cryptography-1.5.3-disable-version-warning.patch endif # Added for NetApp special agent, but may be used in other components too in future diff --git a/omd/packages/python-modules/src/asn1crypto-0.24.0.tar.gz b/omd/packages/python-modules/src/asn1crypto-0.24.0.tar.gz new file mode 100644 index 0000000..5a207c5 Binary files /dev/null and b/omd/packages/python-modules/src/asn1crypto-0.24.0.tar.gz differ diff --git a/omd/packages/python-modules/src/cffi-1.11.4.tar.gz b/omd/packages/python-modules/src/cffi-1.11.4.tar.gz deleted file mode 100644 index ccc37f1..0000000 Binary files a/omd/packages/python-modules/src/cffi-1.11.4.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/cffi-1.11.5.tar.gz b/omd/packages/python-modules/src/cffi-1.11.5.tar.gz new file mode 100644 index 0000000..9c4fa7f Binary files /dev/null and b/omd/packages/python-modules/src/cffi-1.11.5.tar.gz differ diff --git a/omd/packages/python-modules/src/cryptography-1.9.tar.gz b/omd/packages/python-modules/src/cryptography-1.9.tar.gz new file mode 100644 index 0000000..970f71a Binary files /dev/null and b/omd/packages/python-modules/src/cryptography-1.9.tar.gz differ diff --git a/omd/packages/python-modules/src/ipaddress-1.0.19.tar.gz b/omd/packages/python-modules/src/ipaddress-1.0.19.tar.gz deleted file mode 100644 index f1f4e70..0000000 Binary files a/omd/packages/python-modules/src/ipaddress-1.0.19.tar.gz and /dev/null differ diff --git a/omd/packages/python-modules/src/ipaddress-1.0.22.tar.gz b/omd/packages/python-modules/src/ipaddress-1.0.22.tar.gz new file mode 100644 index 0000000..124c90a Binary files /dev/null and b/omd/packages/python-modules/src/ipaddress-1.0.22.tar.gz differ

6 years, 2 months

Fix psycopg2 build with Ubuntu 18.04

by Lars Michelsen

Module: check_mk Branch: master Commit: b2f826ee2ee6f67cd5ace068d7a2e0c22d962c01 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2f826ee2ee6f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 20 18:15:37 2018 +0200 Fix psycopg2 build with Ubuntu 18.04 Change-Id: I5382748f2f58118a1aa30b541b93eed69fb7533c --- ...0016-make-psycopg2-build-with-ubuntu-bionic.dif | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif b/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif new file mode 100644 index 0000000..a1118e3 --- /dev/null +++ b/omd/packages/python-modules/patches/0016-make-psycopg2-build-with-ubuntu-bionic.dif @@ -0,0 +1,31 @@ +diff -Nur dest.orig/psycopg2-2.6.2/setup.py dest/psycopg2-2.6.2/setup.py +--- dest.orig/psycopg2-2.6.2/setup.py 2016-07-07 02:16:24.000000000 +0000 ++++ dest/psycopg2-2.6.2/setup.py 2018-04-20 16:11:18.575206167 +0000 +@@ -410,19 +410,24 @@ + pgversion = "7.4.0" + + verre = re.compile( +- r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))") ++ r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?") + m = verre.match(pgversion) + if m: + pgmajor, pgminor, pgpatch = m.group(1, 2, 3) ++ # Postgres >= 10 doesn't have pgminor anymore. ++ pgmajor = int(pgmajor) ++ if pgmajor >= 10: ++ pgminor, pgpatch = None, pgminor ++ if pgminor is None or not pgminor.isdigit(): ++ pgminor = 0 + if pgpatch is None or not pgpatch.isdigit(): + pgpatch = 0 +- pgmajor = int(pgmajor) + pgminor = int(pgminor) + pgpatch = int(pgpatch) + else: + sys.stderr.write( + "Error: could not determine PostgreSQL version from '%s'" +- % pgversion) ++ % pgversion) + sys.exit(1) + + define_macros.append(("PG_VERSION_HEX", "0x%02X%02X%02X" %))

6 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018