From 362cfd7e92880ba44157f858ed3d9d36c0977a2f Mon Sep 17 00:00:00 2001 From: Ayobami Ayodeji Date: Wed, 19 Oct 2022 01:08:42 -0700 Subject: [PATCH 1/4] add telemetry, minor fixes to GUI (#431) * add telemetry, minor fixes to GUI * add telemetry, minor fixes to GUI * change telemetry scope to AKS * fix helper contributor link * improve instructions to change cluster security settings * fixing telemetrydeployment * unpretty * removing principal desc to expedite pr Co-authored-by: Gordon Byers --- CONTRIBUTING.md | 2 +- README.md | 4 +-- bicep/main.bicep | 25 ++++++++++++++++++ helper/src/components/deployTab.js | 2 +- helper/src/components/portalnav.js | 41 +++++++++++++++--------------- referencearchs.md | 4 +-- 6 files changed, 52 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ec6bffa..51c4bd9d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,7 +111,7 @@ Assert-PSRule -Module 'PSRule.Rules.Azure' -InputPath $paramPath -Format File -o The [configuration experience](https://azure.github.io/AKS-Construction/) is hosted in GitHub pages. It's a static web app, written in NodeJS using [FluentUI](https://developer.microsoft.com/en-us/fluentui). -For a deep dive into contributing to the Wizard Web App, please see this [document](docs/ContributingWizard.md). +For a deep dive into contributing to the Wizard Web App, please see this [document](docs/ContributingHelper.md). #### Playwright tests diff --git a/README.md b/README.md index 95f7e2ec..a5a6fd70 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ For a more in depth look at the GitHub Actions used in this project, which steps ## Background -This project unifies guidance provided by the [AKS Secure Baseline](https://docs.microsoft.com/azure/architecture/reference-architectures/containers/aks/secure-baseline-aks), [Well Architected Framework](https://docs.microsoft.com/azure/architecture/framework/), [Cloud Adoption Framework](https://azure.microsoft.com/cloud-adoption-framework/) and [Enterprise-Scale](https://github.com/Azure/Enterprise-Scale) by providing tangible artifacts to deploy Azure resources from CLI or CI/CD systems. +This project unifies guidance provided by the [AKS Secure Baseline](https://docs.microsoft.com/azure/architecture/reference-architectures/containers/aks/secure-baseline-aks), [Well Architected Framework](https://docs.microsoft.com/azure/architecture/framework/), [Cloud Adoption Framework](https://azure.microsoft.com/cloud-adoption-framework/) and [Azure Landing Zones](https://github.com/Azure/Enterprise-Scale) by providing tangible artifacts to deploy Azure resources from CLI or CI/CD systems. -This project is part of the official [AKS Landing Zone Accelerator (Enterprise Scale)](https://github.com/Azure/AKS-Landing-Zone-Accelerator) architectural approach. To read more about this project and how the it fits with Enterprise Scale and the AKS Secure Baseline, look [here](referencearchs.md). +This project is part of the official [AKS Landing Zone Accelerator (Azure Landing Zones)](https://github.com/Azure/AKS-Landing-Zone-Accelerator) architectural approach. To read more about this project and how the it fits with Azure Landing Zones and the AKS Secure Baseline, look [here](referencearchs.md). ## Project Principals diff --git a/bicep/main.bicep b/bicep/main.bicep index 190e4ab6..d6b15745 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -17,6 +17,7 @@ Resource sections 6. Application Gateway 7. AKS 8. Monitoring / Log Analytics +9. Deployment for telemetry */ @@ -1536,5 +1537,29 @@ resource eventGridDiags 'Microsoft.Insights/diagnosticSettings@2021-05-01-previe } } +@description('Enable usage and telemetry feedback to Microsoft.') +param enableTelemetry bool = true + +var telemetryId = '3c1e2fc6-1c4b-44f9-8694-25d00ae30a3a-${location}' + +/*.___________. _______ __ _______ .___ ___. _______ .___________..______ ____ ____ _______ _______ .______ __ ______ ____ ____ .___ ___. _______ .__ __. .___________. +| || ____|| | | ____|| \/ | | ____|| || _ \ \ \ / / | \ | ____|| _ \ | | / __ \ \ \ / / | \/ | | ____|| \ | | | | +`---| |----`| |__ | | | |__ | \ / | | |__ `---| |----`| |_) | \ \/ / | .--. || |__ | |_) | | | | | | | \ \/ / | \ / | | |__ | \| | `---| |----` + | | | __| | | | __| | |\/| | | __| | | | / \_ _/ | | | || __| | ___/ | | | | | | \_ _/ | |\/| | | __| | . ` | | | + | | | |____ | `----.| |____ | | | | | |____ | | | |\ \----. | | | '--' || |____ | | | `----.| `--' | | | | | | | | |____ | |\ | | | + |__| |_______||_______||_______||__| |__| |_______| |__| | _| `._____| |__| |_______/ |_______|| _| |_______| \______/ |__| |__| |__| |_______||__| \__| |__| */ + +// Telemetry Deployment +resource telemetrydeployment 'Microsoft.Resources/deployments@2021-04-01' = if (enableTelemetry) { + name: telemetryId + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#' + contentVersion: '1.0.0.0' + resources: {} + } + } +} //ACSCII Art link : https://textkool.com/en/ascii-art-generator?hl=default&vl=default&font=Star%20Wars&text=changeme diff --git a/helper/src/components/deployTab.js b/helper/src/components/deployTab.js index 7df6d1b9..5683dfb7 100644 --- a/helper/src/components/deployTab.js +++ b/helper/src/components/deployTab.js @@ -418,7 +418,7 @@ az role assignment create --role "Managed Identity Operator" --assignee-principa { urlParams.toString() !== "" && - Not ready to deploy? Bookmark your configuration : here + Not ready to deploy? Bookmark your configuration by copying this link } diff --git a/helper/src/components/portalnav.js b/helper/src/components/portalnav.js index 3c79d19c..88f13331 100644 --- a/helper/src/components/portalnav.js +++ b/helper/src/components/portalnav.js @@ -4,7 +4,7 @@ import { CommandBarButton, Image, ThemeProvider, Link, Toggle, TooltipHost, Pivo import { AzureThemeLight, AzureThemeDark } from '@fluentui/azure-themes'; import { mergeStyles, mergeStyleSets } from '@fluentui/merge-styles'; -import {Presets, SeparatorStyle} from './presets' +import { Presets, SeparatorStyle } from './presets' import NetworkTab from './networkTab' import AddonsTab from './addonsTab' @@ -38,16 +38,16 @@ function Header({ presets, setPresets, selectedPreset, featureFlag }) { return ( -