[openstack] added project hypervisor and server tagging to project_running metric #1211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
masci
suggested changes
Mar 8, 2018
| @@ -663,16 +663,36 @@ def get_all_server_ids(self, filter_by_host=None): | |||
|
|
|||
| return server_ids | |||
|
|
|||
| def get_project_name_from_id(self, tenant_id): | |||
| url = "{0}/{1}/{2}/{3}".format(self.keystone_server_url, DEFAULT_KEYSTONE_API_VERSION, "projects", tenant_id) | |||
There was a problem hiding this comment.
nit - With Python 2.7 in this case there's no need to specify the numbers for the placeholders
| url = "{0}/{1}/{2}/{3}".format(self.keystone_server_url, DEFAULT_KEYSTONE_API_VERSION, "projects", tenant_id) | ||
| self.log.debug("Project URL is %s", url) | ||
| headers = {'X-Auth-Token': self.get_auth_token()} | ||
| self.log.debug("Headers %s", headers) |
There was a problem hiding this comment.
this would leak the auth token in the logs and should be removed
| @@ -691,7 +711,8 @@ def _is_valid_metric(label): | |||
| for st in server_stats: | |||
| if _is_valid_metric(st): | |||
| self.gauge("openstack.nova.server.{0}".format(st.replace("-", "_")), server_stats[st], tags=tags, hostname=server_id) | |||
|
|
|||
| if hypervisor_hostname and project_name and server_name: | |||
| self.gauge('openstack.nova.project.running', 1, tags=['hypervisor_hostname:{0}'.format(hypervisor_hostname), 'project_name:{0}'.format(project_name), 'server_name:{0}'.format(server_name)]) | |||
There was a problem hiding this comment.
this line is indented with 3 spaces, it should be 4
| @@ -714,10 +735,12 @@ def _is_valid_metric(label): | |||
| if _is_valid_metric(st): | |||
| metric_key = PROJECT_METRICS[st] | |||
| self.gauge("openstack.nova.limits.{0}".format(metric_key), server_stats['limits']['absolute'][st], tags=tags) | |||
|
|
|||
There was a problem hiding this comment.
can you remove this whitespace?
| @@ -986,3 +1009,4 @@ def get_external_host_tags(self): | |||
|
|
|||
| self.log.debug("Sending external_host_tags: %s", external_host_tags) | |||
| return external_host_tags | |||
|
|
|||
There was a problem hiding this comment.
this empty line should be removed
| def get_stats_for_all_projects(self, projects): | ||
| for project in projects: | ||
| self.get_stats_for_single_project(project) | ||
|
|
||
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Added a new metric for openstack.nova.project.running. This metric is tagged with the hypervisor_hostname, the project name and server name.
Added a fix for host aggregates - web request to nova returns short names, trimmed the output from get_my_hostname so that the compute nodes would match.
Motivation
Extra functionality for a customer
Testing Guidelines
An overview on testing
is available in our contribution guidelines.
Versioning
manifest.jsondatadog_checks/{integration}/__init__.pyCHANGELOG.md. Please useUnreleasedas the date in the titlefor the new section.
Additional Notes
Anything else we should know when reviewing?