Merge branch 'main' into config-adr

CDCgov · Dec 19, 2024 · 3db2264 · 3db2264
2 parents 7b985d2 + 679441c
commit 3db2264
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/operations/environments/dev/main.tf b/operations/environments/dev/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.13.0"
+      version = "4.14.0"
     }
   }
 

diff --git a/operations/environments/internal/main.tf b/operations/environments/internal/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.13.0"
+      version = "4.14.0"
     }
   }
 

diff --git a/operations/environments/pr/main.tf b/operations/environments/pr/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.13.0"
+      version = "4.14.0"
     }
   }
 

diff --git a/operations/environments/prd/main.tf b/operations/environments/prd/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.13.0"
+      version = "4.14.0"
     }
   }
 

diff --git a/operations/environments/stg/main.tf b/operations/environments/stg/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "4.13.0"
+      version = "4.14.0"
     }
   }
 

diff --git a/operations/template/logs.tf b/operations/template/logs.tf
@@ -25,14 +25,24 @@ resource "azurerm_log_analytics_query_pack" "application_logs_pack" {
   }
 }
 
-resource "azurerm_log_analytics_query_pack_query" "structured_application_logs" {
-  display_name = "RS SFTP's Raw Application Logs"
-  description  = "View all RS SFTP's application logs in a structured format"
+resource "azurerm_log_analytics_query_pack_query" "live_structured_application_logs" {
+  display_name = "RS SFTP's Live Slot Raw Application Logs"
+  description  = "View RS SFTP's live slot application logs in a structured format"
 
   query_pack_id = azurerm_log_analytics_query_pack.application_logs_pack.id
   categories    = ["applications"]
 
-  body = "AppServiceConsoleLogs | project JsonResult = parse_json(ResultDescription) | evaluate bag_unpack(JsonResult) | project-reorder ['time'], level, msg"
+  body = "AppServiceConsoleLogs | where _ResourceId !contains 'pre-live' | project JsonResult = parse_json(ResultDescription) | evaluate bag_unpack(JsonResult) | project-reorder ['time'], level, msg"
+}
+
+resource "azurerm_log_analytics_query_pack_query" "prelive_structured_application_logs" {
+  display_name = "RS SFTP's Pre-Live Slot Raw Application Logs"
+  description  = "View RS SFTP's pre-live slot application logs in a structured format"
+
+  query_pack_id = azurerm_log_analytics_query_pack.application_logs_pack.id
+  categories    = ["applications"]
+
+  body = "AppServiceConsoleLogs | where _ResourceId contains 'pre-live' | project JsonResult = parse_json(ResultDescription) | evaluate bag_unpack(JsonResult) | project-reorder ['time'], level, msg"
 }
 
 resource "azurerm_monitor_diagnostic_setting" "app_to_logs" {