Add owner type dimension so we can key off of it in alarming
Change-Id: I8a79346b5212bb9fc131d205bcb119e8d6525bb3
This commit is contained in:
parent
09a8c95900
commit
9d96b76fca
|
@ -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
|
# (C) Copyright 2017 KylinCloud
|
||||||
|
|
||||||
import base64
|
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)
|
pod_owner_dimension_set = get_pod_owner(kubernetes_connector, pod_metadata)
|
||||||
if pod_owner_dimension_set:
|
if pod_owner_dimension_set:
|
||||||
pod_dimensions[pod_owner_dimension_set[0]] = pod_owner_dimension_set[1]
|
pod_dimensions[pod_owner_dimension_set[0]] = pod_owner_dimension_set[1]
|
||||||
|
pod_dimensions["owner_type"] = pod_owner_dimension_set[0]
|
||||||
return pod_dimensions
|
return pod_dimensions
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# (C) Copyright 2017 Hewlett Packard Enterprise Development LP
|
# (C) Copyright 2017-2018 Hewlett Packard Enterprise Development LP
|
||||||
import math
|
import math
|
||||||
import requests
|
import requests
|
||||||
import six
|
import six
|
||||||
|
@ -316,12 +316,14 @@ class Prometheus(checks.AgentCheck):
|
||||||
if pod_name in self.k8s_pod_cache:
|
if pod_name in self.k8s_pod_cache:
|
||||||
pod_owner, pod_owner_name = self.k8s_pod_cache[pod_name]
|
pod_owner, pod_owner_name = self.k8s_pod_cache[pod_name]
|
||||||
metric_dimensions[pod_owner] = pod_owner_name
|
metric_dimensions[pod_owner] = pod_owner_name
|
||||||
|
metric_dimensions["owner_type"] = pod_owner
|
||||||
else:
|
else:
|
||||||
pod_owner_pair = self.get_pod_owner(pod_name, metric_dimensions['namespace'])
|
pod_owner_pair = self.get_pod_owner(pod_name, metric_dimensions['namespace'])
|
||||||
if pod_owner_pair:
|
if pod_owner_pair:
|
||||||
pod_owner = pod_owner_pair[0]
|
pod_owner = pod_owner_pair[0]
|
||||||
pod_owner_name = pod_owner_pair[1]
|
pod_owner_name = pod_owner_pair[1]
|
||||||
metric_dimensions[pod_owner] = pod_owner_name
|
metric_dimensions[pod_owner] = pod_owner_name
|
||||||
|
metric_dimensions["owner_type"] = pod_owner
|
||||||
self.k8s_pod_cache[pod_name] = pod_owner, pod_owner_name
|
self.k8s_pod_cache[pod_name] = pod_owner, pod_owner_name
|
||||||
metric_func(metric_name, metric_value, dimensions=metric_dimensions, hostname="SUPPRESS")
|
metric_func(metric_name, metric_value, dimensions=metric_dimensions, hostname="SUPPRESS")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue