Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kubernetes] add option for node labels --> host tags #3445

Merged
merged 1 commit into from
Jul 21, 2017
Merged

[kubernetes] add option for node labels --> host tags #3445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion utils/kubernetes/kubeutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ def __init__(self, instance=None):
self.pods_list_url = urljoin(self.kubelet_api_url, KubeUtil.PODS_LIST_PATH)
self.kube_health_url = urljoin(self.kubelet_api_url, KubeUtil.KUBELET_HEALTH_PATH)
self.kube_label_prefix = instance.get('label_to_tag_prefix', KubeUtil.DEFAULT_LABEL_PREFIX)
self.kube_node_labels = instance.get('node_labels_to_host_tags', {})

# cadvisor
self.cadvisor_port = instance.get('port', KubeUtil.DEFAULT_CADVISOR_PORT)
Expand Down Expand Up @@ -376,7 +377,7 @@ def get_node_hosttags(self):
# if the parsing were to fail
log.debug("Error getting Kube master version: %s" % str(e))

# Kubelet version
# Kubelet version & labels
try:
_, node_name = self.get_node_info()
if not node_name:
Expand All @@ -385,6 +386,12 @@ def get_node_hosttags(self):
node_info = self.retrieve_json_auth(request_url)
version = node_info.get("status").get("nodeInfo").get("kubeletVersion")
tags.append("kubelet_version:%s" % version[1:])

node_labels = node_info.get('metadata', {}).get('labels', {})
for l_name, t_name in self.kube_node_labels.iteritems():
if l_name in node_labels:
tags.append('%s:%s' % (t_name, node_labels[l_name]))

except Exception as e:
log.debug("Error getting Kubelet version: %s" % str(e))

Expand Down