Add ServiceDomainc configuration setting to allow alteration of the b…

…ase OMS workspace domain for various gov clouds or other deployments. Update documentation and package version
Azure · Jan 27, 2018 · c5882e0 · c5882e0
1 parent 71efdf8
commit c5882e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -669,7 +669,7 @@ The OMS output writes data to [Operations Management Suite](https://www.microsof
   "type": "OmsOutput",
   "workspaceId": "<workspace-GUID>",
   "workspaceKey": "<base-64-encoded workspace key>",
-  "useAzureGov" : "<optional-boolean>"
+  "serviceDomain" : "<optional domain for OMS>"
 }
 ```
 
@@ -682,7 +682,7 @@ Supported configuration settings are:
 | `workspaceKey` | string (base-64) | Yes | Specifies the workspace authentication key. |
 | `logTypeName` | string | No | Specifies the log entry type created by the output. Default value for this setting is "Event", which results in "Event_CL" entries being created in OMS (the "_CL" suffix is appended automatically by OMS 
 ingestion service). |
-| `useAzureGov` | bool | No | Used to send entries to an OMS workspace located in the Azure Gov Cloud |
+| `serviceDomain` | string | No | Specifies the domain for your OMS workspace. Default value is "ods.opinsights.azure.com", for Azure Commercial.
 
 ### Filters
 As data comes through the EventFlow pipeline, the application can add extra processing or tagging to them. These optional operations are accomplished with filters. Filters can transform, drop, or tag data with extra metadata, with rules based on custom expressions.

diff --git a/src/Microsoft.Diagnostics.EventFlow.Outputs.Oms/Configuration/OmsOutputConfiguration.cs b/src/Microsoft.Diagnostics.EventFlow.Outputs.Oms/Configuration/OmsOutputConfiguration.cs
@@ -12,6 +12,6 @@ public class OmsOutputConfiguration
         public string WorkspaceId { get; set; }
         public string WorkspaceKey { get; set; }
         public string LogTypeName { get; set; }
-        public bool UseAzureGov { get; set; }
+        public string ServiceDomain { get; set; }
     }
 }
diff --git a/...soft.Diagnostics.EventFlow.Outputs.Oms/Microsoft.Diagnostics.EventFlow.Outputs.Oms.csproj b/...soft.Diagnostics.EventFlow.Outputs.Oms/Microsoft.Diagnostics.EventFlow.Outputs.Oms.csproj
@@ -9,7 +9,7 @@
     <AssemblyName>Microsoft.Diagnostics.EventFlow.Outputs.Oms</AssemblyName>
     <AssemblyOriginatorKeyFile>../../PublicKey.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <VersionPrefix>1.1.2</VersionPrefix>
+    <VersionPrefix>1.1.3</VersionPrefix>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Microsoft.Diagnostics.EventFlow.Outputs.Oms</PackageId>
     <PackageTags>Microsoft;Diagnostics;EventFlow;Outputs;Microsoft Operations Management</PackageTags>

diff --git a/src/Microsoft.Diagnostics.EventFlow.Outputs.Oms/OmsOutput.cs b/src/Microsoft.Diagnostics.EventFlow.Outputs.Oms/OmsOutput.cs
@@ -84,9 +84,9 @@ private OmsConnectionData CreateConnectionData(OmsOutputConfiguration configurat
             var retryHandler = new HttpExponentialRetryMessageHandler();
             var httpClient = new HttpClient(retryHandler);
 
-            if (configuration.UseAzureGov)
+            if (!string.IsNullOrWhiteSpace(configuration.ServiceDomain))
             {
-                httpClient.BaseAddress = new Uri($"https://{workspaceId}.ods.opinsights.azure.us", UriKind.Absolute);
+                httpClient.BaseAddress = new Uri($"https://{workspaceId}." + configuration.ServiceDomain, UriKind.Absolute);
             }
             else
             {