add a few more pod tags (#159)

hawkular · Mar 24, 2017 · e24eb50 · e24eb50
1 parent c017f1d
commit e24eb50
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/README.adoc b/README.adoc
@@ -887,6 +887,15 @@ Tag values can be defined with token expressions in the form of `${var}` or `$va
 |POD:label[_key_]
 |A single Pod label value for the label key _key_
 
+|POD:cluster_name
+|The name of the cluster that the pod is a member of.
+
+|POD:resource_version
+|The resource version of the Pod resource.
+
+|POD:self_link
+|The link to the Pod resource itself.
+
 |METRIC:name
 |The name of the metric on which this tag is found.
 

diff --git a/deploy/openshift/hawkular-openshift-agent-configmap.yaml b/deploy/openshift/hawkular-openshift-agent-configmap.yaml
@@ -38,6 +38,8 @@ data:
         hostname: ${POD:hostname}
         host_ip: ${POD:host_ip}
         labels: ${POD:labels}
+        cluster_name: ${POD:cluster_name}
+        resource_version: ${POD:resource_version}
         type: pod
         collector: hawkular_openshift_agent
         custom_metric: true

diff --git a/k8s/discovery.go b/k8s/discovery.go
@@ -256,6 +256,9 @@ func (d *Discovery) watchPods() {
 				Labels:           podFromEvent.GetLabels(),
 				Annotations:      podFromEvent.GetAnnotations(),
 				ConfigMapVolumes: cmVols,
+				ClusterName:      podFromEvent.GetClusterName(),
+				ResourceVersion:  podFromEvent.GetResourceVersion(),
+				SelfLink:         podFromEvent.GetSelfLink(),
 			}
 
 			switch event.Type {

diff --git a/k8s/node_event_consumer.go b/k8s/node_event_consumer.go
@@ -208,17 +208,20 @@ func (nec *NodeEventConsumer) startCollecting(ne *NodeEvent) {
 		// Define additional envvars with pod specific data for use in replacing ${env} tokens.
 		// These tokens are used in tags and in the Tenant field.
 		additionalEnv := map[string]string{
-			"POD:node_name":      ne.Pod.Node.Name,
-			"POD:node_uid":       ne.Pod.Node.UID,
-			"POD:namespace_name": ne.Pod.Namespace.Name,
-			"POD:namespace_uid":  ne.Pod.Namespace.UID,
-			"POD:name":           ne.Pod.Name,
-			"POD:ip":             ne.Pod.PodIP,
-			"POD:host_ip":        ne.Pod.HostIP,
-			"POD:uid":            ne.Pod.UID,
-			"POD:hostname":       ne.Pod.Hostname,
-			"POD:subdomain":      ne.Pod.Subdomain,
-			"POD:labels":         joinMap(ne.Pod.Labels),
+			"POD:node_name":        ne.Pod.Node.Name,
+			"POD:node_uid":         ne.Pod.Node.UID,
+			"POD:namespace_name":   ne.Pod.Namespace.Name,
+			"POD:namespace_uid":    ne.Pod.Namespace.UID,
+			"POD:name":             ne.Pod.Name,
+			"POD:ip":               ne.Pod.PodIP,
+			"POD:host_ip":          ne.Pod.HostIP,
+			"POD:uid":              ne.Pod.UID,
+			"POD:hostname":         ne.Pod.Hostname,
+			"POD:subdomain":        ne.Pod.Subdomain,
+			"POD:labels":           joinMap(ne.Pod.Labels),
+			"POD:cluster_name":     ne.Pod.ClusterName,
+			"POD:resource_version": ne.Pod.ResourceVersion,
+			"POD:self_link":        ne.Pod.SelfLink,
 		}
 
 		// support ${POD:label[<label-name>]}

diff --git a/k8s/pod.go b/k8s/pod.go
@@ -33,6 +33,9 @@ type Pod struct {
 	Labels           map[string]string
 	Annotations      map[string]string
 	ConfigMapVolumes map[string]string
+	ClusterName      string
+	ResourceVersion  string
+	SelfLink         string
 }
 
 // Identifier returns a string smaller than String() but can still uniquely identify the pod