Merge pull request #102 from stackify/task/POPS-261

POPS-261: Fix custom metric issue when Apps is deployed to Kubernetes

Author: kbond-stackify

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -109,7 +109,13 @@ private void GetAzureInfo()
 
         public static string GetDeviceName()
         {
-            var deviceName = Environment.MachineName;
+            var deviceName = Environment.GetEnvironmentVariable("STACKIFY_DEVICE_NAME");
+            if (!String.IsNullOrEmpty(deviceName))
+            {
+                return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
+            }
+
+            deviceName = Environment.MachineName;
 
             if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
             {
@@ -194,7 +200,13 @@ public static string GetEC2InstanceId()
 #else
         public static string GetDeviceName()
         {
-            var deviceName = Environment.MachineName;
+            var deviceName = Environment.GetEnvironmentVariable("STACKIFY_DEVICE_NAME");
+            if (!String.IsNullOrEmpty(deviceName))
+            {
+                return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
+            }
+
+            deviceName = Environment.MachineName;
 
             if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
             {