From ea9a173008f27d929005d0c598c93acfc146eaf2 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Mon, 12 Oct 2015 21:26:09 +0100 Subject: [PATCH] Kubernetes SD: Use node name as instance label --- retrieval/discovery/kubernetes/discovery.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/retrieval/discovery/kubernetes/discovery.go b/retrieval/discovery/kubernetes/discovery.go index 5438f6f21..c981c8ee8 100644 --- a/retrieval/discovery/kubernetes/discovery.go +++ b/retrieval/discovery/kubernetes/discovery.go @@ -37,8 +37,6 @@ const ( // kubernetesMetaLabelPrefix is the meta prefix used for all meta labels. // in this discovery. metaLabelPrefix = model.MetaLabelPrefix + "kubernetes_" - // nodeLabel is the name for the label containing a target's node name. - nodeLabel = metaLabelPrefix + "node" // serviceNamespaceLabel is the name for the label containing a target's service namespace. serviceNamespaceLabel = metaLabelPrefix + "service_namespace" // serviceNameLabel is the name for the label containing a target's service name. @@ -323,8 +321,8 @@ func (kd *Discovery) updateNodesTargetGroup() *config.TargetGroup { address := fmt.Sprintf("%s:%d", node.Status.Addresses[0].Address, kd.Conf.KubeletPort) t := model.LabelSet{ - model.AddressLabel: model.LabelValue(address), - nodeLabel: model.LabelValue(nodeName), + model.AddressLabel: model.LabelValue(address), + model.InstanceLabel: model.LabelValue(nodeName), } for k, v := range node.ObjectMeta.Labels { labelName := strutil.SanitizeLabelName(nodeLabelPrefix + k)