feat: annotate node and instance states with architecture

README.md

@@ -113,14 +113,14 @@ For self signed certificates, you can either use `--skip-tls-verification` or pr
 
 Metric name | Description
 ---- | ----------
-anka_instance_state_count | Count of Instances in a particular State (label: state)
+anka_instance_state_count | Count of Instances in a particular State (label: arch, state)
 anka_instance_state_per_template_count | Count of Instances in a particular state, per Template (label: state, template_uuid, template_name)
 anka_instance_state_per_group_count | Count of Instances in a particular state, per Group (label: state, group_name)
 -- | --
 anka_node_instance_count | Count of Instances running on the Node
 anka_node_instance_capacity | Total Instance slots (capacity) on the Node
 anka_node_states | Node state (1 = current state) (label: id, name, state)
-anka_node_states_count | Count of Nodes in a particular state (label: state)
+anka_node_states_count | Count of Nodes in a particular state (label: arch, state)
 anka_node_disk_free_space | Amount of free disk space on the Node in Bytes
 anka_node_disk_total_space | Amount of total available disk space on the Node in Bytes
 anka_node_disk_anka_used_space | Amount of disk space used by Anka on the Node in Bytes

src/metrics/instance_state.go

@@ -20,12 +20,14 @@ func (ism InstanceStateMetric) GetEventHandler() func(interface{}) error {
 		if err != nil {
 			return err
 		}
-		var stateIntMap = intMapFromStringSlice(types.InstanceStates)
+		var archStateMap = intMapFromTwoStringSlices(types.Architectures, types.InstanceStates)
 		for _, instance := range instances {
-			stateIntMap[instance.Vm.State] = stateIntMap[instance.Vm.State] + 1
+			archStateMap[instance.Vm.Arch][instance.Vm.State] = archStateMap[instance.Vm.Arch][instance.Vm.State] + 1
 		}
-		for _, state := range types.InstanceStates {
-			metric.With(prometheus.Labels{"state": state}).Set(float64(stateIntMap[state]))
+		for _, arch := range types.Architectures {
+			for _, state := range types.InstanceStates {
+				metric.With(prometheus.Labels{"arch": arch, "state": state}).Set(float64(archStateMap[arch][state]))
+			}
 		}
 		return nil
 	}
@@ -34,7 +36,7 @@ func (ism InstanceStateMetric) GetEventHandler() func(interface{}) error {
 func init() { // runs on exporter init only (updates are made with the above EventHandler; triggered by the Client)
 
 	AddMetric(InstanceStateMetric{BaseAnkaMetric{
-		metric: CreateGaugeMetricVec("anka_instance_state_count", "Count of Instances in a particular State (label: state)", []string{"state"}),
+		metric: CreateGaugeMetricVec("anka_instance_state_count", "Count of Instances in a particular State (label: arch, state)", []string{"arch", "state"}),
 		event:  events.EVENT_VM_DATA_UPDATED,
 	}})
 

src/metrics/node_states.go

@@ -33,16 +33,18 @@ func (nsm NodeStatesMetric) GetEventHandler() func(interface{}) error {
 var ankaNodeStatesMetrics = []NodeStatesMetric{
 	{
 		BaseAnkaMetric: BaseAnkaMetric{
-			metric: CreateGaugeMetricVec("anka_node_states_count", "Count of Nodes in a particular State (label: state)", []string{"state"}),
+			metric: CreateGaugeMetricVec("anka_node_states_count", "Count of Nodes in a particular State (label: arch, state)", []string{"arch", "state"}),
 			event:  events.EVENT_NODE_UPDATED,
 		},
 		HandleData: func(nodes []types.Node, metric *prometheus.GaugeVec) {
-			var stateIntMap = intMapFromStringSlice(types.NodeStates)
+			var archStateMap = intMapFromTwoStringSlices(types.Architectures, types.NodeStates)
 			for _, node := range nodes {
-				stateIntMap[node.State] = stateIntMap[node.State] + 1
+				archStateMap[node.HostArch][node.State] = archStateMap[node.HostArch][node.State] + 1
 			}
-			for _, state := range types.NodeStates {
-				metric.With(prometheus.Labels{"state": state}).Set(float64(stateIntMap[state]))
+			for _, arch := range types.Architectures {
+				for _, state := range types.NodeStates {
+					metric.With(prometheus.Labels{"arch": arch, "state": state}).Set(float64(archStateMap[arch][state]))
+				}
 			}
 		},
 	},

src/metrics/utils.go

@@ -10,12 +10,15 @@ import (
 	"github.com/veertuinc/anka-prometheus-exporter/src/types"
 )
 
-func intMapFromStringSlice(stringSlice []string) map[string]int {
-	intMap := map[string]int{}
-	for _, item := range stringSlice {
-		intMap[item] = 0
+func intMapFromTwoStringSlices(outerStringSlice []string, innerStringSlice []string) map[string]map[string]int {
+	outerMap := map[string]map[string]int{}
+	for _, outerItem := range outerStringSlice {
+		outerMap[outerItem] = map[string]int{}
+		for _, innerItem := range innerStringSlice {
+			outerMap[outerItem][innerItem] = 0
+		}
 	}
-	return intMap
+	return outerMap
 }
 
 func uniqueThisStringArray(arr []string) []string {

src/types/types.go

@@ -7,6 +7,11 @@ var NodeStates = []string{
 	"Updating",
 }
 
+var Architectures = []string{
+	"amd64",
+	"arm64",
+}
+
 var InstanceStates = []string{
 	"Scheduling",
 	"Pulling",
@@ -34,6 +39,7 @@ type Node struct {
 	DiskSize       uint        `json:"disk_size"`
 	State          string      `json:"state"`
 	Capacity       uint        `json:"capacity"`
+	HostArch       string      `json:"host_arch"`
 	Groups         []NodeGroup `json:"groups"`
 }
 
@@ -60,6 +66,7 @@ type VmData struct {
 	TemplateName string
 	GroupUUID    string `json:"group_id"`
 	NodeUUID     string `json:"node_id"`
+	Arch         string `json:"arch"`
 }
 
 type Response interface {