From 867f743174d0ded59613ddbaf7e45f70e75f0399 Mon Sep 17 00:00:00 2001 From: flavien peyre Date: Wed, 12 Aug 2015 16:18:50 -0400 Subject: [PATCH] Install newer mod-influxdb + use __host__ as service desc Change-Id: I501e307ec7b0c5c80d38e9e3c7d139806255262d --- surveil/api/handlers/status/metrics/metric_name_handler.py | 2 +- surveil/tests/api/controllers/v2/status/test_hosts_metric.py | 2 +- tools/docker/alignak_container/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/surveil/api/handlers/status/metrics/metric_name_handler.py b/surveil/api/handlers/status/metrics/metric_name_handler.py index 1d09610..4c6036c 100644 --- a/surveil/api/handlers/status/metrics/metric_name_handler.py +++ b/surveil/api/handlers/status/metrics/metric_name_handler.py @@ -21,7 +21,7 @@ class MetricNameHandler(handler.Handler): def get(self, host_name, service_description=None): """Return all metrics name.""" - service_description = service_description or '' + service_description = service_description or '__host__' query = ("SHOW measurements WHERE host_name='%s' " "AND service_description='%s'" % (host_name, service_description)) diff --git a/surveil/tests/api/controllers/v2/status/test_hosts_metric.py b/surveil/tests/api/controllers/v2/status/test_hosts_metric.py index f136712..a8dc034 100644 --- a/surveil/tests/api/controllers/v2/status/test_hosts_metric.py +++ b/surveil/tests/api/controllers/v2/status/test_hosts_metric.py @@ -182,5 +182,5 @@ class TestHostMetric(functionalTest.FunctionalTest): self.assertEqual( m.last_request.qs['q'], ["show measurements where host_name='ws-arbiter' " - "and service_description=''"] + "and service_description='__host__'"] ) diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile index 6a113ba..82e1249 100644 --- a/tools/docker/alignak_container/Dockerfile +++ b/tools/docker/alignak_container/Dockerfile @@ -42,7 +42,7 @@ RUN cd /tmp && \ # mod-influxdb RUN pip install influxdb==2.8.0 RUN cd /tmp && \ - wget -O mod-influxdb.tar.gz https://github.com/savoirfairelinux/mod-influxdb/archive//92b1ccbd670991c495c71c0914a1fb0b18676bb6.tar.gz && \ + wget -O mod-influxdb.tar.gz https://github.com/savoirfairelinux/mod-influxdb/archive/9433b726492a09d5faeb70abfc5efdbf1728686f.tar.gz && \ tar -zxvf mod-influxdb.tar.gz && \ mv /tmp/mod-influxdb-*/module /var/lib/alignak/modules/mod-influxdb && \ rm -rfv /tmp/mod-influxdb*