Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: c7e42fcd84e1848495fb5e4957446fc7a41c9443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e42fcd84e184… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 18:37:14 2019 +0100 Disable core host checking before test Otherwise the core might perform host checks on it's own confusing our notification test logic. Change-Id: Ie4248d4818c0861fec330920f39c84f305995048 --- tests/integration/cmk_base/snmp/test_snmp.py | 2 +- tests/integration/notifications/test_simple_rbn.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 3e08a61..f172ff3 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -96,7 +96,7 @@ def snmpsim(site, request, tmp_path_factory): import netsnmp var = netsnmp.Varbind("sysDescr.0") result = netsnmp.snmpget(var, Version=2, DestHost="127.0.0.1:1337", Community="public") - if value is None or value[0] is None: + if result is None or value[0] is None: return False return True diff --git a/tests/integration/notifications/test_simple_rbn.py b/tests/integration/notifications/test_simple_rbn.py index 2577514..b44e503 100644 --- a/tests/integration/notifications/test_simple_rbn.py +++ b/tests/integration/notifications/test_simple_rbn.py @@ -1,11 +1,13 @@ -import pytest +# pylint: disable=redefined-outer-name + import time +import pytest -from testlib import web, WatchLog +from testlib import web, WatchLog # pylint: disable=unused-import @pytest.fixture() -def test_config(web): +def test_config(web, site): users = { "hh": { "alias": "Harry Hirsch", @@ -16,7 +18,7 @@ def test_config(web): } expected_users = set(["cmkadmin", "automation"] + users.keys()) - response = web.add_htpasswd_users(users) + web.add_htpasswd_users(users) all_users = web.get_all_users() assert not expected_users - set(all_users.keys()) @@ -27,6 +29,8 @@ def test_config(web): }) web.activate_changes() + site.live.command("[%d] DISABLE_HOST_CHECK;notify-test" % time.time()) + yield web.delete_host("notify-test")

5 years, 4 months

Made snmpsim ready wait more robust

by Lars Michelsen

Module: check_mk Branch: master Commit: a6c5452c5e9d2fb33d27086a4753d3856712f084 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6c5452c5e9d2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 18:27:20 2019 +0100 Made snmpsim ready wait more robust Change-Id: I40a9375c26de0de629cb4ee9ffac2c526971ece5 --- tests/integration/cmk_base/snmp/test_snmp.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/integration/cmk_base/snmp/test_snmp.py b/tests/integration/cmk_base/snmp/test_snmp.py index 54708a4..3e08a61 100644 --- a/tests/integration/cmk_base/snmp/test_snmp.py +++ b/tests/integration/cmk_base/snmp/test_snmp.py @@ -95,10 +95,9 @@ def snmpsim(site, request, tmp_path_factory): import netsnmp var = netsnmp.Varbind("sysDescr.0") - value = netsnmp.snmpget(var, Version=2, DestHost="127.0.0.1:1337", Community="public")[0] - if value is None: + result = netsnmp.snmpget(var, Version=2, DestHost="127.0.0.1:1337", Community="public") + if value is None or value[0] is None: return False - return True wait_until(is_listening, timeout=20)

5 years, 4 months

Cleaned up test host creation

by Lars Michelsen

Module: check_mk Branch: master Commit: 92e336b251970e6baca1b56c515e17afb9de95d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92e336b251970e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 17:00:09 2019 +0100 Cleaned up test host creation Change-Id: Iaabc40dbf255d89ca4e9c887657292f2dd160c99 --- .../cmk_base/test_services_prediction.py | 24 +-------------------- tests/integration/livestatus/test_livestatus.py | 25 ++++------------------ tests/testlib/__init__.py | 23 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 44 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index 1d6b9e4..f8e4baa 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -11,29 +11,7 @@ from cmk.utils.exceptions import MKGeneralException from cmk_base import prediction -from testlib import web, repo_path # pylint: disable=unused-import - - -def create_linux_test_host(request, web, site, hostname): - def finalizer(): - web.delete_host(hostname) - web.activate_changes() - site.delete_file("var/check_mk/agent_output/%s" % hostname) - site.delete_file("etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname) - - request.addfinalizer(finalizer) - - web.add_host(hostname, attributes={"ipaddress": "127.0.0.1"}) - - site.write_file( - "etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname, - "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['%s']))\n" % - hostname) - - site.makedirs("var/check_mk/agent_output/") - site.write_file( - "var/check_mk/agent_output/%s" % hostname, - file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) +from testlib import web, repo_path, create_linux_test_host # pylint: disable=unused-import @pytest.fixture(scope="module") diff --git a/tests/integration/livestatus/test_livestatus.py b/tests/integration/livestatus/test_livestatus.py index 187532e..78c8993 100644 --- a/tests/integration/livestatus/test_livestatus.py +++ b/tests/integration/livestatus/test_livestatus.py @@ -4,33 +4,16 @@ import pytest import itertools -from testlib import web +from testlib import web, create_linux_test_host @pytest.fixture(scope="module") -def default_cfg(web): +def default_cfg(request, site, web): print "Applying default config" - web.add_host( - "livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) - web.add_host( - "livestatus-test-host.domain", attributes={ - "ipaddress": "127.0.0.1", - }) - + create_linux_test_host(request, web, site, "livestatus-test-host") + create_linux_test_host(request, web, site, "livestatus-test-host.domain") web.discover_services("livestatus-test-host") - web.activate_changes() - yield None - - # - # Cleanup code - # - print "Cleaning up default config" - - web.delete_host("livestatus-test-host") - web.delete_host("livestatus-test-host.domain") # Simply detects all tables by querying the columns table and then diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 755ffdf..ca39b11 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -1,5 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 +# pylint: disable=redefined-outer-name import os import glob @@ -1900,6 +1901,28 @@ def ec(site, web): return ec +def create_linux_test_host(request, web, site, hostname): + def finalizer(): + web.delete_host(hostname) + web.activate_changes() + site.delete_file("var/check_mk/agent_output/%s" % hostname) + site.delete_file("etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname) + + request.addfinalizer(finalizer) + + web.add_host(hostname, attributes={"ipaddress": "127.0.0.1"}) + + site.write_file( + "etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname, + "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['%s']))\n" % + hostname) + + site.makedirs("var/check_mk/agent_output/") + site.write_file( + "var/check_mk/agent_output/%s" % hostname, + file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) + + #. # .--Checks--------------------------------------------------------------. # | ____ _ _ |

5 years, 4 months

Made test independent of installed agent

by Lars Michelsen

Module: check_mk Branch: master Commit: 1f2d1a63e974518d04859997602b02161f8a5619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f2d1a63e97451… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 16:46:10 2019 +0100 Made test independent of installed agent Change-Id: I00e0ad149afae02fe73895ee40ea93951b14bb84 --- .../cmk_base/test_services_prediction.py | 44 +++++++++++++++++----- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/tests/integration/cmk_base/test_services_prediction.py b/tests/integration/cmk_base/test_services_prediction.py index b668741..1d6b9e4 100644 --- a/tests/integration/cmk_base/test_services_prediction.py +++ b/tests/integration/cmk_base/test_services_prediction.py @@ -1,19 +1,49 @@ +# pylint: disable=redefined-outer-name + from datetime import datetime import os import time import pytest + import cmk.utils.prediction -from cmk_base import prediction from cmk.utils.exceptions import MKGeneralException -from testlib import web, repo_path +from cmk_base import prediction + +from testlib import web, repo_path # pylint: disable=unused-import + + +def create_linux_test_host(request, web, site, hostname): + def finalizer(): + web.delete_host(hostname) + web.activate_changes() + site.delete_file("var/check_mk/agent_output/%s" % hostname) + site.delete_file("etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname) + + request.addfinalizer(finalizer) + + web.add_host(hostname, attributes={"ipaddress": "127.0.0.1"}) + + site.write_file( + "etc/check_mk/conf.d/linux_test_host_%s.mk" % hostname, + "datasource_programs.append(('cat ~/var/check_mk/agent_output/<HOST>', [], ['%s']))\n" % + hostname) + + site.makedirs("var/check_mk/agent_output/") + site.write_file( + "var/check_mk/agent_output/%s" % hostname, + file("%s/tests/integration/cmk_base/test-files/linux-agent-output" % repo_path()).read()) @pytest.fixture(scope="module") -def cfg_setup(web, site): - web.add_host('test-prediction', attributes={"ipaddress": "127.0.0.1"}) +def cfg_setup(request, web, site): + create_linux_test_host(request, web, site, "test-prediction") + web.discover_services("test-prediction") + web.activate_changes() + # Enforce use of the pre-created RRD file from the git. The restart of the core + # is needed to make it renew it's internal RRD file cache site.makedirs("var/check_mk/rrd/test-prediction/") site.write_file( "var/check_mk/rrd/test-prediction/CPU_load.rrd", @@ -21,16 +51,12 @@ def cfg_setup(web, site): site.write_file( "var/check_mk/rrd/test-prediction/CPU_load.info", file("%s/tests/integration/cmk_base/test-files/CPU_load.info" % repo_path()).read()) - - web.discover_services("test-prediction") - web.activate_changes() + site.omd("restart", "cmc") yield # Cleanup site.delete_dir("var/check_mk/rrd/") - web.delete_host("test-prediction") - web.activate_changes() @pytest.mark.parametrize('date, period, result', [

5 years, 4 months

Make test check for the real site version

by Lars Michelsen

Module: check_mk Branch: master Commit: 2ee58d2d43b21d8b5c12fbb40981e754a7f10bce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee58d2d43b21d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 16:53:10 2019 +0100 Make test check for the real site version Change-Id: Iac7b4868f476d1fd0d34674e84e17cfd26328bfb --- tests/integration/omd/test_dcd_integration.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/integration/omd/test_dcd_integration.py b/tests/integration/omd/test_dcd_integration.py index 720c94b..1be716f 100644 --- a/tests/integration/omd/test_dcd_integration.py +++ b/tests/integration/omd/test_dcd_integration.py @@ -3,8 +3,6 @@ import subprocess -import cmk - def test_dcd_exists(site): assert site.file_exists("bin/dcd") @@ -19,7 +17,7 @@ def test_dcd_path(site): def test_dcd_version(site): p = site.execute(["dcd", "-V"], stderr=subprocess.PIPE) version = p.stderr.read() - assert version.startswith("dcd version %s" % cmk.__version__) + assert version.startswith("dcd version %s" % site.version.version) def test_dcd_daemon(site):

5 years, 4 months

Remove more PNP templates and some fixes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c267ec8c60db5df3c8a3140fe9a782b32c7fc73d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c267ec8c60db5d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Feb 26 10:00:34 2019 +0100 Remove more PNP templates and some fixes Fixes: * the cisco_qos graph now has an explicit range * added a graph_info for citrix_licenses CMK-1739 Change-Id: I6285e9057cdf3a140f64fb382812c8cb64000415 --- cmk/gui/plugins/metrics/check_mk.py | 12 +++ pnp-templates/check_mk-brocade_mlx_temp.php | 46 ----------- pnp-templates/check_mk-canon_pages.php | 1 - pnp-templates/check_mk-carel_sensors.php | 1 - pnp-templates/check_mk-cbl_airlaser.hardware.php | 1 - pnp-templates/check_mk-cisco_cpu.php | 1 - pnp-templates/check_mk-cisco_qos.php | 90 ---------------------- pnp-templates/check_mk-cisco_temp_sensor.php | 1 - pnp-templates/check_mk-cisco_wlc_clients.php | 39 ---------- pnp-templates/check_mk-citrix_licenses.php | 37 --------- pnp-templates/check_mk-climaveneta_temp.php | 1 - pnp-templates/check_mk-cmctc.temp.php | 1 - pnp-templates/check_mk-decru_cpu.php | 1 - pnp-templates/check_mk-decru_temps.php | 1 - pnp-templates/check_mk-dell_chassis_temp.php | 1 - pnp-templates/check_mk-dell_om_sensors.php | 1 - .../check_mk-netapp_api_cpu.utilization.php | 2 +- pnp-templates/check_mk-printer_pages.php | 32 -------- pnp-templates/check_mk-wut_webtherm.php | 1 - 19 files changed, 13 insertions(+), 257 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c267ec8c60…

5 years, 4 months

Made naming more consistent.

by Sven Panne

Module: check_mk Branch: master Commit: 61116b3787161a625daf3d1b5bf18a9b669ff12a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61116b3787161a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 26 15:32:42 2019 +0100 Made naming more consistent. Change-Id: I5a6aad00bca45d6a32e7ab75293f948c3d22e49c --- livestatus/src/Logfile.cc | 6 +++--- livestatus/src/Logfile.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 2a7df57..7d02c6d 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -65,10 +65,10 @@ time_t firstTimestampOf(const fs::path &path, Logger *logger) { } } // namespace -Logfile::Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, +Logfile::Logfile(MonitoringCore *mc, LogCache *log_cache, fs::path path, bool watch) : _mc(mc) - , _logcache(logcache) + , _log_cache(log_cache) , _path(std::move(path)) , _since(firstTimestampOf(_path, logger())) , _watch(watch) @@ -158,7 +158,7 @@ void Logfile::loadRange(FILE *file, unsigned missing_types, } } if (processLogLine(_lineno, &linebuffer[0], missing_types)) { - _logcache->logLineHasBeenAdded(this, logclasses); + _log_cache->logLineHasBeenAdded(this, logclasses); } } } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 17e6662..f980344 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -47,7 +47,7 @@ using logfile_entries_t = std::map<uint64_t, std::unique_ptr<LogEntry>>; class Logfile { public: - Logfile(MonitoringCore *mc, LogCache *logcache, fs::path path, bool watch); + Logfile(MonitoringCore *mc, LogCache *log_cache, fs::path path, bool watch); fs::path path() const { return _path; } // for tricky protocol between LogCache::logLineHasBeenAdded and this class @@ -65,7 +65,7 @@ public: private: MonitoringCore *const _mc; - LogCache *const _logcache; + LogCache *const _log_cache; const fs::path _path; const time_t _since; // time of first entry const bool _watch; // true only for current logfile

5 years, 4 months

agent_aws: Add some comments for ELB and S3 limits sections

by Simon Betz

Module: check_mk Branch: master Commit: 94cc82f4d57ed693ad91c5ce3b25c3310476a2e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94cc82f4d57ed6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 26 13:36:45 2019 +0100 agent_aws: Add some comments for ELB and S3 limits sections Change-Id: Iaf485699a3ac5cf8a3f447611fe56ec7eec8cc6b --- agents/special/agent_aws | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 678bb3a..2355f56 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -635,6 +635,10 @@ class S3Limits(AWSSectionLimits): return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): + """ + There's no API method for getting account limits thus we have to + fetch all buckets. + """ response = self._client.list_buckets() try: return response['Buckets'] @@ -901,6 +905,11 @@ class ELBLimits(AWSSectionLimits): return AWSColleagueContents(None, 0.0) def _fetch_raw_content(self, colleague_contents): + """ + The AWS/ELB API method 'describe_account_limits' provides limit values + but no values about the usage per limit thus we have to gather the usage + values from 'describe_load_balancers'. + """ response = self._client.describe_load_balancers() try: load_balancers = response['LoadBalancerDescriptions']

5 years, 4 months

Moved code for answering log queries to the right place.

by Sven Panne

Module: check_mk Branch: master Commit: 2f91a8e60cd3f23b9eacbeb548b6c00a564c5ff9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f91a8e60cd3f2… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 26 10:09:55 2019 +0100 Moved code for answering log queries to the right place. Not really perfect yet, but much better. Change-Id: Ice49c272574d40acfd8187041e4d482c23b36d18 --- livestatus/src/Logfile.cc | 19 +------------------ livestatus/src/Logfile.h | 7 ++----- livestatus/src/TableLog.cc | 18 +++++++++++++++++- livestatus/src/TableLog.h | 5 +++-- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 56b7884..2a7df57 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -34,8 +34,6 @@ #include "LogEntry.h" #include "Logger.h" #include "MonitoringCore.h" -#include "Query.h" -#include "Row.h" #ifdef CMC #include "cmc.h" @@ -211,22 +209,7 @@ const logfile_entries_t *Logfile::getEntriesFor(unsigned logclasses) { return &_entries; } -bool Logfile::answerQueryReverse(Query *query, time_t since, time_t until, - unsigned logclasses) { - auto entries = getEntriesFor(logclasses); - // TODO(sp) Move the stuff below out of this class. Tricky part: makeKey - auto it = entries->upper_bound(makeKey(until, 999999999)); - while (it != entries->begin()) { - --it; - // end found or limit exceeded? - if (it->second->_time < since || - !query->processDataset(Row(it->second.get()))) { - return false; - } - } - return true; -} - +// static uint64_t Logfile::makeKey(time_t t, size_t lineno) { return (static_cast<uint64_t>(t) << 32) | static_cast<uint64_t>(lineno); } diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 5f07068..17e6662 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -37,7 +37,6 @@ class LogCache; class LogEntry; class Logger; class MonitoringCore; -class Query; #ifdef CMC class World; @@ -58,12 +57,11 @@ public: size_t size() const { return _entries.size(); } long freeMessages(unsigned logclasses); - // for TableStateHistory + // for TableStateHistory and TableLog const logfile_entries_t *getEntriesFor(unsigned logclasses); // for TableLog::answerQuery - bool answerQueryReverse(Query *query, time_t since, time_t until, - unsigned logclasses); + static uint64_t makeKey(time_t t, size_t lineno); private: MonitoringCore *const _mc; @@ -82,7 +80,6 @@ private: void load(unsigned logclasses); void loadRange(FILE *file, unsigned missing_types, unsigned logclasses); bool processLogLine(size_t lineno, std::string line, unsigned logclasses); - uint64_t makeKey(time_t t, size_t lineno); void updateReferences(); Logger *logger() const; }; diff --git a/livestatus/src/TableLog.cc b/livestatus/src/TableLog.cc index ea2ecb1..e4d1e2d 100644 --- a/livestatus/src/TableLog.cc +++ b/livestatus/src/TableLog.cc @@ -167,7 +167,8 @@ void TableLog::answerQuery(Query *query) { } while (true) { - if (!it->second->answerQueryReverse(query, since, until, classmask)) { + auto entries = it->second->getEntriesFor(classmask); + if (!answerQueryReverse(entries, query, since, until)) { break; // end of time range found } if (it == _log_cache->begin()) { @@ -177,6 +178,21 @@ void TableLog::answerQuery(Query *query) { } } +// static +bool TableLog::answerQueryReverse(const logfile_entries_t *entries, + Query *query, time_t since, time_t until) { + auto it = entries->upper_bound(Logfile::makeKey(until, 999999999)); + while (it != entries->begin()) { + --it; + // end found or limit exceeded? + if (it->second->_time < since || + !query->processDataset(Row(it->second.get()))) { + return false; + } + } + return true; +} + bool TableLog::isAuthorized(Row row, const contact *ctc) const { auto entry = rowData<LogEntry>(row); service *svc = entry->_service; diff --git a/livestatus/src/TableLog.h b/livestatus/src/TableLog.h index 95bf8e7..f2cbb84 100644 --- a/livestatus/src/TableLog.h +++ b/livestatus/src/TableLog.h @@ -29,10 +29,10 @@ #include <ctime> #include <memory> #include <string> +#include "Logfile.h" #include "Table.h" #include "contact_fwd.h" class Column; -class Logfile; class LogCache; class MonitoringCore; class Query; @@ -50,7 +50,8 @@ public: private: LogCache *_log_cache; - bool answerQuery(Query *, Logfile *, time_t, time_t); + static bool answerQueryReverse(const logfile_entries_t *entries, + Query *query, time_t since, time_t until); }; #endif // TableLog_h

5 years, 4 months

agent_aws: Fixed piggyback hostname for classic load balancers

by Simon Betz

Module: check_mk Branch: master Commit: e93046c7b64e8797c4f97158abe92a0ccfd3c8c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e93046c7b64e87… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 26 10:16:09 2019 +0100 agent_aws: Fixed piggyback hostname for classic load balancers Change-Id: Ief4e61a18af94f49203dca44f3b41f0390b0e8ab --- agents/special/agent_aws | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 3bb6cdd..678bb3a 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -926,13 +926,13 @@ class ELBLimits(AWSSectionLimits): len(load_balancers))) for load_balancer in load_balancers: - load_balancer_name = load_balancer['LoadBalancerName'] + dns_name = load_balancer['DNSName'] self._add_limit( - load_balancer_name, + dns_name, AWSLimit("load_balancer_listeners", "Listeners", limits['classic-listeners'], len(load_balancer['ListenerDescriptions']))) self._add_limit( - load_balancer_name, + dns_name, AWSLimit("load_balancer_registered_instances", "Registered instances", limits['classic-registered-instances'], len(load_balancer['Instances']))) return AWSComputedContent(load_balancers, raw_content.cache_timestamp)

5 years, 4 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019