Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

sidebar.js: Refactored sidebar to be a standalone module

by Lars Michelsen

Module: check_mk Branch: master Commit: f65aae5ff13fe1418b968ba299b505ecf2d4ad76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f65aae5ff13fe1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:29 2018 +0100 sidebar.js: Refactored sidebar to be a standalone module * Imports and exports are explicitly declared now * Moved visibility detection and foldable container logic to own modules * File is eslint clean now Change-Id: I2c61537cd76a2ecfdc8b589252dca3f5eb2eb6de --- cmk/gui/htmllib.py | 4 +- cmk/gui/plugins/sidebar/bookmarks.py | 4 +- cmk/gui/plugins/sidebar/dashboards.py | 2 +- cmk/gui/plugins/sidebar/master_control.py | 2 +- cmk/gui/plugins/sidebar/site_status.py | 2 +- cmk/gui/plugins/sidebar/utils.py | 2 +- cmk/gui/plugins/sidebar/views.py | 4 +- cmk/gui/plugins/sidebar/virtual_host_tree.py | 8 +- cmk/gui/plugins/sidebar/wato.py | 10 +- cmk/gui/sidebar.py | 51 ++-- web/htdocs/js/checkmk.js | 334 +------------------------- web/htdocs/js/dashboard.js | 8 +- web/htdocs/js/index.js | 24 +- web/htdocs/js/modules/foldable_container.js | 107 +++++++++ web/htdocs/js/{ => modules}/sidebar.js | 309 ++++++++++++------------ web/htdocs/js/modules/utils.js | 128 +++++++++- web/htdocs/js/modules/visibility_detection.js | 102 ++++++++ web/htdocs/js/side_index.js | 13 +- 18 files changed, 582 insertions(+), 532 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f65aae5ff1…

5 years, 6 months

sidebar.js: Cleaned up quoting

by Lars Michelsen

Module: check_mk Branch: master Commit: 264794ee7130e263da0dfb0f2e4781869704df8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=264794ee7130e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:27 2018 +0100 sidebar.js: Cleaned up quoting Change-Id: I66015736f0a15444e7c38add1d98f7fe2d8943a1 --- web/htdocs/js/sidebar.js | 259 ++++++++++++++++++++++++----------------------- 1 file changed, 130 insertions(+), 129 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=264794ee71…

5 years, 6 months

Fixed wrong path in patch

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d1333d5069c11ae4f21bdd78600d06027b9cfde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d1333d5069c11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 09:51:41 2018 +0100 Fixed wrong path in patch Change-Id: Ie1afdb77bf9a4e583d7fbda09152bd59177beef1 --- .../patches/0009-cryptography-2.4.1-disable-version-warning.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch b/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch index aca1bcb..45d28d4 100644 --- a/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch +++ b/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch @@ -1,6 +1,6 @@ -diff -Nur cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py ---- cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py 2018-11-12 01:52:23.000000000 +0100 -+++ cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py 2018-12-21 08:43:00.152671521 +0100 +diff -Nur dest/cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py dest/cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py +--- dest/cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py 2018-11-12 01:52:23.000000000 +0100 ++++ dest/cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py 2018-12-21 08:43:00.152671521 +0100 @@ -171,4 +171,4 @@ # is per module so this approach will not work. Binding.init_static_locks()

5 years, 6 months

Fix cryptography deprecation warning

by Lars Michelsen

Module: check_mk Branch: master Commit: 4c1361550ca26d09c657ccf337641e58ad752526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c1361550ca26d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 08:44:45 2018 +0100 Fix cryptography deprecation warning The message "CryptographyDeprecationWarning: OpenSSL version 1.0.1 is no longer" was printed by the python cryptography module with e.g. CentOS 7. We suppress this message to be able to use this cryptography version with these distros now. CMK-1496 Change-Id: I21eb8ea37830ac0a4a226ffb9bfa0becce02c95e --- .../0009-cryptography-2.4.1-disable-version-warning.patch | 9 +++++++++ omd/packages/python-modules/python-modules.make | 1 + 2 files changed, 10 insertions(+) diff --git a/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch b/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch new file mode 100644 index 0000000..aca1bcb --- /dev/null +++ b/omd/packages/python-modules/patches/0009-cryptography-2.4.1-disable-version-warning.patch @@ -0,0 +1,9 @@ +diff -Nur cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py +--- cryptography-2.4.1.orig/src/cryptography/hazmat/bindings/openssl/binding.py 2018-11-12 01:52:23.000000000 +0100 ++++ cryptography-2.4.1/src/cryptography/hazmat/bindings/openssl/binding.py 2018-12-21 08:43:00.152671521 +0100 +@@ -171,4 +171,4 @@ + # is per module so this approach will not work. + Binding.init_static_locks() + +-_verify_openssl_version(Binding.lib) ++#_verify_openssl_version(Binding.lib) diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index ce49daa..49dbd39 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -125,6 +125,7 @@ else ifneq ($(filter $(DISTRO_CODE),el6),) else PYTHON_MODULES_LIST += asn1crypto-0.24.0.tar.gz PYTHON_MODULES_LIST += cryptography-2.4.1.tar.gz + PYTHON_MODULES_PATCHES += $(PACKAGE_DIR)/$(PYTHON_MODULES)/patches/0009-cryptography-2.4.1-disable-version-warning.patch endif PYTHON_MODULES_LIST += certifi-2018.10.15.tar.gz

5 years, 6 months

make azure catalog nicer

by Moritz Kiemer

Module: check_mk Branch: master Commit: a78cae783baa52752847437434e0ebd3010495b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a78cae783baa52… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 13:27:38 2018 +0100 make azure catalog nicer Change-Id: Iece08c8d945945ebfff7f4937ec90364afa70a7f --- checkman/azure_databases.connections | 2 +- checkman/azure_databases.deadlock | 2 +- checkman/azure_databases.dtu | 2 +- checkman/azure_databases.storage | 2 +- checkman/azure_storageaccounts.flow | 2 +- checkman/azure_storageaccounts.performance | 2 +- checkman/azure_virtualnetworkgateways | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checkman/azure_databases.connections b/checkman/azure_databases.connections index 594e3d2..1d939b9 100644 --- a/checkman/azure_databases.connections +++ b/checkman/azure_databases.connections @@ -1,4 +1,4 @@ -title: Microsoft Azure SQL Databases: connections +title: Microsoft Azure SQL Databases: Connections agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_databases.deadlock b/checkman/azure_databases.deadlock index b73f3d7..ab99ed8 100644 --- a/checkman/azure_databases.deadlock +++ b/checkman/azure_databases.deadlock @@ -1,4 +1,4 @@ -title: Microsoft Azure SQL Databases: deadlocks +title: Microsoft Azure SQL Databases: Deadlocks agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_databases.dtu b/checkman/azure_databases.dtu index 6b2b5f5..08c38f6 100644 --- a/checkman/azure_databases.dtu +++ b/checkman/azure_databases.dtu @@ -1,4 +1,4 @@ -title: Microsoft Azure SQL Databases: throughput units +title: Microsoft Azure SQL Databases: Throughput units agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_databases.storage b/checkman/azure_databases.storage index ec3f7a7..46bf5a0 100644 --- a/checkman/azure_databases.storage +++ b/checkman/azure_databases.storage @@ -1,4 +1,4 @@ -title: Microsoft Azure SQL Databases: storage +title: Microsoft Azure SQL Databases: Storage agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_storageaccounts.flow b/checkman/azure_storageaccounts.flow index f6d944e..efadbcd 100644 --- a/checkman/azure_storageaccounts.flow +++ b/checkman/azure_storageaccounts.flow @@ -1,4 +1,4 @@ -title: Microsoft Azure Storage Accounts - Data flow +title: Microsoft Azure Storage Accounts: Data flow agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_storageaccounts.performance b/checkman/azure_storageaccounts.performance index e1b251b..63b6aa6 100644 --- a/checkman/azure_storageaccounts.performance +++ b/checkman/azure_storageaccounts.performance @@ -1,4 +1,4 @@ -title: Microsoft Azure Storage Accounts - Performance +title: Microsoft Azure Storage Accounts: Performance agents: linux catalog: cloud/azure license: GPL diff --git a/checkman/azure_virtualnetworkgateways b/checkman/azure_virtualnetworkgateways index 23fc360..79066fc 100644 --- a/checkman/azure_virtualnetworkgateways +++ b/checkman/azure_virtualnetworkgateways @@ -1,4 +1,4 @@ -title: Microsoft Azure virtual network gateways +title: Microsoft Azure Virtual Network Gateways agents: linux catalog: cloud/azure license: GPL

5 years, 6 months

agent_azure: reorganize computation of timestamps

by Moritz Kiemer

Module: check_mk Branch: master Commit: 57341fea3b64213049c8bd6711b268fa5c933867 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57341fea3b6421… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 11:59:43 2018 +0100 agent_azure: reorganize computation of timestamps Change-Id: I510ee31d41b3aaa380826444e479052a92e4831e --- agents/special/agent_azure | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 3e86413..f82183d 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -468,18 +468,26 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes self.specific_clients = {} - # compute timespan once, and keep it fixed - t_end = datetime.datetime.utcnow() - t_min = t_end - datetime.timedelta(minutes=5) - t_hrs = t_end - datetime.timedelta(hours=2) - self.timespan_min = "/".join((t_min.strftime("%Y-%m-%dT%H:%M:%SZ"), - t_end.strftime("%Y-%m-%dT%H:%M:%SZ"))) - self.timespan_hrs = "/".join((t_hrs.strftime("%Y-%m-%dT%H:%M:%SZ"), - t_end.strftime("%Y-%m-%dT%H:%M:%SZ"))) - + self.timespans = self._get_timespans() self.resources_cache = None self.metrics_cache = {} + @staticmethod + def _get_timespans(): + """compute timespans dict""" + t_end = datetime.datetime.utcnow() + + def interval(**kwargs): + start = t_end - datetime.timedelta(**kwargs) + return "%s/%s" % (start.strftime("%Y-%m-%dT%H:%M:%SZ"), + t_end.strftime("%Y-%m-%dT%H:%M:%SZ")) + + timespans = {} + timespans["PT1M"] = interval(minutes=3) + timespans["PT5M"] = interval(minutes=15) + timespans["PT1H"] = interval(hours=3) + return timespans + def init_specific(self, resources): r_types = set(r.info["type"] for r in resources) for rtp in r_types: @@ -508,7 +516,7 @@ class AzureClient(object): # pylint: disable=too-many-instance-attributes metrics = [] rid = resource.info["id"] - timespan = {"PT1M": self.timespan_min, "PT1H": self.timespan_hrs}[time_grain] + timespan = self.timespans[time_grain] LOG.debug( "metrics.list(%r, timespan=%r, interval=%r, metricnames=%r, aggregation=%r,"

5 years, 6 months

Refactoring: Changed duplicate variable definition to import

by Kenneth Okoh

Module: check_mk Branch: master Commit: df08aaf288778943b00d5a3429d534227681eb79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df08aaf2887789… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 12:01:06 2018 +0100 Refactoring: Changed duplicate variable definition to import Change-Id: If51b5bf2576028f10e791eb949226784840ef624 --- .../wato/check_parameters/websphere_mq_channels.py | 33 +--------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters/websphere_mq_channels.py b/cmk/gui/plugins/wato/check_parameters/websphere_mq_channels.py index 83d7ef2..de20321 100644 --- a/cmk/gui/plugins/wato/check_parameters/websphere_mq_channels.py +++ b/cmk/gui/plugins/wato/check_parameters/websphere_mq_channels.py @@ -27,45 +27,14 @@ from cmk.gui.i18n import _ from cmk.gui.valuespec import ( Dictionary, - Integer, MonitoringState, - OptionalDropdownChoice, - Percentage, TextAscii, - Tuple, ) from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, register_check_parameters, ) - -websphere_mq_common_elements = [ - ("message_count", - OptionalDropdownChoice( - title=_('Maximum number of messages'), - choices=[(None, _("Ignore these levels"))], - otherlabel=_("Set absolute levels"), - explicit=Tuple( - title=_('Maximum number of messages'), - elements=[ - Integer(title=_("Warning at")), - Integer(title=_("Critical at")), - ]), - default_value=(1000, 1200))), - ("message_count_perc", - OptionalDropdownChoice( - title=_('Percentage of queue length'), - help=_('This setting only applies if the WebSphere MQ reports the queue length'), - choices=[(None, _("Ignore these levels"))], - otherlabel=_("Set relative levels"), - explicit=Tuple( - title=_('Percentage of queue length'), - elements=[ - Percentage(title=_("Warning at")), - Percentage(title=_("Critical at")), - ]), - default_value=(80.0, 90.0))), -] +from cmk.gui.plugins.wato.check_parameters.websphere_mq import websphere_mq_common_elements register_check_parameters( RulespecGroupCheckParametersApplications,

5 years, 6 months

Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: f91874e19cb0ffd039f80c7ab8a44a122a9995d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f91874e19cb0ff… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 13:17:20 2018 +0100 Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I1087d904cc8cb4190750003aaecaa2224c440341 --- .../wato/check_parameters/citrix_sessions.py | 63 +++++++ .../plugins/wato/check_parameters/citrix_state.py | 56 +++++++ .../wato/check_parameters/mssql_connections.py | 54 ++++++ .../wato/check_parameters/mssql_databases.py | 78 +++++++++ .../wato/check_parameters/mssql_instance.py | 47 ++++++ .../plugins/wato/check_parameters/mssql_stats.py | 76 +++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 181 --------------------- .../plugins/wato/check_parameters/win_license.py | 61 +++++++ 8 files changed, 435 insertions(+), 181 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f91874e19c…

5 years, 6 months

Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 8b60f3f8bfab7939651e6444c6bd02d9dab717a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b60f3f8bfab79… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 6 14:47:46 2018 +0100 Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: Iacf6509fd5722951b6d7f5c9c7eea849e49e7342 --- cmk/gui/plugins/wato/check_parameters/licenses.py | 101 +++++++++++++ cmk/gui/plugins/wato/check_parameters/lnx_quota.py | 60 ++++++++ cmk/gui/plugins/wato/check_parameters/ruckus_ap.py | 66 +++++++++ .../plugins/wato/check_parameters/ruckus_mac.py | 84 +++++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 163 --------------------- 5 files changed, 311 insertions(+), 163 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8b60f3f8bf…

5 years, 6 months

Refactoring: Moved all varnish check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: c43f891ff3b2514ce5f5464031075c4e7149c319 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c43f891ff3b251… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 13:39:34 2018 +0100 Refactoring: Moved all varnish check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I651b36cd26bbe03086c81bc4da7066d7a343655d --- cmk/gui/plugins/wato/check_parameters/unsorted.py | 228 --------------------- .../wato/check_parameters/varnish_backend.py | 64 ++++++ .../varnish_backend_success_ratio.py | 51 +++++ .../plugins/wato/check_parameters/varnish_cache.py | 49 +++++ .../check_parameters/varnish_cache_hit_ratio.py | 51 +++++ .../wato/check_parameters/varnish_client.py | 56 +++++ .../plugins/wato/check_parameters/varnish_esi.py | 56 +++++ .../plugins/wato/check_parameters/varnish_fetch.py | 91 ++++++++ .../wato/check_parameters/varnish_objects.py | 56 +++++ .../wato/check_parameters/varnish_worker.py | 63 ++++++ .../varnish_worker_thread_ratio.py | 51 +++++ 11 files changed, 588 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c43f891ff3…

5 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018