FO 3.1.16

microsoft · Jul 29, 2021 · aa0872e · aa0872e
2 parents 69bb503 + b87cd7c
commit aa0872e
Show file tree

Hide file tree

Showing 41 changed files with 1,763 additions and 650 deletions.
diff --git a/Build-SFPkgs.ps1 b/Build-SFPkgs.ps1
@@ -23,11 +23,11 @@ function Build-SFPkg {
 try {
     Push-Location $scriptPath
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.1.15" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.1.15" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.1.16" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.1.16" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.1.15" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.1.15" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.1.16" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.1.16" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
 }
 finally {
     Pop-Location

diff --git a/ClusterObserver/ClusterObserver.cs b/ClusterObserver/ClusterObserver.cs
@@ -251,11 +251,12 @@ private async Task ReportClusterHealthAsync(CancellationToken token)
                                 {
 
                                 }
-
                                 break;
+
                             case HealthEvaluationKind.Application:
                             case HealthEvaluationKind.Applications:
                             case HealthEvaluationKind.SystemApplication:
+
                                 try
                                 {
                                     await ProcessApplicationHealthAsync(clusterHealth.ApplicationHealthStates, token).ConfigureAwait(true);
@@ -264,9 +265,10 @@ private async Task ReportClusterHealthAsync(CancellationToken token)
                                 {
 
                                 }
-
                                 break;
+
                             default:
+
                                 try
                                 {
                                     await ProcessGenericEntityHealthAsync(evaluation, token).ConfigureAwait(true);
@@ -275,7 +277,6 @@ private async Task ReportClusterHealthAsync(CancellationToken token)
                                 {
 
                                 }
-
                                 break;
                         }
                     }
@@ -633,7 +634,8 @@ private async Task MonitorNodeStatusAsync(CancellationToken token)
                             Description = $"{nodeDictItem.Key} is now Up.",
                             Metric = "NodeStatus",
                             NodeName = nodeDictItem.Key,
-                            Source = ObserverName
+                            Source = ObserverName,
+                            Value = 0
                         };
 
                         await ObserverTelemetryClient.ReportHealthAsync(telemetry, token);
@@ -646,13 +648,12 @@ private async Task MonitorNodeStatusAsync(CancellationToken token)
                                             ObserverConstants.ClusterObserverETWEventName,
                                             new
                                             {
-                                                HealthScope = "Node",
                                                 HealthState = "Ok",
-                                                HealthEventDescription = $"{nodeDictItem.Key} is now Up.",
+                                                Description = $"{nodeDictItem.Key} is now Up.",
                                                 Metric = "NodeStatus",
                                                 NodeName = nodeDictItem.Key,
-                                                NodeStatus = "Up",
-                                                Source = ObserverName
+                                                Source = ObserverName,
+                                                Value = 0
                                             });
                     }
 
@@ -706,7 +707,8 @@ private async Task MonitorNodeStatusAsync(CancellationToken token)
                                 Description = message,
                                 Metric = "NodeStatus",
                                 NodeName = kvp.Key,
-                                Source = ObserverName
+                                Source = ObserverName,
+                                Value = 1,
                             };
 
                             await ObserverTelemetryClient.ReportHealthAsync(telemetry, token);
@@ -719,13 +721,12 @@ private async Task MonitorNodeStatusAsync(CancellationToken token)
                                                 ObserverConstants.ClusterObserverETWEventName,
                                                 new
                                                 {
-                                                    HealthScope = "Node",
                                                     HealthState = "Warning",
-                                                    HealthEventDescription = message,
+                                                    Description = message,
                                                     Metric = "NodeStatus",
                                                     NodeName = kvp.Key,
-                                                    NodeStatus = $"{kvp.Value.NodeStatus}",
-                                                    Source = ObserverName
+                                                    Source = ObserverName,
+                                                    Value = 1,
                                                 });
                         }
                     }

diff --git a/ClusterObserver/ClusterObserver.csproj b/ClusterObserver/ClusterObserver.csproj
@@ -27,6 +27,6 @@
     <PackageReference Include="Microsoft.ServiceFabric.Diagnostics.Internal" Version="4.2.452" />
     <PackageReference Include="Microsoft.ServiceFabric.Services" Version="4.2.452" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.9" />
+    <PackageReference Include="NLog" Version="4.7.10" />
   </ItemGroup>
 </Project>
diff --git a/ClusterObserver/Utilities/Telemetry/AppInsightsTelemetry.cs b/ClusterObserver/Utilities/Telemetry/AppInsightsTelemetry.cs
@@ -133,7 +133,7 @@ public Task ReportHealthAsync(TelemetryData telemetryData, CancellationToken can
                     { "ErrorCode", telemetryData.Code ?? string.Empty },
                     { "Description", telemetryData.Description ?? string.Empty },
                     { "Metric", telemetryData.Metric ?? string.Empty },
-                    { "Value", telemetryData.Value.ToString() },
+                    { "Value", telemetryData.Value == 0 ? "Up" : "Down" },
                     { "Partition", telemetryData.PartitionId },
                     { "Replica", telemetryData.ReplicaId.ToString() },
                     { "Source", telemetryData.ObserverName },

diff --git a/ClusterObserver/Utilities/Telemetry/LogAnalyticsTelemetry.cs b/ClusterObserver/Utilities/Telemetry/LogAnalyticsTelemetry.cs
@@ -156,10 +156,8 @@ private string GetSignature(
             string message = $"{method}\n{contentLength}\n{contentType}\nx-ms-date:{date}\n{resource}";
             byte[] bytes = Encoding.UTF8.GetBytes(message);
 
-            using (var encryptor = new HMACSHA256(Convert.FromBase64String(Key)))
-            {
-                return $"SharedKey {WorkspaceId}:{Convert.ToBase64String(encryptor.ComputeHash(bytes))}";
-            }
+            using var encryptor = new HMACSHA256(Convert.FromBase64String(Key));
+            return $"SharedKey {WorkspaceId}:{Convert.ToBase64String(encryptor.ComputeHash(bytes))}";
         }
 
         // These two overloads of ReportHealthAsync are the only function impls that really makes sense for ClusterObserver