Merge pull request #89 from Azure/new-telemetry

chore: remove ephemeral number because of deprecation and use new module telemetry solution
Azure · Aug 5, 2024 · 437a26e · 437a26e
2 parents 73d86d9 + 3a15b7b
commit 437a26e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -9,15 +9,15 @@ Azure OpenAI Terraform Module and Samples
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
 | <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.80 |
-| <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) | >= 0.1.8, < 1.0 |
+| <a name="requirement_modtm"></a> [modtm](#requirement\_modtm) | ~> 0.3 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 3.80 |
-| <a name="provider_modtm"></a> [modtm](#provider\_modtm) | >= 0.1.8, < 1.0 |
+| <a name="provider_modtm"></a> [modtm](#provider\_modtm) | ~> 0.3 |
 | <a name="provider_random"></a> [random](#provider\_random) | >= 3.0 |
 
 ## Modules
@@ -36,11 +36,13 @@ No modules.
 | [azurerm_private_endpoint.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/private_endpoint) | resource |
 | [modtm_telemetry.this](https://registry.terraform.io/providers/Azure/modtm/latest/docs/resources/telemetry) | resource |
 | [random_integer.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
+| [azurerm_client_config.telemetry](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source |
 | [azurerm_private_dns_zone.dns_zone](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/private_dns_zone) | data source |
 | [azurerm_resource_group.pe_vnet_rg](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source |
 | [azurerm_resource_group.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/resource_group) | data source |
 | [azurerm_subnet.pe_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source |
 | [azurerm_virtual_network.vnet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/virtual_network) | data source |
+| [modtm_module_source.telemetry](https://registry.terraform.io/providers/Azure/modtm/latest/docs/data-sources/module_source) | data source |
 
 ## Inputs
 

diff --git a/examples/azureopenai-private-endpoints/providers.tf b/examples/azureopenai-private-endpoints/providers.tf
@@ -9,7 +9,7 @@ terraform {
     }
     modtm = {
       source  = "Azure/modtm"
-      version = ">= 0.1.8, < 1.0"
+      version = "~> 0.3"
     }
   }
 }

diff --git a/examples/azureopenai-public-endpoint/providers.tf b/examples/azureopenai-public-endpoint/providers.tf
@@ -9,7 +9,7 @@ terraform {
     }
     modtm = {
       source  = "Azure/modtm"
-      version = ">= 0.1.8, < 1.0"
+      version = "~> 0.3"
     }
   }
 }

diff --git a/module_telemetry.tf b/module_telemetry.tf
@@ -1,17 +1,14 @@
-resource "modtm_telemetry" "this" {
-  tags = {
+data "azurerm_client_config" "telemetry" {}
 
-    avm_git_commit           = "85058677c04067d191d46e38e173e11d00caafa2"
-    avm_git_file             = "module_telemetry.tf"
-    avm_git_last_modified_at = "2024-01-29 15:15:29"
-    avm_git_org              = "Azure"
-    avm_git_repo             = "terraform-azurerm-openai"
-    avm_yor_name             = "this"
-    avm_yor_trace            = "bbfeb8dc-4a52-40ab-b156-4e709a8e867e"
-  }
-  ephemeral_number = 26737
+data "modtm_module_source" "telemetry" {
+  module_path = path.module
+}
 
-  lifecycle {
-    ignore_changes = [ephemeral_number]
+resource "modtm_telemetry" "this" {
+  tags = {
+    subscription_id = data.azurerm_client_config.telemetry.subscription_id
+    tenant_id       = data.azurerm_client_config.telemetry.tenant_id
+    module_source   = data.modtm_module_source.telemetry.module_source
+    module_version  = data.modtm_module_source.telemetry.module_version
   }
 }
diff --git a/providers.tf b/providers.tf
@@ -9,7 +9,7 @@ terraform {
     }
     modtm = {
       source  = "Azure/modtm"
-      version = ">= 0.1.8, < 1.0"
+      version = "~> 0.3"
     }
     random = {
       source  = "hashicorp/random"