From 3780958e8479d9a2a759c6d308d28dfaccf25826 Mon Sep 17 00:00:00 2001
From: Deezzir <deezzir@gmail.com>
Date: Wed, 2 Oct 2024 18:21:30 -0400
Subject: [PATCH] Extend DRM labels

Signed-off-by: Deezzir <deezzir@gmail.com>
---
 collector/drm_linux.go | 35 +++++++++++++++++++++++++++++++----
 go.mod                 |  6 +++---
 go.sum                 |  8 ++++----
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/collector/drm_linux.go b/collector/drm_linux.go
index 80356ee8..fbc223ec 100644
--- a/collector/drm_linux.go
+++ b/collector/drm_linux.go
@@ -31,6 +31,7 @@ type drmCollector struct {
 	fs                    sysfs.FS
 	logger                *slog.Logger
 	CardInfo              *prometheus.Desc
+	CardInfoWithChip      *prometheus.Desc
 	GPUBusyPercent        *prometheus.Desc
 	MemoryGTTSize         *prometheus.Desc
 	MemoryGTTUsed         *prometheus.Desc
@@ -59,6 +60,11 @@ func NewDrmCollector(logger *slog.Logger) (Collector, error) {
 			"Card information",
 			[]string{"card", "memory_vendor", "power_performance_level", "unique_id", "vendor"}, nil,
 		),
+		CardInfoWithChip: prometheus.NewDesc(
+			prometheus.BuildFQName(namespace, drmCollectorSubsystem, "card_info"),
+			"Card information",
+			[]string{"card", "memory_vendor", "power_performance_level", "unique_id", "chip", "vendor"}, nil,
+		),
 		GPUBusyPercent: prometheus.NewDesc(
 			prometheus.BuildFQName(namespace, drmCollectorSubsystem, "gpu_busy_percent"),
 			"How busy the GPU is as a percentage.",
@@ -101,6 +107,22 @@ func (c *drmCollector) Update(ch chan<- prometheus.Metric) error {
 	return c.updateAMDCards(ch)
 }
 
+func chipName(s sysfs.ClassDRMCardAMDGPUStats) string {
+	// generate a chip name based on the deviceType and devName
+	cleanDevName := cleanMetricName(s.DevName)
+	cleanDevType := cleanMetricName(s.DevType)
+
+	if cleanDevType != "" && cleanDevName != "" {
+		return cleanDevType + "_" + cleanDevName
+	}
+
+	if cleanDevName != "" {
+		return cleanDevName
+	}
+
+	return ""
+}
+
 func (c *drmCollector) updateAMDCards(ch chan<- prometheus.Metric) error {
 	vendor := "amd"
 	stats, err := c.fs.ClassDRMCardAMDGPUStats()
@@ -109,10 +131,15 @@ func (c *drmCollector) updateAMDCards(ch chan<- prometheus.Metric) error {
 	}
 
 	for _, s := range stats {
-		ch <- prometheus.MustNewConstMetric(
-			c.CardInfo, prometheus.GaugeValue, 1,
-			s.Name, s.MemoryVRAMVendor, s.PowerDPMForcePerformanceLevel, s.UniqueID, vendor)
-
+		if chip := chipName(s); chip != "" {
+			ch <- prometheus.MustNewConstMetric(
+				c.CardInfoWithChip, prometheus.GaugeValue, 1,
+				s.Name, s.MemoryVRAMVendor, s.PowerDPMForcePerformanceLevel, s.UniqueID, chip, vendor)
+		} else {
+			ch <- prometheus.MustNewConstMetric(
+				c.CardInfo, prometheus.GaugeValue, 1,
+				s.Name, s.MemoryVRAMVendor, s.PowerDPMForcePerformanceLevel, s.UniqueID, vendor)
+		}
 		ch <- prometheus.MustNewConstMetric(
 			c.GPUBusyPercent, prometheus.GaugeValue, float64(s.GPUBusyPercent), s.Name)
 
diff --git a/go.mod b/go.mod
index b70e1edb..02ec38a9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/prometheus/node_exporter
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/alecthomas/kingpin/v2 v2.4.0
@@ -25,9 +25,9 @@ require (
 	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/common v0.67.5
 	github.com/prometheus/exporter-toolkit v0.15.0
-	github.com/prometheus/procfs v0.19.2
+	github.com/prometheus/procfs v0.20.0
 	github.com/safchain/ethtool v0.7.0
-	golang.org/x/sys v0.40.0
+	golang.org/x/sys v0.41.0
 	howett.net/plist v1.0.1
 )
 
diff --git a/go.sum b/go.sum
index 20e615f5..1d615f0d 100644
--- a/go.sum
+++ b/go.sum
@@ -88,8 +88,8 @@ github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTU
 github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=
 github.com/prometheus/exporter-toolkit v0.15.0 h1:Pcle5sSViwR1x0gdPd0wtYrPQENBieQAM7TmT0qtb2U=
 github.com/prometheus/exporter-toolkit v0.15.0/go.mod h1:OyRWd2iTo6Xge9Kedvv0IhCrJSBu36JCfJ2yVniRIYk=
-github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
-github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
+github.com/prometheus/procfs v0.20.0 h1:AA7aCvjxwAquZAlonN7888f2u4IN8WVeFgBi4k82M4Q=
+github.com/prometheus/procfs v0.20.0/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/safchain/ethtool v0.7.0 h1:rlJzfDetsVvT61uz8x1YIcFn12akMfuPulHtZjtb7Is=
@@ -127,8 +127,8 @@ golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
 golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=