Changed metric names for throttling to correct naming scheme

ArneTR · ArneTR · commit 0b0b9ab788c0 · 2025-07-24T14:08:00.000+02:00
diff --git a/frontend/js/helpers/config.js.example b/frontend/js/helpers/config.js.example
@@ -306,10 +306,15 @@ METRIC_MAPPINGS = {
         "source": "sysfs",
         "explanation": "CPU Frequency per core as reported by sysfs"
     },
-    "cpu_throttling_msr_component": {
-        "clean_name": "CPU Throttling",
+    "cpu_throttling_thermal_msr_component": {
+        "clean_name": "CPU Throttling (Thermal)",
         "source": "msr",
-        "explanation": "Indicator for CPU throttling due to thermal or power capping"
+        "explanation": "Indicator for CPU throttling due to thermal capping"
+    },
+    "cpu_throttling_power_msr_component": {
+        "clean_name": "CPU Throttling (Power)",
+        "source": "msr",
+        "explanation": "Indicator for CPU throttling due to power capping"
     },
     "ane_power_powermetrics_component": {
         "clean_name": "ANE Power",
diff --git a/lib/phase_stats.py b/lib/phase_stats.py
@@ -188,8 +188,8 @@ def build_and_store_phase_stats(run_id, sci=None):
                 'energy_impact_powermetrics_vm',
                 'disk_used_statvfs_system',
                 'cpu_frequency_sysfs_core',
-                'power_limit_throttling_status',
-                'thermal_throttling_status',
+                'cpu_throttling_thermal_msr_component',
+                'cpu_throttling_power_msr_component',
             ):
                 csv_buffer.write(generate_csv_line(run_id, metric, detail_name, f"{idx:03}_{phase['name']}", avg_value, 'MEAN', max_value, min_value, sampling_rate_avg, sampling_rate_max, sampling_rate_95p, unit))
 
diff --git a/metric_providers/cpu/throttling/msr/component/provider.py b/metric_providers/cpu/throttling/msr/component/provider.py
@@ -12,7 +12,7 @@ def __init__(self, sampling_rate, skip_check=False):
             current_dir=os.path.dirname(os.path.abspath(__file__)),
             skip_check=skip_check,
         )
-        self._sub_metrics_name = ['thermal_throttling_status', 'power_limit_throttling_status']
+        self._sub_metrics_name = ['cpu_throttling_thermal_msr_component', 'cpu_throttling_power_msr_component']
 
 
     def _parse_metrics(self, df):

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ def __init__(self, sampling_rate, skip_check=False):`
`12`	`12`	`current_dir=os.path.dirname(os.path.abspath(__file__)),`
`13`	`13`	`skip_check=skip_check,`
`14`	`14`	`)`
`15`		`- self._sub_metrics_name = ['thermal_throttling_status', 'power_limit_throttling_status']`
	`15`	`+ self._sub_metrics_name = ['cpu_throttling_thermal_msr_component', 'cpu_throttling_power_msr_component']`
`16`	`16`
`17`	`17`
`18`	`18`	`def _parse_metrics(self, df):`