Merge pull request #5369 from ministryofjustice/feature/analytical-pl…

…atform-ingestion-observability-platform ✨ Add Observability Platform to Analytical Platform Ingestion
ministryofjustice · Mar 14, 2024 · e267398 · e267398
2 parents af65dd7 + bb9692d
commit e267398
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/terraform/environments/analytical-platform-ingestion/application_variables.json b/terraform/environments/analytical-platform-ingestion/application_variables.json
@@ -1,16 +1,12 @@
 {
   "accounts": {
     "development": {
-      "vpc_cidr": "10.0.0.0/16"
-    },
-    "test": {
-      "vpc_cidr": "10.0.0.0/16"
-    },
-    "preproduction": {
-      "vpc_cidr": "10.0.0.0/16"
+      "vpc_cidr": "10.0.0.0/16",
+      "observability_platform": "development"
     },
     "production": {
-      "vpc_cidr": "10.0.0.0/16"
+      "vpc_cidr": "10.0.0.0/16",
+      "observability_platform": "production"
     }
   }
 }
diff --git a/terraform/environments/analytical-platform-ingestion/observability-platform.tf b/terraform/environments/analytical-platform-ingestion/observability-platform.tf
@@ -0,0 +1,9 @@
+module "observability_platform_tenant" {
+  source  = "ministryofjustice/observability-platform-tenant/aws"
+  version = "1.0.0"
+
+  observability_platform_account_id = local.environment_management.account_ids["observability-platform-${local.application_data.accounts[local.environment].observability_platform}"]
+  enable_xray                       = true
+
+  tags = local.tags
+}
diff --git a/terraform/environments/analytical-platform-ingestion/vpc.tf b/terraform/environments/analytical-platform-ingestion/vpc.tf
@@ -27,16 +27,16 @@ module "vpc_endpoints" {
 
   endpoints = {
     logs = {
-      service            = "logs"
-      service_type       = "Interface"
+      service      = "logs"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-logs-api-vpc-endpoint", local.application_name) }
       )
     },
     sts = {
-      service            = "sts"
-      service_type       = "Interface"
+      service      = "sts"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-sts-vpc-endpoint", local.application_name) }