x
/
stacklight-integration-tests
Code Issues Proposed changes

Set alerting_mode only for 0.x plugins 

This parameter has been removed starting with 1.0.

Change-Id: I26daa01ee9cc10dbd139f5f3a7f8f5aa55e6a76b
This commit is contained in:
Simon Pasquier 2016-12-20 14:53:47 +01:00
parent 3c5057227f
commit da8614e608
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stacklight_tests/lma_collector/plugin_settings.py
View File

@ -26,14 +26,18 @@ default_options = {
"environment_label/value": "deploy_lma_toolchain",
"elasticsearch_mode/value": "remote",
"influxdb_mode/value": "remote",
"alerting_mode/value": "local",
"elasticsearch_address/value": "127.0.0.1",
"influxdb_address/value": "127.0.0.1"
}
if version.startswith("0."):
# Only 0.x versions expose the alerting_mode parameter
default_options["alerting_mode/value"] = "local"
toolchain_options = {
"environment_label/value": "deploy_lma_toolchain",
"elasticsearch_mode/value": "local",
"influxdb_mode/value": "local",
"alerting_mode/value": "local"
}
if version.startswith("0."):
# Only 0.x versions expose the alerting_mode parameter
toolchain_options["alerting_mode/value"] = "local"

10
stacklight_tests/toolchain/test_dedicated_environment.py
View File

@ -132,7 +132,7 @@ class TestToolchainDedicatedEnvironment(api.ToolchainApi):
)
logger.info("New cluster id: {}".format(self.helpers.cluster_id))
self.LMA_COLLECTOR.activate_plugin(options={
options = {
"environment_label/value": "deploy_env_using_standalone_backends",
"elasticsearch_mode/value": "remote",
"elasticsearch_address/value": elasticsearch_ip,
@ -141,8 +141,12 @@ class TestToolchainDedicatedEnvironment(api.ToolchainApi):
"influxdb_database/value": "lma",
"influxdb_user/value": influxdb_settings.influxdb_user,
"influxdb_password/value": influxdb_settings.influxdb_pass,
"alerting_mode/value": "local"
})
}
if self.LMA_COLLECTOR.settings.version.startswith("0."):
# Only 0.x versions expose the alerting_mode parameter
options["alerting_mode/value"] = "local"
self.LMA_COLLECTOR.activate_plugin(options=options)
self.disable_plugin(self.ELASTICSEARCH_KIBANA)
self.disable_plugin(self.INFLUXDB_GRAFANA)
self.disable_plugin(self.LMA_INFRASTRUCTURE_ALERTING)