From 495f5ea4124cf9d54af23a4cc82e3ca39775cc80 Mon Sep 17 00:00:00 2001 From: Sacha Narinx Date: Sun, 28 May 2017 12:59:22 +0400 Subject: [PATCH] Generalizing and minor text edits --- Contributing.md | 2 +- Deploy/README.md | 2 +- Deploy/Tenant/RB-ProcessLogs.ps1 | 6 +++--- Deploy/Tenant/oms-all-deploy/README.md | 2 ++ Deploy/Tenant/zMonitorDeploy.ps1 | 11 +++++++---- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Contributing.md b/Contributing.md index 93727ca..3631312 100644 --- a/Contributing.md +++ b/Contributing.md @@ -2,7 +2,7 @@ ## Contributing -We are thrilled that you'd like to contribute to this project. You help is essential for keep it great. +We are thrilled that you'd like to contribute to this project. The community will drive the usefulness of this project. This project adheres to the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. By participating, you are expected to uphold this code. \ No newline at end of file diff --git a/Deploy/README.md b/Deploy/README.md index 2b26025..44e3604 100644 --- a/Deploy/README.md +++ b/Deploy/README.md @@ -1 +1 @@ -Please refer to the documentation folder for deployment instructions. \ No newline at end of file +Please refer to the documentation in the root for deployment instructions. \ No newline at end of file diff --git a/Deploy/Tenant/RB-ProcessLogs.ps1 b/Deploy/Tenant/RB-ProcessLogs.ps1 index 7f3d768..59fada0 100644 --- a/Deploy/Tenant/RB-ProcessLogs.ps1 +++ b/Deploy/Tenant/RB-ProcessLogs.ps1 @@ -12,9 +12,9 @@ $Conn = Get-AutomationConnection -Name AzureRunAsConnection Add-AzureRMAccount -ServicePrincipal -Tenant $Conn.TenantID -ApplicationId $Conn.ApplicationID -CertificateThumbprint $Conn.CertificateThumbprint # Set service provider Azure storage account and get the context -$StorageAccountName = "springcspopsdump" -$StorageContainerName = "omslogcsv" -$StorageAccountKey = "f9xxQl2cRhZE4go2ZzPvNfgO7zHAJDHUeFVur/g/bd1XUaavYsb5jxxcNt0P884bUq2prBy3+4inVlDvqMGLtQ==" +$StorageAccountName = "" +$StorageContainerName = "" +$StorageAccountKey = "" $Ctx = New-AzureStorageContext $StorageAccountName -StorageAccountKey $StorageAccountKey #Get-AzureStorageContainer -Name $StorageContainerName -Context $Ctx diff --git a/Deploy/Tenant/oms-all-deploy/README.md b/Deploy/Tenant/oms-all-deploy/README.md index 428b8e6..fa8fc75 100644 --- a/Deploy/Tenant/oms-all-deploy/README.md +++ b/Deploy/Tenant/oms-all-deploy/README.md @@ -1,5 +1,7 @@ # Microsoft Operations Management Suite +Original template located at [https://github.com/Azure/azure-quickstart-templates/tree/master/oms-all-deploy](https://github.com/Azure/azure-quickstart-templates/tree/master/oms-all-deploy) + [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fazure%2Fazure-quickstart-templates%2Fmaster%2Foms-all-deploy%2F%2Fazuredeploy.json) diff --git a/Deploy/Tenant/zMonitorDeploy.ps1 b/Deploy/Tenant/zMonitorDeploy.ps1 index 7fa63d8..574508c 100644 --- a/Deploy/Tenant/zMonitorDeploy.ps1 +++ b/Deploy/Tenant/zMonitorDeploy.ps1 @@ -1,9 +1,12 @@ -$TenantID = "d30b7b5b-514d-412e-9f07-e5958292afc8" -$SubscriptionID = "D8F3F8EB-779D-4495-A12E-A9DF6B081B36" +# The config settings are for CSP partners, which need the TenantID as well as SubscriptionID. +# For non-CSP deployments, the TenantID is not used. +$TenantID = "" +$SubscriptionID = "" $resourceGroupName = "zMonitor" -$resourceRegion = "West Europe" -$templateFilePath = "C:\Users\sprin\OneDrive - Microsoft\30 My IP Development Space\OSP Resources\Tenant\oms-all-deploy\azuredeploy.json" +$resourceRegion = "West Europe" # Your preferred region +$templateFilePath = "\Tenant\oms-all-deploy\azuredeploy.json" +# Remove TenantID for non-CSP deployments Login-AzureRmAccount -TenantId $TenantID -SubscriptionId $SubscriptionID $resourceGroup = Get-AzureRmResourceGroup -Name $resourceGroupName -ErrorAction SilentlyContinue