FinOps toolkit 0.2.1 - optimization-workbook update

Azure · Mar 27, 2024 · 0e5049d · 0e5049d
1 parent c6f76b2
commit 0e5049d
Show file tree

Hide file tree

Showing 8 changed files with 471 additions and 3,045 deletions.
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/README.md b/quickstarts/microsoft.costmanagement/optimization-workbook/README.md
@@ -2,14 +2,31 @@
 description: This template creates a new Azure Monitor workbook for cost optimization based on the Well-Architected Framework.
 page_type: sample
 products:
-- azure
-- azure-resource-manager
+ - azure
+ - azure-advisor
+ - azure-app-service
+ - azure-app-service-web
+ - azure-application-gateway
+ - azure-blob-storage
+ - azure-cost-management
+ - azure-disk-storage
+ - azure-kubernetes-service
+ - azure-load-balancer
+ - azure-monitor
+ - azure-resource-manager
+ - azure-sql-database
+ - azure-sql-managed-instance
+ - azure-storage-accounts
+ - azure-virtual-machines
+ - azure-web-apps
+ - sql-server
 urlFragment: optimization-workbook
 languages:
-- bicep
-- json
+ - bicep
+ - json
 ---
-# Cost optimization workbook
+
+# Cost optimization workbook template
 
 ![Azure Public Test Date](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.costmanagement/optimization-workbook/PublicLastTestDate.svg)
 ![Azure Public Test Result](https://azurequickstartsservice.blob.core.windows.net/badges/quickstarts/microsoft.costmanagement/optimization-workbook/PublicDeployment.svg)
@@ -54,9 +71,9 @@ Once your workbook is deployed, you can use it by navigating to one of the follo
 
 ## 🧰 About the FinOps toolkit
 
-The cost optimization workbook is part of the FinOps toolkit, an open source collection of FinOps solutions that help you manage and optimize your cloud costs.
+The cost optimization workbook is part of the [FinOps toolkit](https://aka.ms/finops/toolkit), an open source collection of FinOps solutions that help you manage and optimize your cloud costs.
 
-To learn more about the FinOps toolkit, [join us on GitHub](https://aka.ms/ftk).
+To contribute to the FinOps toolkit, [join us on GitHub](https://aka.ms/ftk).
 
 <br>
 

diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/azuredeploy.json b/quickstarts/microsoft.costmanagement/optimization-workbook/azuredeploy.json
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/azuredeploy.parameters.json b/quickstarts/microsoft.costmanagement/optimization-workbook/azuredeploy.parameters.json
@@ -1,5 +1,4 @@
 {
  "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
- "contentVersion": "1.0.0.0",
- "parameters": {}
+ "contentVersion": "1.0.0.0"
 }
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/ftkver.txt b/quickstarts/microsoft.costmanagement/optimization-workbook/ftkver.txt
@@ -0,0 +1 @@
+0.2.1
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/main.bicep b/quickstarts/microsoft.costmanagement/optimization-workbook/main.bicep
@@ -32,7 +32,13 @@ var workbookJson = string(loadJsonContent('workbook.json'))
 // The last segment of the telemetryId is used to identify this module
 var workbookId = '0b2'
 var telemetryId = '00f120b5-2007-6120-0000-${workbookId}30126b006'
-var finOpsToolkitVersion = loadTextContent('version.txt')
+var finOpsToolkitVersion = loadTextContent('ftkver.txt')
+
+// Add tags to all resources
+var resourceTags = union(tags, {
+ 'ftk-version': finOpsToolkitVersion
+ 'ftk-tool': '${displayName} workbook'
+ })
 
 //==============================================================================
 // Resources
@@ -70,7 +76,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2022-09-01' = if (ena
 resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = {
  name: guid(resourceGroup().id, 'Microsoft.Insights/workbooks', displayName)
  location: location
- tags: tags
+ tags: resourceTags
  kind: 'shared'
  properties: {
  category: 'workbook'

diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/metadata.json b/quickstarts/microsoft.costmanagement/optimization-workbook/metadata.json
@@ -5,5 +5,5 @@
  "summary": "Create a new cost optimization workbook",
  "description": "This template creates a new Azure Monitor workbook for cost optimization based on the Well-Architected Framework.",
  "githubUsername": "arthurclares",
- "dateUpdated": "2024-01-22"
-}
+ "dateUpdated": "2024-01-21"
+}
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/version.txt b/quickstarts/microsoft.costmanagement/optimization-workbook/version.txt
@@ -1 +1 @@
-0.2
+0.2.1-rc.3
diff --git a/quickstarts/microsoft.costmanagement/optimization-workbook/workbook.json b/quickstarts/microsoft.costmanagement/optimization-workbook/workbook.json