From 65c3106af2ad99ffe1724d6c6a3e7da0b534a515 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Fri, 18 Feb 2022 16:59:59 +0100
Subject: [PATCH] Remove tags for num cores and packages

---
 collectors/cpufreqCpuinfoMetric.go | 8 +++-----
 collectors/cpufreqMetric.go        | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/collectors/cpufreqCpuinfoMetric.go b/collectors/cpufreqCpuinfoMetric.go
index f527859..44a3b0c 100644
--- a/collectors/cpufreqCpuinfoMetric.go
+++ b/collectors/cpufreqCpuinfoMetric.go
@@ -150,11 +150,9 @@ func (m *CPUFreqCpuInfoCollector) Init(config json.RawMessage) error {
 		t.numNonHT = numNonHT
 		t.numNonHT_int = numNonHT_int
 		t.tagSet = map[string]string{
-			"type":        "cpu",
-			"type-id":     t.processor,
-			"num_core":    t.numNonHT,
-			"package_id":  t.physicalPackageID,
-			"num_package": t.numPhysicalPackages,
+			"type":       "cpu",
+			"type-id":    t.processor,
+			"package_id": t.physicalPackageID,
 		}
 	}
 
diff --git a/collectors/cpufreqMetric.go b/collectors/cpufreqMetric.go
index da9f2d7..5146baa 100644
--- a/collectors/cpufreqMetric.go
+++ b/collectors/cpufreqMetric.go
@@ -161,11 +161,9 @@ func (m *CPUFreqCollector) Init(config json.RawMessage) error {
 		t.numNonHT = numNonHT
 		t.numNonHT_int = numNonHT_int
 		t.tagSet = map[string]string{
-			"type":        "cpu",
-			"type-id":     t.processor,
-			"num_core":    t.numNonHT,
-			"package_id":  t.physicalPackageID,
-			"num_package": t.numPhysicalPackages,
+			"type":       "cpu",
+			"type-id":    t.processor,
+			"package_id": t.physicalPackageID,
 		}
 	}