-
Notifications
You must be signed in to change notification settings - Fork 557
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2866 from microsoft/main
Merge latest changes into October release branch
- Loading branch information
Showing
105 changed files
with
44,920 additions
and
374 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
azure_edge_iot_ops_jumpstart/acsa_fault_detection/yaml/acsa-edge-sub-volume.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| apiVersion: "arccontainerstorage.azure.net/v1" | ||
| kind: EdgeSubvolume | ||
| metadata: | ||
| name: videos | ||
| namespace: contoso-hypermarket | ||
| spec: | ||
| edgevolume: acsa-pvc | ||
| path: videos #Don't use a preceding slash. | ||
| auth: | ||
| authType: MANAGED_IDENTITY | ||
| storageaccountendpoint: https://{STORAGEACCOUNT}.blob.core.windows.net/ | ||
| container: shopper-videos | ||
| ingestPolicy: edgeingestpolicy-default |
228 changes: 228 additions & 0 deletions
228
azure_jumpstart_ag/artifacts/PowerShell/AgConfig-contoso-hypermarket.psd1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,228 @@ | ||
| @{ | ||
| # This is the PowerShell datafile used to provide configuration information for the Agora environment. Product keys and password are not encrypted and will be available on host during installation. | ||
|
|
||
| # Directory paths | ||
| AgDirectories = @{ | ||
| AgDir = "C:\Ag" | ||
| AgPowerShellDir = "C:\Ag\PowerShell" | ||
| AgLogsDir = "C:\Ag\Logs" | ||
| AgVMDir = "C:\Ag\Virtual Machines" | ||
| AgIconDir = "C:\Ag\Icons" | ||
| AgTestsDir = "C:\Ag\Tests" | ||
| AgToolsDir = "C:\Tools" | ||
| AgTempDir = "C:\Temp" | ||
| AgVHDXDir = "V:\VMs" | ||
| AgConfigMapDir = "C:\Ag\ConfigMaps" | ||
| AgL1Files = "C:\Ag\L1Files" | ||
| AgAppsRepo = "C:\Ag\AppsRepo" | ||
| AgMonitoringDir = "C:\Ag\Monitoring" | ||
| AgFabric = "C:\Ag\Fabric" | ||
| } | ||
|
|
||
| # Required URLs | ||
| URLs = @{ | ||
| wslUbuntu = 'https://aka.ms/wslubuntu' | ||
| wslStoreStorage = 'https://wslstorestorage.blob.core.windows.net/wslblob/wsl_update_x64.msi' | ||
| docker = 'https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe' | ||
| githubAPI = 'https://api.github.com' | ||
| grafana = 'https://api.github.com/repos/grafana/grafana/releases/latest' | ||
| azurePortal = 'https://portal.azure.com' | ||
| aksEEk3s = 'https://aka.ms/aks-edge/k3s-msi' | ||
| nginx = 'https://kubernetes.github.io/ingress-nginx' | ||
| prometheus = 'https://prometheus-community.github.io/helm-charts' | ||
| vcLibs = 'https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx' | ||
| windowsTerminal = 'https://api.github.com/repos/microsoft/terminal/releases/latest' | ||
| aksEEReleases = 'https://api.github.com/repos/Azure/AKS-Edge/releases' | ||
| mqttExplorerReleases = 'https://api.github.com/repos/thomasnordquist/MQTT-Explorer/releases/latest' | ||
| } | ||
|
|
||
| # Azure required registered resource providers | ||
| AzureProviders = @( | ||
| "Microsoft.Kubernetes", | ||
| "Microsoft.KubernetesConfiguration", | ||
| "Microsoft.ExtendedLocation", | ||
| "Microsoft.HybridCompute", | ||
| "Microsoft.GuestConfiguration", | ||
| "Microsoft.HybridConnectivity", | ||
| "Microsoft.DeviceRegistry", | ||
| "Microsoft.EventGrid", | ||
| "Microsoft.IoTOperationsOrchestrator", | ||
| "Microsoft.IoTOperations", | ||
| "Microsoft.Fabric" | ||
| ) | ||
|
|
||
| # Az CLI required extensions | ||
| AzCLIExtensions = @( | ||
| @{name="k8s-extension"; version="latest"}, | ||
| @{name="k8s-configuration"; version="latest"}, | ||
| @{name="eventgrid"; version="latest"}, | ||
| @{name="customlocation"; version="latest"}, | ||
| @{name="kusto"; version="latest"}, | ||
| @{name="storage-preview"; version="latest"}, | ||
| @{name="azure-iot-ops"; version="latest"}, | ||
| @{name="microsoft-fabric"; version="latest"} | ||
| ) | ||
|
|
||
| # PowerShell modules | ||
| PowerShellModules = @( | ||
| @{name='Az.ConnectedKubernetes'; version="0.10.3"}, | ||
| @{name='Az.KubernetesConfiguration'; version="latest"}, | ||
| @{name='Az.Kusto'; version="latest"}, | ||
| @{name='Az.EventGrid'; version="latest"}, | ||
| @{name='Az.Storage'; version="latest"}, | ||
| @{name='Az.EventHub'; version="latest"}, | ||
| @{name='powershell-yaml'; version="latest"} | ||
| ) | ||
|
|
||
| # Winget packages list | ||
| WingetPackagesList = @( | ||
| 'Microsoft.AzureCLI', | ||
| 'Microsoft.PowerShell', | ||
| 'Microsoft.Bicep', | ||
| 'Kubernetes.kubectl', | ||
| 'Microsoft.Edge', | ||
| 'Microsoft.Azure.AZCopy.10', | ||
| 'Microsoft.VisualStudioCode', | ||
| 'Microsoft.AzureDataStudio', | ||
| 'Microsoft.VisualStudioCode', | ||
| 'Microsoft.SQLServerManagementStudio', | ||
| 'Git.Git', | ||
| '7zip.7zip', | ||
| 'ahmetb.kubectx', | ||
| 'PuTTY.PuTTY', | ||
| 'Helm.Helm', | ||
| 'Microsoft.DotNet.SDK.8', | ||
| 'Microsoft.Sysinternals.ZoomIt', | ||
| 'Microsoft.Sysinternals.BGInfo', | ||
| 'FireDaemon.OpenSSL', | ||
| 'thomasnordquist.MQTT-Explorer', | ||
| 'GitHub.cli', | ||
| 'Python.Python.3.12', | ||
| 'Derailed.k9s' | ||
| ) | ||
|
|
||
| # Pip packages list | ||
| PipPackagesList = @( | ||
| 'paho-mqtt' | ||
| ) | ||
|
|
||
| # VSCode extensions | ||
| VSCodeExtensions = @( | ||
| 'ms-vscode-remote.remote-containers', | ||
| 'ms-vscode-remote.remote-wsl', | ||
| 'ms-vscode.powershell', | ||
| 'redhat.vscode-yaml', | ||
| 'ZainChen.json', | ||
| 'esbenp.prettier-vscode', | ||
| 'ms-kubernetes-tools.vscode-kubernetes-tools', | ||
| 'mindaro.mindaro', | ||
| 'github.vscode-pull-request-github', | ||
| 'ms-mssql.mssql' | ||
| ) | ||
|
|
||
| # Git branches | ||
| GitBranches = @( | ||
| 'production', | ||
| 'staging', | ||
| 'canary' , | ||
| 'main' | ||
| ) | ||
|
|
||
| # VHDX blob url | ||
| ProdVHDBlobURL = 'https://jumpstartprodsg.blob.core.windows.net/agora/base/prod-w11iot/AGBase.vhdx' | ||
| PreProdVHDBlobURL = 'https://jumpstartprodsg.blob.core.windows.net/agora/base/preprod-w11iot/AGBase.vhdx' | ||
|
|
||
| # L1 virtual machine configuration | ||
| HostVMDrive = "V" # This value controls the drive letter where the nested virtual | ||
| L1VMMemory = 32GB # This value controls the amount of RAM for each AKS Edge Essentials host virtual machine | ||
| L1VMNumVCPU = 8 # This value controls the number of vCPUs to assign to each AKS Edge Essentials host virtual machine. | ||
| InternalSwitch = "InternalSwitch" # This value controls the Hyper-V internal switch name used by L0 Azure virtual machine. | ||
| L1Username = "Administrator" # This value controls the Admin credential username for the L1 Hyper-V virtual machines that run on the Agora-Client. | ||
| L1Password = 'Agora123!!' # This value controls the Admin credential password for the L1 Hyper-V virtual machines that run on the Agora-Client. | ||
| L1DefaultGateway = "172.20.1.1" # This value controls the default gateway IP address used by each L1 Hyper-V virtual machines that run on the Agora-Client. | ||
| L1SwitchName = "AKS-Int" # This value controls the Hyper-V internal switch name used by each L1 Hyper-V virtual machines that run on the Agora-Client. | ||
| L1NatSubnetPrefix = "172.20.1.0/24" # This value controls the network subnet used by each L1 Hyper-V virtual machines that run on the Agora-Client. | ||
|
|
||
| # NAT Configuration | ||
| natHostSubnet = "192.168.128.0/24" | ||
| natHostVMSwitchName = "InternalNAT" | ||
| natConfigure = $true | ||
| natSubnet = "192.168.46.0/24" # This value is the subnet is the NAT router will use to route to AzSMGMT to access the Internet. It can be any /24 subnet and is only used for routing. | ||
| natDNS = "%staging-natDNS%" # Do not change - can be configured by passing the optional natDNS parameter to the ARM deployment. | ||
|
|
||
| # Site Kubernetes cluster configurations | ||
| SiteConfig = @{ | ||
| Seattle = @{ | ||
| ArcClusterName = "Ag-K3s-Seattle" | ||
| FriendlyName = "Seattle" | ||
| GrafanaDataSource = "seattle" | ||
| Type = "k3s" | ||
| Branch = "main" | ||
| HelmValuesFile = "prometheus-additional-scrape-config.yaml" | ||
| HelmSetValue = "alertmanager.enabled=false,grafana.enabled=false,prometheus.service.type=LoadBalancer" | ||
| HelmService = "service/prometheus-kube-prometheus-prometheus" | ||
| IsProduction = $true | ||
| } | ||
| Chicago = @{ | ||
| ArcClusterName = "Ag-K3s-Chicago" | ||
| FriendlyName = "Chicago" | ||
| GrafanaDataSource = "chicago" | ||
| Type = "k3s" | ||
| Branch = "main" | ||
| HelmValuesFile = "prometheus-additional-scrape-config.yaml" | ||
| HelmSetValue = "alertmanager.enabled=false,grafana.enabled=false,prometheus.service.type=LoadBalancer" | ||
| HelmService = "service/prometheus-kube-prometheus-prometheus" | ||
| IsProduction = $true | ||
| } | ||
| } | ||
|
|
||
| # Universal resource tag and resource types | ||
| TagName = 'Project' | ||
| TagValue = 'Jumpstart_Agora' | ||
| ArcServerResourceType = 'Microsoft.HybridCompute/machines' | ||
| ArcK8sResourceType = 'Microsoft.Kubernetes/connectedClusters' | ||
| AksResourceType = 'Microsoft.ContainerService/managedClusters' | ||
|
|
||
|
|
||
| # Observability variables | ||
| Monitoring = @{ | ||
| AdminUser = "admin" | ||
| User = "Contoso Operator" | ||
| Email = "[email protected]" | ||
| Namespace = "observability" | ||
| ProdURL = "http://localhost:3000" | ||
| Dashboards = @{ | ||
| "grafana.com" = @() # Dashboards from https://grafana.com/grafana/dashboards | ||
| "custom" = @('node-exporter-full-v2','cluster-global', 'app-workloads', 'app-pods', 'app-store-asset', 'app-store-shoppers', 'app-store-pos') # Dashboards from https://github.com/microsoft/azure_arc/tree/main/azure_jumpstart_ag/artifacts/monitoring | ||
| } | ||
| } | ||
|
|
||
| Namespaces = @( | ||
| "observability" | ||
| "images-cache" | ||
| "contoso-hypermarket" | ||
| ) | ||
|
|
||
| AppConfig = @{ | ||
| inferencing_deployment = @{ | ||
| GitOpsConfigName = "contoso-hypermarket" | ||
| KustomizationName = "contoso-hypermarket" | ||
| KustomizationPath="./agora/contoso_hypermarket" | ||
| Namespace = "contoso-hypermarket" | ||
| Order = 1 | ||
| } | ||
| } | ||
|
|
||
| # Microsoft Edge startup settings variables | ||
| EdgeSettingRegistryPath = 'HKLM:\SOFTWARE\Policies\Microsoft\Edge' | ||
| EdgeSettingValueTrue = '00000001' | ||
| EdgeSettingValueFalse = '00000000' | ||
|
|
||
| FabricConfig = @{ | ||
| WorkspacePrefix = "contoso-hypermarket" | ||
| EventHubSharedAccessKeyName = "FabricSharedAccessKey" | ||
| EventHubName = "contoso-hypermarket" | ||
| EventHubCG = "fabriccg" | ||
| RunFabricSetupAs = "user" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.