Skip to content

Extend DRM labels #3145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Deezzir wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −4
Open

Extend DRM labels #3145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3780958
Extend DRM labels
Deezzir Oct 2, 2024
a449a8f
Merge branch 'master' into add-drm-chip
Deezzir Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions collector/drm_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.",
Expand Down Expand Up @@ -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()
Expand All @@ -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)

Expand Down