Skip to content

Commit 0dbaaff

Browse files
yoshdmarkmandel
andauthored
Remove node_name label from allocation metrics (agones-dev#2433)
Co-authored-by: Mark Mandel <markmandel@google.com>
1 parent f17c88e commit 0dbaaff

2 files changed

Lines changed: 1 addition & 94 deletions

File tree

‎build/grafana/dashboard-allocations.yaml‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -508,94 +508,6 @@ data:
508508
"align": false,
509509
"alignLevel": null
510510
}
511-
},
512-
{
513-
"aliasColors": {},
514-
"bars": true,
515-
"cacheTimeout": null,
516-
"dashLength": 10,
517-
"dashes": false,
518-
"fill": 2,
519-
"gridPos": {
520-
"h": 8,
521-
"w": 24,
522-
"x": 0,
523-
"y": 17
524-
},
525-
"id": 18,
526-
"legend": {
527-
"alignAsTable": true,
528-
"avg": false,
529-
"current": true,
530-
"max": false,
531-
"min": false,
532-
"rightSide": true,
533-
"show": true,
534-
"total": false,
535-
"values": true
536-
},
537-
"lines": true,
538-
"linewidth": 2,
539-
"links": [],
540-
"nullPointMode": "null",
541-
"options": {},
542-
"percentage": false,
543-
"pointradius": 2,
544-
"points": false,
545-
"renderer": "flot",
546-
"seriesOverrides": [],
547-
"spaceLength": 10,
548-
"stack": true,
549-
"steppedLine": false,
550-
"targets": [
551-
{
552-
"expr": "sum(rate(agones_gameserver_allocations_duration_seconds_count{status=\"Allocated\"}[$interval])) by (node_name)",
553-
"format": "heatmap",
554-
"intervalFactor": 1,
555-
"legendFormat": "{{node_name}}",
556-
"refId": "A"
557-
}
558-
],
559-
"thresholds": [],
560-
"timeFrom": null,
561-
"timeRegions": [],
562-
"timeShift": null,
563-
"title": "Allocations rate per node",
564-
"tooltip": {
565-
"shared": true,
566-
"sort": 0,
567-
"value_type": "individual"
568-
},
569-
"type": "graph",
570-
"xaxis": {
571-
"buckets": null,
572-
"mode": "time",
573-
"name": null,
574-
"show": true,
575-
"values": []
576-
},
577-
"yaxes": [
578-
{
579-
"format": "short",
580-
"label": null,
581-
"logBase": 1,
582-
"max": null,
583-
"min": null,
584-
"show": true
585-
},
586-
{
587-
"format": "short",
588-
"label": null,
589-
"logBase": 1,
590-
"max": null,
591-
"min": null,
592-
"show": true
593-
}
594-
],
595-
"yaxis": {
596-
"align": false,
597-
"alignLevel": null
598-
}
599511
}
600512
],
601513
"refresh": "10s",

‎pkg/gameserverallocations/metrics.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333

3434
var (
3535
keyFleetName = mt.MustTagKey("fleet_name")
36-
keyNodeName = mt.MustTagKey("node_name")
3736
keyClusterName = mt.MustTagKey("cluster_name")
3837
keyMultiCluster = mt.MustTagKey("is_multicluster")
3938
keyStatus = mt.MustTagKey("status")
@@ -48,7 +47,7 @@ func init() {
4847
Measure: gameServerAllocationsLatency,
4948
Description: "The distribution of gameserver allocation requests latencies.",
5049
Aggregation: view.Distribution(0, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2, 3),
51-
TagKeys: []tag.Key{keyFleetName, keyNodeName, keyClusterName, keyMultiCluster, keyStatus, keySchedulingStrategy},
50+
TagKeys: []tag.Key{keyFleetName, keyClusterName, keyMultiCluster, keyStatus, keySchedulingStrategy},
5251
}))
5352
}
5453

@@ -58,7 +57,6 @@ var latencyTags = []tag.Mutator{
5857
tag.Insert(keyClusterName, "none"),
5958
tag.Insert(keySchedulingStrategy, "none"),
6059
tag.Insert(keyFleetName, "none"),
61-
tag.Insert(keyNodeName, "none"),
6260
tag.Insert(keyStatus, "none"),
6361
}
6462

@@ -108,9 +106,6 @@ func (r *metrics) setResponse(o k8sruntime.Object) {
108106
}
109107
r.setStatus(string(out.Status.State))
110108
var tags []tag.Mutator
111-
if out.Status.NodeName != "" {
112-
tags = append(tags, tag.Update(keyNodeName, out.Status.NodeName))
113-
}
114109
// sets the fleet name tag if possible
115110
if out.Status.State == allocationv1.GameServerAllocationAllocated {
116111
gs, err := r.gameServerLister.GameServers(out.Namespace).Get(out.Status.GameServerName)

0 commit comments

Comments
 (0)