CP-45226: Added friendly name for new datasource 'hostload'.

Signed-off-by: Konstantina Chremmou <[email protected]>
xenserver · Oct 24, 2023 · be5428b · be5428b
1 parent 07e66ce
commit be5428b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/XenModel/FriendlyNames.Designer.cs b/XenModel/FriendlyNames.Designer.cs
diff --git a/XenModel/FriendlyNames.resx b/XenModel/FriendlyNames.resx
@@ -1856,6 +1856,9 @@
   <data name="Message.name-wlb_vm_relocation" xml:space="preserve">
     <value>WLB VM Relocation</value>
   </data>
+  <data name="OPERATIONAL_METRICS_HOSTLOAD" xml:space="preserve">
+    <value>CPU Load</value>
+  </data>
   <data name="PREPARE_HOST_UPGRADE_ERROR_PREPARING_HOST" xml:space="preserve">
     <value>There was an error in preparing the host for upgrade.</value>
   </data>

diff --git a/XenModel/Utils/Helpers.cs b/XenModel/Utils/Helpers.cs
@@ -671,6 +671,7 @@ public static string ToStringI18N(this DataSourceCategory category)
         static Regex XapiMemoryRegex = new Regex("^xapi_(allocation|free_memory|live_memory|memory_usage)_kib$");
         static Regex StatefileLatencyRegex = new Regex("^statefile/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/latency$");
         static Regex LoadAvgRegex = new Regex("loadavg");
+        static Regex HostloadRegex = new Regex("hostload");
         static Regex SrRegex = new Regex("^sr_[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}_cache_(size|hits|misses)");
         static Regex SrIORegex = new Regex("^(io_throughput|iops)_(read|write|total)_([a-f0-9]{8})$");
         static Regex SrOtherRegex = new Regex("^(latency|avgqu_sz|inflight|iowait)_([a-f0-9]{8})$");
@@ -706,6 +707,9 @@ public static DataSourceCategory GetDataSourceCategory(string name)
             if (LoadAvgRegex.IsMatch(name))
                 return DataSourceCategory.LoadAverage;
 
+            if (HostloadRegex.IsMatch(name))
+                return DataSourceCategory.Cpu;
+
             if (name.StartsWith("pvsaccelerator"))
                 return DataSourceCategory.Pvs;
 
@@ -899,6 +903,9 @@ private static string GetFriendlyDataSourceName_(string name, IXenObject iXenObj
             if (LoadAvgRegex.IsMatch(name))
                 return FriendlyNameManager.GetFriendlyName("Label-performance.loadavg");
 
+            if (HostloadRegex.IsMatch(name))
+                return FriendlyNames.OPERATIONAL_METRICS_HOSTLOAD;
+
             return FriendlyNameManager.GetFriendlyName(string.Format("Label-performance.{0}", name));
         }