diff --git a/XenModel/FriendlyNames.Designer.cs b/XenModel/FriendlyNames.Designer.cs
index 28e1ec226..70c62fdab 100644
--- a/XenModel/FriendlyNames.Designer.cs
+++ b/XenModel/FriendlyNames.Designer.cs
@@ -5273,6 +5273,15 @@ public static string Message_name_wlb_vm_relocation {
}
}
+ ///
+ /// Looks up a localized string similar to Host CPU Load.
+ ///
+ public static string OPERATIONAL_METRICS_HOSTLOAD {
+ get {
+ return ResourceManager.GetString("OPERATIONAL_METRICS_HOSTLOAD", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to There was an error in preparing the host for upgrade..
///
diff --git a/XenModel/FriendlyNames.resx b/XenModel/FriendlyNames.resx
index 7b6128133..e2ce0449b 100644
--- a/XenModel/FriendlyNames.resx
+++ b/XenModel/FriendlyNames.resx
@@ -1856,6 +1856,9 @@
WLB VM Relocation
+
+ Host CPU Load
+
There was an error in preparing the host for upgrade.
diff --git a/XenModel/Utils/Helpers.cs b/XenModel/Utils/Helpers.cs
index 4bf7f0d3d..f51b067fa 100755
--- 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.LoadAverage;
+
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));
}