From e887dcac1f19d1229be328c378db6410465c27da Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Thu, 16 Aug 2018 15:15:11 -0400 Subject: [PATCH 1/3] Remove duplicate project statement --- openstack/datadog_checks/openstack/openstack.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/openstack/datadog_checks/openstack/openstack.py b/openstack/datadog_checks/openstack/openstack.py index 3e974d4c126a7..74717eb79e0dd 100644 --- a/openstack/datadog_checks/openstack/openstack.py +++ b/openstack/datadog_checks/openstack/openstack.py @@ -1269,10 +1269,6 @@ def check(self, instance): if set_external_tags is not None: set_external_tags(self.get_external_host_tags()) - if projects: - # Ensure projects list and scoped project exists - self.get_stats_for_all_projects(projects) - except IncompleteConfig as e: if isinstance(e, IncompleteAuthScope): self.warning( From c546607a3703cd009d1ba0c9bcec1f8114eeab83 Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Thu, 16 Aug 2018 18:56:14 -0400 Subject: [PATCH 2/3] Modify language of os_host option --- openstack/datadog_checks/openstack/data/conf.yaml.example | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openstack/datadog_checks/openstack/data/conf.yaml.example b/openstack/datadog_checks/openstack/data/conf.yaml.example index deb8f939d5f28..c3217224bce61 100644 --- a/openstack/datadog_checks/openstack/data/conf.yaml.example +++ b/openstack/datadog_checks/openstack/data/conf.yaml.example @@ -4,7 +4,9 @@ init_config: # Where your identity server lives. Note that the server must support Identity API v3 keystone_server_url: "https://my-keystone-server.com:/" - # The hostname of this machine registered with Nova. Defaults to socket.gethostname() + # The hostname of this machine registered with Nova. + # This is the host used to make queries against Nova with + # Defaults to the Hostname detected by the Agent - https://docs.datadoghq.com/agent/faq/how-datadog-agent-determines-the-hostname/ # os_host: my_hostname # Nova API version to use - this check supports v2 and v2.1 (default) From 52955deb2d0e4b6fbd9911f363853eba31b0cb97 Mon Sep 17 00:00:00 2001 From: Nicholas Muesch Date: Thu, 16 Aug 2018 18:58:04 -0400 Subject: [PATCH 3/3] Modify language of os_host option --- openstack/datadog_checks/openstack/data/conf.yaml.example | 1 - 1 file changed, 1 deletion(-) diff --git a/openstack/datadog_checks/openstack/data/conf.yaml.example b/openstack/datadog_checks/openstack/data/conf.yaml.example index c3217224bce61..a20d61cb50a02 100644 --- a/openstack/datadog_checks/openstack/data/conf.yaml.example +++ b/openstack/datadog_checks/openstack/data/conf.yaml.example @@ -5,7 +5,6 @@ init_config: keystone_server_url: "https://my-keystone-server.com:/" # The hostname of this machine registered with Nova. - # This is the host used to make queries against Nova with # Defaults to the Hostname detected by the Agent - https://docs.datadoghq.com/agent/faq/how-datadog-agent-determines-the-hostname/ # os_host: my_hostname