x/stacklight-integration-tests
Code Issues Proposed changes

Modify the InfluxDB query to support 1.1

Browse Source 
"show servers" has been removed since 0.13.
The patch uses "show stats" which works for all versions.

Change-Id: Ifb426a189ea4820d7397b47f228a66947b077e29
This commit is contained in:
Swann Croiset 2017-01-12 18:35:18 +01:00
parent 7116ddd0de
commit 27639b433a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stacklight_tests/influxdb_grafana/api.py
View File

@ -107,10 +107,10 @@ class InfluxdbPluginApi(base_test.PluginApi):
self.do_influxdb_query("show measurements") self.do_influxdb_query("show measurements")
logger.info("Check that the InfluxDB user doesn't have admin rights") logger.info("Check that the InfluxDB user doesn't have admin rights")
self.do_influxdb_query("show servers", expected_code=401) self.do_influxdb_query("show stats", expected_code=401)
logger.info("Check that the InfluxDB root user has admin rights") logger.info("Check that the InfluxDB root user has admin rights")
self.do_influxdb_query("show servers", self.do_influxdb_query("show stats",
user=plugin_settings.influxdb_rootuser, user=plugin_settings.influxdb_rootuser,
password=plugin_settings.influxdb_rootpass) password=plugin_settings.influxdb_rootpass)
@ -131,6 +131,7 @@ class InfluxdbPluginApi(base_test.PluginApi):
auth=(plugin_settings.grafana_user, 'rogue'), expected_code=401) auth=(plugin_settings.grafana_user, 'rogue'), expected_code=401)
def check_influxdb_nodes_count(self, count=1): def check_influxdb_nodes_count(self, count=1):
# TODO(all): this is broken with InfluxDB 1.1
logger.debug('Check the number of InfluxDB servers') logger.debug('Check the number of InfluxDB servers')
response = self.do_influxdb_query( response = self.do_influxdb_query(
"show servers", "show servers",