Skip to content

Commit

Permalink
Echo Bot V2 (#670)
Browse files Browse the repository at this point in the history 
* added bcc env

* added new env

* updated to new app

* removed build dependency

* removed unused actions

* updated data collection rules

* added health endpoint and fixed deployment issues

* updated echo bot service name

* updated env variables prefix

* added dsc resources used for repackaging and repackaged dsc commands

* duplicated code to get media dns name

* updated code to set media dns name

* repackaged dsc resources

* updated env variable to appsettings

* recompiled dsc resources

* fixed env variable name

* repackaged dsc resources

* adding new environment

* updated vm type

* set to 2022 datacenter

* updated adding controllers in bot host

* updated template to use windows server 2022

* added new environment

* updated worker

* updated stop methods

* added windows service nuget

* removed old env

* added cert to web builder

* added new env

* updated to new version of bot libraries and migrated to dotnet core

* added a new env

* updated git to use 64 bit version

* added new env

* added .net workload to vs install

* fixes for joining audio call

* added new env

* removed env

* compressed the dscresources contents

* moved the zip up a level

* Peer review updates

* updates for peer review

* added new environment

* added and removed env

* Updated end call by thread id, updated call controller name, added swagger url as a comment

* added .env-template file for local debugging

* updated env template and app settings required attribute for the thumbprint

* add header back

* removed user workflows

* removed param file

* Fix wildcard certificate creation command in README.md

* added new environment

* updated c++ args and aded missing comma

* updated c++ version

* removed explicit install of c++ redistributable package and added note in the configuration

* added a new environment

* removed env

* added new environment

* added mandatory param for org and location to gh script

* removed env

* updated speech service name

* added new deployment

* removed env workflows

* added bcmsft environment

* updated file paths to use c drive instead of custom disk

* updated zip bc of botservers.ps1 change

* removed env workflows and added video demonstration to readme

---------

Co-authored-by: Brennen Cage <[email protected]>
  • Loading branch information
@bcage29
bcage29 and Brennen Cage authored Feb 2, 2024
1 parent d11e04c commit 87aa1b2
Show file tree
Hide file tree
Showing 86 changed files with 1,176 additions and 4,937 deletions.
4 changes: 3 additions & 1 deletion Samples/PublicSamples/EchoBot/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,4 +348,6 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
EchoBot/EchoBot/.env
.env

.DS_Store
280 changes: 138 additions & 142 deletions Samples/PublicSamples/EchoBot/ADF/bicep/OMS.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,148 +827,144 @@ resource updateConfigWindows 'Microsoft.Automation/automationAccounts/softwareUp
}
}]

resource VMInsights 'Microsoft.Insights/dataCollectionRules@2021-04-01' = if (bool(Extensions.VMInsights)) {
name: '${DeploymentURI}VMInsights'
location: resourceGroup().location
properties: {
description: 'Data collection rule for VM Insights health.'
dataSources: {
windowsEventLogs: [
{
name: 'cloudSecurityTeamEvents'
streams: [
'Microsoft-WindowsEvent'
]
scheduledTransferPeriod: 'PT1M'
xPathQueries: [
'Security!'
]
}
{
name: 'appTeam1AppEvents'
streams: [
'Microsoft-WindowsEvent'
]
scheduledTransferPeriod: 'PT5M'
xPathQueries: [
'System![System[(Level = 1 or Level = 2 or Level = 3)]]'
'Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]'
]
}
]
syslog: [
{
name: 'cronSyslog'
streams: [
'Microsoft-Syslog'
]
facilityNames: [
'cron'
]
logLevels: [
'Debug'
'Critical'
'Emergency'
]
}
{
name: 'syslogBase'
streams: [
'Microsoft-Syslog'
]
facilityNames: [
'syslog'
]
logLevels: [
'Alert'
'Critical'
'Emergency'
]
}
]
performanceCounters: [
{
name: 'VMHealthPerfCounters'
scheduledTransferPeriod: 'PT1M'
samplingFrequencyInSeconds: 30
counterSpecifiers: [
'\\Memory\\Available Bytes'
'\\Memory\\Committed Bytes'
'\\Processor(_Total)\\% Processor Time'
'\\LogicalDisk(*)\\% Free Space'
'\\LogicalDisk(_Total)\\Free Megabytes'
'\\PhysicalDisk(_Total)\\Avg. Disk Queue Length'
]
streams: [
'Microsoft-Perf'
]
}
{
name: 'appTeamExtraCounters'
streams: [
'Microsoft-Perf'
]
scheduledTransferPeriod: 'PT5M'
samplingFrequencyInSeconds: 30
counterSpecifiers: [
'\\Process(_Total)\\Thread Count'
]
}
]
extensions: [
{
name: 'Microsoft-VMInsights-Health'
streams: [
'Microsoft-HealthStateChange'
]
extensionName: 'HealthExtension'
extensionSettings: {
schemaVersion: '1.0'
contentVersion: ''
healthRuleOverrides: [
{
scopes: [
'*'
]
monitors: [
'root'
]
monitorConfiguration: {}
alertConfiguration: {
isEnabled: true
}
}
]
}
inputDataSources: [
'VMHealthPerfCounters'
]
}
]
}
destinations: {
logAnalytics: [
{
workspaceResourceId: OMS.id
name: 'LogAnalyticsWorkspace'
}
]
}
dataFlows: [
{
streams: [
'Microsoft-HealthStateChange'
'Microsoft-Perf'
'Microsoft-Syslog'
'Microsoft-WindowsEvent'
]
destinations: [
'LogAnalyticsWorkspace'
]
}
]
}
}
// resource VMInsights 'Microsoft.Insights/dataCollectionRules@2022-06-01' = if (bool(Extensions.VMInsights)) {
// name: '${DeploymentURI}VMInsights'
// location: resourceGroup().location
// properties: {
// description: 'Data collection rule for VM Insights health.'
// dataSources: {
// windowsEventLogs: [
// {
// name: 'cloudSecurityTeamEvents'
// streams: [
// 'Microsoft-WindowsEvent'
// ]
// xPathQueries: [
// 'Security!*[System[(Level = 1 or Level = 2 or Level = 3)]]'
// ]
// }
// {
// name: 'appTeam1AppEvents'
// streams: [
// 'Microsoft-WindowsEvent'
// ]
// xPathQueries: [
// 'System![System[(Level = 1 or Level = 2 or Level = 3)]]'
// 'Application!*[System[(Level = 1 or Level = 2 or Level = 3)]]'
// ]
// }
// ]
// syslog: [
// {
// name: 'cronSyslog'
// streams: [
// 'Microsoft-Syslog'
// ]
// facilityNames: [
// 'cron'
// ]
// logLevels: [
// 'Debug'
// 'Critical'
// 'Emergency'
// ]
// }
// {
// name: 'syslogBase'
// streams: [
// 'Microsoft-Syslog'
// ]
// facilityNames: [
// 'syslog'
// ]
// logLevels: [
// 'Alert'
// 'Critical'
// 'Emergency'
// ]
// }
// ]
// performanceCounters: [
// {
// name: 'VMHealthPerfCounters'
// samplingFrequencyInSeconds: 30
// counterSpecifiers: [
// '\\Memory\\Available Bytes'
// '\\Memory\\Committed Bytes'
// '\\Processor(_Total)\\% Processor Time'
// '\\LogicalDisk(*)\\% Free Space'
// '\\LogicalDisk(_Total)\\Free Megabytes'
// '\\PhysicalDisk(_Total)\\Avg. Disk Queue Length'
// ]
// streams: [
// 'Microsoft-Perf'
// ]
// }
// {
// name: 'appTeamExtraCounters'
// streams: [
// 'Microsoft-Perf'
// ]
// samplingFrequencyInSeconds: 30
// counterSpecifiers: [
// '\\Process(_Total)\\Thread Count'
// ]
// }
// ]
// extensions: [
// {
// name: 'Microsoft-VMInsights-Health'
// streams: [
// 'Microsoft-HealthStateChange'
// ]
// extensionName: 'HealthExtension'
// extensionSettings: {
// schemaVersion: '1.0'
// contentVersion: ''
// healthRuleOverrides: [
// {
// scopes: [
// '*'
// ]
// monitors: [
// 'root'
// ]
// monitorConfiguration: {}
// alertConfiguration: {
// isEnabled: true
// }
// }
// ]
// }
// inputDataSources: [
// 'VMHealthPerfCounters'
// ]
// }
// ]
// }
// destinations: {
// logAnalytics: [
// {
// workspaceResourceId: OMS.id
// name: 'LogAnalyticsWorkspace'
// }
// ]
// }
// dataFlows: [
// {
// streams: [
// 'Microsoft-HealthStateChange'
// 'Microsoft-Perf'
// 'Microsoft-Syslog'
// 'Microsoft-WindowsEvent'
// ]
// destinations: [
// 'LogAnalyticsWorkspace'
// ]
// }
// ]
// }
// }

resource AppInsights 'Microsoft.Insights/components@2020-02-02-preview' = {
name: appInsightsName
Expand Down
2 changes: 1 addition & 1 deletion Samples/PublicSamples/EchoBot/ADF/bicep/VMSS-VM.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ resource VMSS 'Microsoft.Compute/virtualMachineScaleSets@2021-07-01' = {
configurationArguments: {
DomainName: contains(Global,'ADDomainName') ? Global.ADDomainName : '${resourceGroup().location}.cloudapp.azure.com'
storageAccountId: saaccountidglobalsource.id
appInsightsInstrumentationKey: ai.properties.InstrumentationKey
appInsightsConnectionString: ai.properties.ConnectionString
deployment: Deployment
networkid: '${networkId}.'
appInfo: contains(AppServer, 'AppInfo') ? string(AppServer.AppInfo) : ''
Expand Down
2 changes: 1 addition & 1 deletion Samples/PublicSamples/EchoBot/ADF/bicep/global/Global-ConfigVM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
"imageReference": {
"publisher": "MicrosoftWindowsServer",
"Offer": "WindowsServer",
"sku": "2022-Datacenter-g2",
"sku": "2022-Datacenter",
"version": "latest"
},
"licenseType": "Windows_Server",
Expand Down
Loading

0 comments on commit 87aa1b2

Please sign in to comment.