FO 3.1.6, CO 2.1.5 (Merge Latest)

microsoft · Mar 10, 2021 · c071a81 · c071a81
2 parents 30fc720 + 7976aac
commit c071a81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/Documentation/Plugins.md b/Documentation/Plugins.md
@@ -9,8 +9,8 @@ Note: The plugin model depends on the following packages, which **must have the
 
 Current: 
 
-**Microsoft.Extensions.DependencyInjection, Version 5.0.1**
-**Microsoft.Extensions.DependencyInjection.Abstractions, Version 5.0.0**
+**Microsoft.Extensions.DependencyInjection, Version 5.0.1**  
+**Microsoft.Extensions.DependencyInjection.Abstractions, Version 5.0.0**  (Observer plugins must employ this package, which must be the same version as FabricObserver's referenced package)  
 
 #### Steps 
 

diff --git a/Documentation/Using.md b/Documentation/Using.md
@@ -96,10 +96,10 @@ So, based on the above configuration, when the number of open file handles held
 
 DiskObserver's Threshold setting values are required to be overriden and are set in FO's ApplicationManifest.xml file.
 
-Add this to DiskObserver's configuration section in FO's ApplicationManifest.xml file and it will warn you when disk space consumption reaches 80%:
+Set the DiskSpacePercentUsageWarningThreshold parameter in DiskObserver's configuration section located in FO's ***ApplicationManifest.xml*** file and it will warn you when disk space consumption reaches 80%:
 
 ```XML
- <!-- Disk Observer Warning/Error Thresholds -->
+    <!-- Disk Observer Warning/Error Thresholds -->
     <Parameter Name="DiskSpacePercentUsageWarningThreshold" DefaultValue="80" />
     <Parameter Name="DiskSpacePercentUsageErrorThreshold" DefaultValue="" />
     <Parameter Name="AverageQueueLengthErrorThreshold" DefaultValue="" />
@@ -298,12 +298,6 @@ NodeObserver doesn't speak JSON (can you believe it!!??....). So, you simply set
     <Parameter Name="NodeObserverMemoryWarningLimitMb" DefaultValue="" />
     <Parameter Name="NodeObserverMemoryErrorLimitPercent" DefaultValue="" />
     <Parameter Name="NodeObserverMemoryWarningLimitPercent" DefaultValue="85" />
-    <Parameter Name="NodeObserverNetworkErrorActivePorts" DefaultValue="" />
-    <Parameter Name="NodeObserverNetworkWarningActivePorts" DefaultValue="50000" />
-    <Parameter Name="NodeObserverNetworkErrorFirewallRules" DefaultValue="" />
-    <Parameter Name="NodeObserverNetworkWarningFirewallRules" DefaultValue="2500" />
-    <Parameter Name="NodeObserverNetworkErrorEphemeralPorts" DefaultValue="" />
-    <Parameter Name="NodeObserverNetworkWarningEphemeralPorts" DefaultValue="8000" />
 ```  
 
 Example Output in SFX: 
@@ -459,7 +453,7 @@ $appParams = @{ "FabricSystemObserverEnabled" = "true"; "FabricSystemObserverMem
 Then execute the application upgrade with
 
 ```Powershell
-Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricObserver -ApplicationTypeVersion 3.1.3 -ApplicationParameter $appParams -Monitored -FailureAction rollback
+Start-ServiceFabricApplicationUpgrade -ApplicationName fabric:/FabricObserver -ApplicationTypeVersion 3.1.4 -ApplicationParameter $appParams -Monitored -FailureAction rollback
 ```  
 
 Note: On *Linux*, this will restart FO processes (one at a time, UD Walk with safety checks) due to the way Linux Capabilites work. In a nutshell, for any kind of application upgrade, we have to re-run the FO setup script to get the Capabilities in place. For Windows, FO processes will NOT be restarted.