x/surveil
Code Issues Proposed changes

Install newer mod-influxdb + use __host__ as service desc

Browse Source 
Change-Id: I501e307ec7b0c5c80d38e9e3c7d139806255262d
This commit is contained in:
flavien peyre 2015-08-12 16:18:50 -04:00
parent 9e3131e1f6
commit 867f743174
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
surveil/api/handlers/status/metrics/metric_name_handler.py
View File

@ -21,7 +21,7 @@ class MetricNameHandler(handler.Handler):
def get(self, host_name, service_description=None): def get(self, host_name, service_description=None):
"""Return all metrics name.""" """Return all metrics name."""
service_description = service_description or '' service_description = service_description or '__host__'
query = ("SHOW measurements WHERE host_name='%s' " query = ("SHOW measurements WHERE host_name='%s' "
"AND service_description='%s'" "AND service_description='%s'"
% (host_name, service_description)) % (host_name, service_description))

2
surveil/tests/api/controllers/v2/status/test_hosts_metric.py
View File

@ -182,5 +182,5 @@ class TestHostMetric(functionalTest.FunctionalTest):
self.assertEqual( self.assertEqual(
m.last_request.qs['q'], m.last_request.qs['q'],
["show measurements where host_name='ws-arbiter' " ["show measurements where host_name='ws-arbiter' "
"and service_description=''"] "and service_description='__host__'"]
) )

2
tools/docker/alignak_container/Dockerfile
View File

@ -42,7 +42,7 @@ RUN cd /tmp && \
# mod-influxdb # mod-influxdb
RUN pip install influxdb==2.8.0 RUN pip install influxdb==2.8.0
RUN cd /tmp && \ 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 && \ tar -zxvf mod-influxdb.tar.gz && \
mv /tmp/mod-influxdb-*/module /var/lib/alignak/modules/mod-influxdb && \ mv /tmp/mod-influxdb-*/module /var/lib/alignak/modules/mod-influxdb && \
rm -rfv /tmp/mod-influxdb* rm -rfv /tmp/mod-influxdb*