From 1e2ff136d7f78eb0239d55430d2e7405eb28694e Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sat, 4 Nov 2023 10:55:50 +0100 Subject: [PATCH 1/2] fix: CPU temperature on AMD machines --- sensor/cpu.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sensor/cpu.go b/sensor/cpu.go index a035b4b..cd8518b 100644 --- a/sensor/cpu.go +++ b/sensor/cpu.go @@ -16,7 +16,7 @@ import ( ) var ( - reCPUTemp = regexp.MustCompile(`(?m)(temp1|Package id|Core \d)[\s\d]*:\s+.?([\d\.]+)°`) + reCPUTemp = regexp.MustCompile(`(?m)(temp1|Package id|Core \d|CPU)[\s\d]*:\s+.?([\d\.]+)°`) // This is currently unused. //reCPUTemp2 = regexp.MustCompile(`(?mi)^\s?(?P[^:]+):\s+(?P\d+)`) reCPUUsage = regexp.MustCompile(`(?m)^\s*cpu(\d+)?.*`) @@ -56,7 +56,7 @@ func (c CPUTemp) process(output string) (*entity.Payload, error) { if len(match) < 3 { return nil, fmt.Errorf("invalid output form lm-sensors received: %s", output) } - if strings.EqualFold(match[1], "Package id") { + if strings.EqualFold(match[1], "Package id") || strings.EqualFold(match[1], "CPU") { p.State = match[2] } else { p.Attributes[util.ToSnakeCase(match[1])] = match[2] From 894dae1728b9624dc72f47dbdc751e82905e6e99 Mon Sep 17 00:00:00 2001 From: Philipp Schmitt Date: Sat, 4 Nov 2023 11:05:23 +0100 Subject: [PATCH 2/2] fix: CPU temp test --- sensor/cpu_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/sensor/cpu_test.go b/sensor/cpu_test.go index 89aff78..32752c0 100644 --- a/sensor/cpu_test.go +++ b/sensor/cpu_test.go @@ -66,6 +66,7 @@ func TestCPUTemp(t *testing.T) { "core_3": "37.0", "core_4": "38.0", "core_5": "39.0", + "temp_1": "37.0", }, }