From 61436755cbaf567a32a44c31ab1a1007852e8030 Mon Sep 17 00:00:00 2001 From: Bremer Jonathan Date: Fri, 28 Dec 2018 10:59:34 -0500 Subject: [PATCH] fixed test errors --- README.md | 2 +- tests/integration/Dockerfile.collectd | 1 + tests/integration/test.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5be1841..b2fe7cb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A [CollectD](http://collectd.org) plugin to collect [Elasticsearch](https://gith ## Installation - 1. Place the `elasticsearch_collectd.py` file into a directory on the host. The recommended directory is `/usr/share/collectd/collectd-elasticsearch`. + 1. Place the `elasticsearch_collectd.py` and `elasticsearch_collectd_utils.py` files into a directory on the host. The recommended directory is `/usr/share/collectd/collectd-elasticsearch`. 1. Configure the plugin (see below). 1. Restart collectd. diff --git a/tests/integration/Dockerfile.collectd b/tests/integration/Dockerfile.collectd index e520a2e..235a011 100644 --- a/tests/integration/Dockerfile.collectd +++ b/tests/integration/Dockerfile.collectd @@ -12,4 +12,5 @@ ADD tests/integration/wait_for_es /.docker/wait_for_es ## The context of the image build should be the root dir of this repo!! ADD elasticsearch_collectd.py /usr/share/collectd/collectd-elasticsearch/ +ADD elasticsearch_collectd_utils.py /usr/share/collectd/collectd-elasticsearch/ ADD tests/integration/20-elasticsearch-test.conf /etc/collectd/managed_config/ diff --git a/tests/integration/test.py b/tests/integration/test.py index a2aa13a..df445d4 100644 --- a/tests/integration/test.py +++ b/tests/integration/test.py @@ -42,7 +42,6 @@ def wait_for_metrics_from_each_cluster(): print 'Waiting for metric: %s from cluster %s...' % (metric, c) eventually_true(lambda: any([metric in str(m.get('type_instance')) for m in get_metric_data()]), TIMEOUT_SECS - (time() - start)) - print 'metric: %s Found! from cluster: %s' % (metric, c)