capture node pool and node instance type (#45)

Author: ianmuge

bootstrap_fields.yaml

@@ -31,6 +31,9 @@
 - label: "Node Creation Timestamp"
   type: DateTime
   componentType: [ "Node" ]
+- label: "Node Instance Type"
+  type: Text
+  componentType: [ "Node" ]
 - label: "Node Kernel Version"
   type: Text
   componentType: [ "Node" ]
@@ -46,6 +49,9 @@
 - label: "Node OS"
   type: Text
   componentType: [ "Node" ]
+- label: "Node Pool"
+  type: Text
+  componentType: [ "Node" ]
 - label: "Node Provider"
   type: Text
   componentType: [ "Node" ]

controllers/ardoqcontroller.go

@@ -77,6 +77,7 @@ func GenericUpsert(resourceType string, genericResource interface{}) string {
 		component.Fields = map[string]interface{}{
 			"node_architecture":        node.Architecture,
 			"node_container_runtime":   node.ContainerRuntime,
+			"node_instance_type":       node.InstanceType,
 			"node_kernel_version":      node.KernelVersion,
 			"node_kubelet_version":     node.KubeletVersion,
 			"node_kube_proxy_version":  node.KubeProxyVersion,
@@ -90,6 +91,7 @@ func GenericUpsert(resourceType string, genericResource interface{}) string {
 			"node_allocatable_memory":  node.Allocatable.Memory,
 			"node_allocatable_storage": node.Allocatable.Storage,
 			"node_allocatable_pods":    node.Allocatable.Pods,
+			"node_pool":                node.Pool,
 			"node_provider":            node.Provider,
 			"node_creation_timestamp":  node.CreationTimestamp,
 			"node_zone":                node.Zone,

controllers/bridgecontroller.go

@@ -118,12 +118,14 @@ func (b *BridgeController) OnNodeEvent(event watch.Event, res *v12.Node) {
 			Pods:    res.Status.Allocatable.Pods().Value(),
 		},
 		ContainerRuntime:  res.Status.NodeInfo.ContainerRuntimeVersion,
+		InstanceType:      res.Labels["node.kubernetes.io/instance-type"],
 		KernelVersion:     res.Status.NodeInfo.KernelVersion,
 		KubeletVersion:    res.Status.NodeInfo.KubeletVersion,
 		KubeProxyVersion:  res.Status.NodeInfo.KubeProxyVersion,
 		OperatingSystem:   res.Status.NodeInfo.OperatingSystem,
 		OSImage:           res.Status.NodeInfo.OSImage,
 		Provider:          res.Spec.ProviderID,
+		Pool:              GetNodePool(res.Labels),
 		CreationTimestamp: res.CreationTimestamp.Format(time.RFC3339),
 		Region:            res.Labels["failure-domain.beta.kubernetes.io/region"],
 		Zone:              res.Labels["failure-domain.beta.kubernetes.io/zone"],

controllers/helper.go

@@ -126,3 +126,11 @@ func PersistToCache(name string, value interface{}) {
 	Cache.Set(name, value, goCache.NoExpiration)
 	metrics.CachePersists.Inc()
 }
+func GetNodePool(nodeLabels map[string]string) string {
+	if nodeLabels["kubernetes.azure.com/agentpool"] != "" {
+		return nodeLabels["kubernetes.azure.com/agentpool"]
+	} else if nodeLabels["eks.amazonaws.com/nodegroup"] != "" {
+		return nodeLabels["eks.amazonaws.com/nodegroup"]
+	}
+	return ""
+}

controllers/types.go

@@ -25,11 +25,13 @@ type Node struct {
 	Capacity          NodeResources
 	Allocatable       NodeResources
 	ContainerRuntime  string
+	InstanceType      string
 	KernelVersion     string
 	KubeletVersion    string
 	KubeProxyVersion  string
 	OperatingSystem   string
 	OSImage           string
+	Pool              string
 	Provider          string
 	CreationTimestamp string
 	Region            string

tests/integrations/k8s/bootstrap_fields.yaml

@@ -31,6 +31,9 @@
 - label: "Node Creation Timestamp"
   type: DateTime
   componentType: [ "Node" ]
+- label: "Node Instance Type"
+  type: Text
+  componentType: [ "Node" ]
 - label: "Node Kernel Version"
   type: Text
   componentType: [ "Node" ]
@@ -46,6 +49,9 @@
 - label: "Node OS"
   type: Text
   componentType: [ "Node" ]
+- label: "Node Pool"
+  type: Text
+  componentType: [ "Node" ]
 - label: "Node Provider"
   type: Text
   componentType: [ "Node" ]