openstack
/
monasca-agent
Code Issues Proposed changes

Merge "Add owner type dimension so we can key off of it in alarming"

This commit is contained in:
Zuul 2018-01-11 22:31:08 +00:00 committed by Gerrit Code Review
parent 5a68eb6c59 9d96b76fca
commit 8b63107d26
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monasca_agent/collector/checks/utils.py
View File

@ -1,4 +1,4 @@
# (C) Copyright 2015,2017 Hewlett Packard Enterprise Development LP
# (C) Copyright 2015,2017-2018 Hewlett Packard Enterprise Development LP
# (C) Copyright 2017 KylinCloud
import base64
@ -757,6 +757,7 @@ def get_pod_dimensions(kubernetes_connector, pod_metadata, kubernetes_labels):
pod_owner_dimension_set = get_pod_owner(kubernetes_connector, pod_metadata)
if pod_owner_dimension_set:
pod_dimensions[pod_owner_dimension_set[0]] = pod_owner_dimension_set[1]
pod_dimensions["owner_type"] = pod_owner_dimension_set[0]
return pod_dimensions

4
monasca_agent/collector/checks_d/prometheus.py
View File

@ -1,4 +1,4 @@
# (C) Copyright 2017 Hewlett Packard Enterprise Development LP
# (C) Copyright 2017-2018 Hewlett Packard Enterprise Development LP
import math
import requests
import six
@ -316,12 +316,14 @@ class Prometheus(checks.AgentCheck):
if pod_name in self.k8s_pod_cache:
pod_owner, pod_owner_name = self.k8s_pod_cache[pod_name]
metric_dimensions[pod_owner] = pod_owner_name
metric_dimensions["owner_type"] = pod_owner
else:
pod_owner_pair = self.get_pod_owner(pod_name, metric_dimensions['namespace'])
if pod_owner_pair:
pod_owner = pod_owner_pair[0]
pod_owner_name = pod_owner_pair[1]
metric_dimensions[pod_owner] = pod_owner_name
metric_dimensions["owner_type"] = pod_owner
self.k8s_pod_cache[pod_name] = pod_owner, pod_owner_name
metric_func(metric_name, metric_value, dimensions=metric_dimensions, hostname="SUPPRESS")