diff --git a/aws-observability-terraform/README.md b/aws-observability-terraform/README.md index 2bd879e5..41a4452f 100644 --- a/aws-observability-terraform/README.md +++ b/aws-observability-terraform/README.md @@ -5,14 +5,14 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [aws](#requirement\_aws) | >= 5.16.2, < 6.0.0 | | [random](#requirement\_random) | >= 3.1.0 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#requirement\_time) | >= 0.11.1 | ## Providers | Name | Version | |------|---------| -| [sumologic](#provider\_sumologic) | 2.31.0 | +| [sumologic](#provider\_sumologic) | 2.31.3 | | [time](#provider\_time) | 0.11.1 | ## Modules @@ -68,7 +68,7 @@ | [aws\_account\_alias](#input\_aws\_account\_alias) | Provide the Name/Alias for the AWS environment from which you are collecting data. This name will appear in the Sumo Logic Explorer View, metrics, and logs.
If you are going to deploy the solution in multiple AWS accounts then this value has to be overidden at main.tf file.
Do not include special characters in the alias. | `string` | n/a | yes | | [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | -| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [sumologic\_folder\_installation\_location](#input\_sumologic\_folder\_installation\_location) | Indicates where to install the app folder. Enter "Personal Folder" for installing in "Personal" folder and "Admin Recommended Folder" for installing in "Admin Recommended" folder. | `string` | `"Personal Folder"` | no | | [sumologic\_folder\_share\_with\_org](#input\_sumologic\_folder\_share\_with\_org) | Indicates if AWS Observability folder should be shared (view access) with entire organization. true to enable; false to disable. | `bool` | `true` | no | | [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."
For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes | diff --git a/aws-observability-terraform/app-modules/README.md b/aws-observability-terraform/app-modules/README.md index 88be1531..7abf65d2 100644 --- a/aws-observability-terraform/app-modules/README.md +++ b/aws-observability-terraform/app-modules/README.md @@ -4,13 +4,13 @@ |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.0 | | [null](#requirement\_null) | >= 2.1 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | ## Providers | Name | Version | |------|---------| -| [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#provider\_time) | n/a | ## Modules @@ -60,7 +60,7 @@ | [elasticache\_monitors\_disabled](#input\_elasticache\_monitors\_disabled) | Indicates if Elasticache Apps monitors should be enabled. true to disable; false to enable. | `bool` | `true` | no | | [elb\_monitors\_disabled](#input\_elb\_monitors\_disabled) | Indicates if the ALB Apps monitors should be enabled. true to disable; false to enable. | `bool` | `true` | no | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| `[]` | no | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [folder\_installation\_location](#input\_folder\_installation\_location) | Indicates where to install the app folder. Enter "Personal Folder" for installing in "Personal" folder and "Admin Recommended Folder" for installing in "Admin Recommended" folder. | `string` | `"Personal Folder"` | no | | [folder\_share\_with\_org](#input\_folder\_share\_with\_org) | Indicates if AWS Observability folder should be shared with entire organization. true to enable; false to disable. | `bool` | `true` | no | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | diff --git a/aws-observability-terraform/app-modules/alb/README.md b/aws-observability-terraform/app-modules/alb/README.md index fa6c1689..1913c98f 100644 --- a/aws-observability-terraform/app-modules/alb/README.md +++ b/aws-observability-terraform/app-modules/alb/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/alb/app.tf b/aws-observability-terraform/app-modules/alb/app.tf index 2ed1f7f0..73c62ee5 100644 --- a/aws-observability-terraform/app-modules/alb/app.tf +++ b/aws-observability-terraform/app-modules/alb/app.tf @@ -1,5 +1,6 @@ module "alb_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/alb/variables.tf b/aws-observability-terraform/app-modules/alb/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/alb/variables.tf +++ b/aws-observability-terraform/app-modules/alb/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/apigateway/README.md b/aws-observability-terraform/app-modules/apigateway/README.md index cb8310d5..502ec52d 100644 --- a/aws-observability-terraform/app-modules/apigateway/README.md +++ b/aws-observability-terraform/app-modules/apigateway/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/apigateway/app.tf b/aws-observability-terraform/app-modules/apigateway/app.tf index c4891cd5..98e0dcd5 100644 --- a/aws-observability-terraform/app-modules/apigateway/app.tf +++ b/aws-observability-terraform/app-modules/apigateway/app.tf @@ -1,5 +1,6 @@ module "apigateway_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/apigateway/variables.tf b/aws-observability-terraform/app-modules/apigateway/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/apigateway/variables.tf +++ b/aws-observability-terraform/app-modules/apigateway/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/dynamodb/README.md b/aws-observability-terraform/app-modules/dynamodb/README.md index b6c48aae..fd375aeb 100644 --- a/aws-observability-terraform/app-modules/dynamodb/README.md +++ b/aws-observability-terraform/app-modules/dynamodb/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/dynamodb/app.tf b/aws-observability-terraform/app-modules/dynamodb/app.tf index 49e139b1..e00b68be 100644 --- a/aws-observability-terraform/app-modules/dynamodb/app.tf +++ b/aws-observability-terraform/app-modules/dynamodb/app.tf @@ -1,5 +1,6 @@ module "dynamodb_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/dynamodb/variables.tf b/aws-observability-terraform/app-modules/dynamodb/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/dynamodb/variables.tf +++ b/aws-observability-terraform/app-modules/dynamodb/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/ec2metrics/README.md b/aws-observability-terraform/app-modules/ec2metrics/README.md index 6d97f8be..98f5886f 100644 --- a/aws-observability-terraform/app-modules/ec2metrics/README.md +++ b/aws-observability-terraform/app-modules/ec2metrics/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/ec2metrics/app.tf b/aws-observability-terraform/app-modules/ec2metrics/app.tf index fc3bfb06..d082773a 100644 --- a/aws-observability-terraform/app-modules/ec2metrics/app.tf +++ b/aws-observability-terraform/app-modules/ec2metrics/app.tf @@ -1,5 +1,6 @@ module "ec2metrics_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/ec2metrics/variables.tf b/aws-observability-terraform/app-modules/ec2metrics/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/ec2metrics/variables.tf +++ b/aws-observability-terraform/app-modules/ec2metrics/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/ecs/README.md b/aws-observability-terraform/app-modules/ecs/README.md index 81d4c6ea..d79ec549 100644 --- a/aws-observability-terraform/app-modules/ecs/README.md +++ b/aws-observability-terraform/app-modules/ecs/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/ecs/app.tf b/aws-observability-terraform/app-modules/ecs/app.tf index 160f4038..3075ce51 100644 --- a/aws-observability-terraform/app-modules/ecs/app.tf +++ b/aws-observability-terraform/app-modules/ecs/app.tf @@ -1,5 +1,6 @@ module "ecs_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/ecs/variables.tf b/aws-observability-terraform/app-modules/ecs/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/ecs/variables.tf +++ b/aws-observability-terraform/app-modules/ecs/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/elasticache/README.md b/aws-observability-terraform/app-modules/elasticache/README.md index b50fb1c7..f828e92d 100644 --- a/aws-observability-terraform/app-modules/elasticache/README.md +++ b/aws-observability-terraform/app-modules/elasticache/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/elasticache/app.tf b/aws-observability-terraform/app-modules/elasticache/app.tf index a655ddd0..00ca7aa4 100644 --- a/aws-observability-terraform/app-modules/elasticache/app.tf +++ b/aws-observability-terraform/app-modules/elasticache/app.tf @@ -1,5 +1,6 @@ module "elasticache_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/elasticache/variables.tf b/aws-observability-terraform/app-modules/elasticache/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/elasticache/variables.tf +++ b/aws-observability-terraform/app-modules/elasticache/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/elb/README.md b/aws-observability-terraform/app-modules/elb/README.md index 39307f79..8c9c663d 100644 --- a/aws-observability-terraform/app-modules/elb/README.md +++ b/aws-observability-terraform/app-modules/elb/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/elb/app.tf b/aws-observability-terraform/app-modules/elb/app.tf index 7816a6c7..51b23f08 100644 --- a/aws-observability-terraform/app-modules/elb/app.tf +++ b/aws-observability-terraform/app-modules/elb/app.tf @@ -1,5 +1,6 @@ module "classic_elb_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/elb/variables.tf b/aws-observability-terraform/app-modules/elb/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/elb/variables.tf +++ b/aws-observability-terraform/app-modules/elb/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/lambda/README.md b/aws-observability-terraform/app-modules/lambda/README.md index f2d3cd7d..7a3bb2db 100644 --- a/aws-observability-terraform/app-modules/lambda/README.md +++ b/aws-observability-terraform/app-modules/lambda/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/lambda/app.tf b/aws-observability-terraform/app-modules/lambda/app.tf index ccf64bb6..0d76c4b8 100644 --- a/aws-observability-terraform/app-modules/lambda/app.tf +++ b/aws-observability-terraform/app-modules/lambda/app.tf @@ -1,5 +1,6 @@ module "lambda_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/lambda/variables.tf b/aws-observability-terraform/app-modules/lambda/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/lambda/variables.tf +++ b/aws-observability-terraform/app-modules/lambda/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/main.tf b/aws-observability-terraform/app-modules/main.tf index 0b36c1b0..83cd9199 100644 --- a/aws-observability-terraform/app-modules/main.tf +++ b/aws-observability-terraform/app-modules/main.tf @@ -34,8 +34,14 @@ resource "sumologic_content_permission" "share_with_org" { } } +resource "time_sleep" "wait_for_5_minutes" { + #depends_on = [module.overview_app] + create_duration = "300s" +} + # Install the overview app and resources. module "overview_app" { + depends_on = [time_sleep.wait_for_5_minutes] source = "./overview" access_id = var.access_id @@ -45,11 +51,6 @@ module "overview_app" { app_folder_id = sumologic_folder.apps_folder.id } -resource "time_sleep" "wait_for_5_minutes" { - depends_on = [module.overview_app] - create_duration = "300s" -} - # Install the ec2metrics app and resources. module "ec2metrics_app" { depends_on = [time_sleep.wait_for_5_minutes] diff --git a/aws-observability-terraform/app-modules/nlb/README.md b/aws-observability-terraform/app-modules/nlb/README.md index 5558628a..15e37529 100644 --- a/aws-observability-terraform/app-modules/nlb/README.md +++ b/aws-observability-terraform/app-modules/nlb/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/nlb/app.tf b/aws-observability-terraform/app-modules/nlb/app.tf index 3854ac1c..d93e9fc3 100644 --- a/aws-observability-terraform/app-modules/nlb/app.tf +++ b/aws-observability-terraform/app-modules/nlb/app.tf @@ -1,5 +1,6 @@ module "nlb_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/nlb/variables.tf b/aws-observability-terraform/app-modules/nlb/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/nlb/variables.tf +++ b/aws-observability-terraform/app-modules/nlb/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/overview/README.md b/aws-observability-terraform/app-modules/overview/README.md index f3c75155..98e4a9a5 100644 --- a/aws-observability-terraform/app-modules/overview/README.md +++ b/aws-observability-terraform/app-modules/overview/README.md @@ -23,7 +23,7 @@ No resources. | [access\_id](#input\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [access\_key](#input\_access\_key) | Sumo Logic Access Key. | `string` | n/a | yes | | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | ## Outputs diff --git a/aws-observability-terraform/app-modules/overview/app.tf b/aws-observability-terraform/app-modules/overview/app.tf index e441b53d..dc620504 100644 --- a/aws-observability-terraform/app-modules/overview/app.tf +++ b/aws-observability-terraform/app-modules/overview/app.tf @@ -1,5 +1,6 @@ module "overview_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/overview/variables.tf b/aws-observability-terraform/app-modules/overview/variables.tf index 19d4021a..34830eed 100644 --- a/aws-observability-terraform/app-modules/overview/variables.tf +++ b/aws-observability-terraform/app-modules/overview/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/rce/README.md b/aws-observability-terraform/app-modules/rce/README.md index c0b59ec3..3dac2534 100644 --- a/aws-observability-terraform/app-modules/rce/README.md +++ b/aws-observability-terraform/app-modules/rce/README.md @@ -27,7 +27,7 @@ No requirements. | [access\_id](#input\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [access\_key](#input\_access\_key) | Sumo Logic Access Key. | `string` | n/a | yes | | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | ## Outputs diff --git a/aws-observability-terraform/app-modules/rce/app.tf b/aws-observability-terraform/app-modules/rce/app.tf index bfc63a3a..2e46f931 100644 --- a/aws-observability-terraform/app-modules/rce/app.tf +++ b/aws-observability-terraform/app-modules/rce/app.tf @@ -1,5 +1,6 @@ module "rce_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/rce/variables.tf b/aws-observability-terraform/app-modules/rce/variables.tf index 19d4021a..34830eed 100644 --- a/aws-observability-terraform/app-modules/rce/variables.tf +++ b/aws-observability-terraform/app-modules/rce/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/rds/README.md b/aws-observability-terraform/app-modules/rds/README.md index 28cb064e..3c4a0d2c 100644 --- a/aws-observability-terraform/app-modules/rds/README.md +++ b/aws-observability-terraform/app-modules/rds/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/rds/app.tf b/aws-observability-terraform/app-modules/rds/app.tf index 41884afb..ea738ed5 100644 --- a/aws-observability-terraform/app-modules/rds/app.tf +++ b/aws-observability-terraform/app-modules/rds/app.tf @@ -1,5 +1,6 @@ module "rds_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/rds/variables.tf b/aws-observability-terraform/app-modules/rds/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/rds/variables.tf +++ b/aws-observability-terraform/app-modules/rds/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/sns/README.md b/aws-observability-terraform/app-modules/sns/README.md index 7ced6902..ffd0aa11 100644 --- a/aws-observability-terraform/app-modules/sns/README.md +++ b/aws-observability-terraform/app-modules/sns/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/sns/app.tf b/aws-observability-terraform/app-modules/sns/app.tf index 03813905..af619c58 100644 --- a/aws-observability-terraform/app-modules/sns/app.tf +++ b/aws-observability-terraform/app-modules/sns/app.tf @@ -1,5 +1,6 @@ module "sns_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/sns/variables.tf b/aws-observability-terraform/app-modules/sns/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/sns/variables.tf +++ b/aws-observability-terraform/app-modules/sns/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/sqs/README.md b/aws-observability-terraform/app-modules/sqs/README.md index 54329640..c6267e02 100644 --- a/aws-observability-terraform/app-modules/sqs/README.md +++ b/aws-observability-terraform/app-modules/sqs/README.md @@ -25,7 +25,7 @@ No resources. | [app\_folder\_id](#input\_app\_folder\_id) | Please provide a folder ID where you would like the app to be installed. | `string` | `""` | no | | [connection\_notifications](#input\_connection\_notifications) | Connection Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      connection_id         = string,
      payload_override      = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | | [email\_notifications](#input\_email\_notifications) | Email Notifications to be sent by the alert. | 
list(object(
    {
      connection_type       = string,
      recipients            = list(string),
      subject               = string,
      time_zone             = string,
      message_body          = string,
      run_for_trigger_types = list(string)
    }
  ))
| n/a | yes | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [group\_notifications](#input\_group\_notifications) | Whether or not to group notifications for individual items that meet the trigger condition. Defaults to true. | `bool` | `true` | no | | [json\_file\_directory\_path](#input\_json\_file\_directory\_path) | Directory path where all the JSONs are present. | `string` | n/a | yes | | [monitor\_folder\_id](#input\_monitor\_folder\_id) | Please provide a folder ID where you would like the monitors to be installed. | `string` | `""` | no | diff --git a/aws-observability-terraform/app-modules/sqs/app.tf b/aws-observability-terraform/app-modules/sqs/app.tf index fe0072d4..c691eaba 100644 --- a/aws-observability-terraform/app-modules/sqs/app.tf +++ b/aws-observability-terraform/app-modules/sqs/app.tf @@ -1,5 +1,6 @@ module "sqs_module" { - source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" + source = "git::https://github.com/SumoLogic/terraform-sumologic-sumo-logic-integrations.git//sumologic?ref=sumo_246624" + #source = "SumoLogic/sumo-logic-integrations/sumologic//sumologic" access_id = var.access_id access_key = var.access_key diff --git a/aws-observability-terraform/app-modules/sqs/variables.tf b/aws-observability-terraform/app-modules/sqs/variables.tf index fe02d594..bf0630f8 100644 --- a/aws-observability-terraform/app-modules/sqs/variables.tf +++ b/aws-observability-terraform/app-modules/sqs/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/variables.tf b/aws-observability-terraform/app-modules/variables.tf index 09bf2a71..c06177a8 100644 --- a/aws-observability-terraform/app-modules/variables.tf +++ b/aws-observability-terraform/app-modules/variables.tf @@ -1,6 +1,6 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/app-modules/versions.tf b/aws-observability-terraform/app-modules/versions.tf index 9be0b77a..905d5db9 100644 --- a/aws-observability-terraform/app-modules/versions.tf +++ b/aws-observability-terraform/app-modules/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 2.1" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } } diff --git a/aws-observability-terraform/cloudformation-module/README.md b/aws-observability-terraform/cloudformation-module/README.md index dc87a4c0..517b4992 100644 --- a/aws-observability-terraform/cloudformation-module/README.md +++ b/aws-observability-terraform/cloudformation-module/README.md @@ -63,7 +63,7 @@ Configure the following parameters in `main_variables.auto.tfvars`. For more det | Parameter |Description |Default Value | --- | --- | --- | | CloudFormationStackName | A unique name for your AWS CloudFormation Stack | | -| Section1aSumoLogicDeployment | Enter au, ca, de, eu, jp, us2, in, fed or us1. [Visit](https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security) | | +| Section1aSumoLogicDeployment | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. [Visit](https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security) | | | Section1bSumoLogicAccessID | Sumo Logic Access ID. [Visit](https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key) | | | Section1cSumoLogicAccessKey| Sumo Logic Access Key. | | | Section1dSumoLogicOrganizationId | Appears on the Account Overview page that displays information about your Sumo Logic organization. Used for IAM Role in Sumo Logic AWS Sources. [Visit](https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page) | | diff --git a/aws-observability-terraform/cloudformation-module/variables.tf b/aws-observability-terraform/cloudformation-module/variables.tf index 7c547067..d100ca63 100644 --- a/aws-observability-terraform/cloudformation-module/variables.tf +++ b/aws-observability-terraform/cloudformation-module/variables.tf @@ -12,7 +12,7 @@ variable "CloudFormationStackName" { # Sumo Logic Access Configuration (Required) variable "Section1aSumoLogicDeployment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ "au", diff --git a/aws-observability-terraform/cloudformation-module/versions.tf b/aws-observability-terraform/cloudformation-module/versions.tf index 261eae2c..1b89835c 100644 --- a/aws-observability-terraform/cloudformation-module/versions.tf +++ b/aws-observability-terraform/cloudformation-module/versions.tf @@ -9,7 +9,7 @@ terraform { version = "~> 2.1" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } } diff --git a/aws-observability-terraform/examples/appmodule/README.md b/aws-observability-terraform/examples/appmodule/README.md index 124e6171..66fef321 100644 --- a/aws-observability-terraform/examples/appmodule/README.md +++ b/aws-observability-terraform/examples/appmodule/README.md @@ -5,14 +5,14 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 | | [random](#requirement\_random) | >= 3.1.0 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#requirement\_time) | >= 0.11.1 | ## Providers | Name | Version | |------|---------| -| [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#provider\_time) | >= 0.11.1 | ## Modules @@ -74,7 +74,7 @@ | [sumo\_api\_endpoint](#input\_sumo\_api\_endpoint) | n/a | `string` | n/a | yes | | [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | -| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [sumologic\_folder\_installation\_location](#input\_sumologic\_folder\_installation\_location) | Indicates where to install the app folder. Enter "Personal Folder" for installing in "Personal" folder and "Admin Recommended Folder" for installing in "Admin Recommended" folder. | `string` | `"Personal Folder"` | no | | [sumologic\_folder\_share\_with\_org](#input\_sumologic\_folder\_share\_with\_org) | Indicates if AWS Observability folder should be shared (view access) with entire organization. true to enable; false to disable. | `bool` | `true` | no | | [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."
For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes | diff --git a/aws-observability-terraform/examples/appmodule/variables.tf b/aws-observability-terraform/examples/appmodule/variables.tf index 0bc0872c..6721fea1 100644 --- a/aws-observability-terraform/examples/appmodule/variables.tf +++ b/aws-observability-terraform/examples/appmodule/variables.tf @@ -1,6 +1,6 @@ variable "sumologic_environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "sumologic_environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.sumologic_environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.sumologic_environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } @@ -89,7 +90,7 @@ variable "sumo_api_endpoint" { validation { condition = contains([ "https://api.au.sumologic.com/api/", - "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/"], var.sumo_api_endpoint) + "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/", "https://api.kr.sumologic.com/api/"], var.sumo_api_endpoint) error_message = "Argument \"sumo_api_endpoint\" must be one of the values specified at https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security." } } diff --git a/aws-observability-terraform/examples/appmodule/versions.tf b/aws-observability-terraform/examples/appmodule/versions.tf index 9a357ee9..e3956d93 100644 --- a/aws-observability-terraform/examples/appmodule/versions.tf +++ b/aws-observability-terraform/examples/appmodule/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 5.16.2, < 6.0.0" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } time = { diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md b/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md index 90cfc88c..bb430957 100644 --- a/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md +++ b/aws-observability-terraform/examples/sourcemodule/overrideSources/README.md @@ -5,14 +5,14 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 | | [random](#requirement\_random) | >= 3.1.0 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#requirement\_time) | >= 0.11.1 | ## Providers | Name | Version | |------|---------| -| [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#provider\_time) | >= 0.11.1 | ## Modules @@ -88,7 +88,7 @@ | [sumo\_api\_endpoint](#input\_sumo\_api\_endpoint) | n/a | `string` | n/a | yes | | [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | -| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [sumologic\_folder\_installation\_location](#input\_sumologic\_folder\_installation\_location) | Indicates where to install the app folder. Enter "Personal Folder" for installing in "Personal" folder and "Admin Recommended Folder" for installing in "Admin Recommended" folder. | `string` | `"Personal Folder"` | no | | [sumologic\_folder\_share\_with\_org](#input\_sumologic\_folder\_share\_with\_org) | Indicates if AWS Observability folder should be shared (view access) with entire organization. true to enable; false to disable. | `bool` | `true` | no | | [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."
For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes | diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf b/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf index 75f5ee84..caef221d 100644 --- a/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf +++ b/aws-observability-terraform/examples/sourcemodule/overrideSources/variables.tf @@ -1,6 +1,6 @@ variable "sumologic_environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "sumologic_environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.sumologic_environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.sumologic_environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } @@ -89,7 +90,7 @@ variable "sumo_api_endpoint" { validation { condition = contains([ "https://api.au.sumologic.com/api/", - "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/"], var.sumo_api_endpoint) + "https://api.ca.sumologic.com/api/", "https://api.de.sumologic.com/api/", "https://api.eu.sumologic.com/api/", "https://api.fed.sumologic.com/api/", "https://api.in.sumologic.com/api/", "https://api.jp.sumologic.com/api/", "https://api.sumologic.com/api/", "https://api.us2.sumologic.com/api/", "https://api.kr.sumologic.com/api/"], var.sumo_api_endpoint) error_message = "Argument \"sumo_api_endpoint\" must be one of the values specified at https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security." } } diff --git a/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf b/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf index 9a357ee9..e3956d93 100644 --- a/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf +++ b/aws-observability-terraform/examples/sourcemodule/overrideSources/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 5.16.2, < 6.0.0" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } time = { diff --git a/aws-observability-terraform/examples/sourcemodule/testSource/README.md b/aws-observability-terraform/examples/sourcemodule/testSource/README.md index 9fc197d4..05f8d2de 100644 --- a/aws-observability-terraform/examples/sourcemodule/testSource/README.md +++ b/aws-observability-terraform/examples/sourcemodule/testSource/README.md @@ -5,14 +5,14 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [aws](#requirement\_aws) | >= 3.42.0, < 4.0.0 | | [random](#requirement\_random) | >= 3.1.0 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#requirement\_time) | >= 0.11.1 | ## Providers | Name | Version | |------|---------| -| [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#provider\_time) | >= 0.11.1 | ## Modules @@ -86,7 +86,7 @@ | [sumo\_api\_endpoint](#input\_sumo\_api\_endpoint) | n/a | `string` | n/a | yes | | [sumologic\_access\_id](#input\_sumologic\_access\_id) | Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | | [sumologic\_access\_key](#input\_sumologic\_access\_key) | Sumo Logic Access Key. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key | `string` | n/a | yes | -| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [sumologic\_environment](#input\_sumologic\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [sumologic\_folder\_installation\_location](#input\_sumologic\_folder\_installation\_location) | Indicates where to install the app folder. Enter "Personal Folder" for installing in "Personal" folder and "Admin Recommended Folder" for installing in "Admin Recommended" folder. | `string` | `"Personal Folder"` | no | | [sumologic\_folder\_share\_with\_org](#input\_sumologic\_folder\_share\_with\_org) | Indicates if AWS Observability folder should be shared (view access) with entire organization. true to enable; false to disable. | `bool` | `true` | no | | [sumologic\_organization\_id](#input\_sumologic\_organization\_id) | You can find your org on the Preferences page in the Sumo Logic UI. For more information, see the Preferences Page topic. Your org ID will be used to configure the IAM Role for Sumo Logic AWS Sources."
For more details, visit https://help.sumologic.com/01Start-Here/05Customize-Your-Sumo-Logic-Experience/Preferences-Page | `string` | n/a | yes | diff --git a/aws-observability-terraform/examples/sourcemodule/testSource/variables.tf b/aws-observability-terraform/examples/sourcemodule/testSource/variables.tf index 75f5ee84..0e02da87 100644 --- a/aws-observability-terraform/examples/sourcemodule/testSource/variables.tf +++ b/aws-observability-terraform/examples/sourcemodule/testSource/variables.tf @@ -1,6 +1,6 @@ variable "sumologic_environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "sumologic_environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.sumologic_environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.sumologic_environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf b/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf index 9a357ee9..e3956d93 100644 --- a/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf +++ b/aws-observability-terraform/examples/sourcemodule/testSource/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 5.16.2, < 6.0.0" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } time = { diff --git a/aws-observability-terraform/fields.sh b/aws-observability-terraform/fields.sh index 7fa7d749..7329bb1b 100644 --- a/aws-observability-terraform/fields.sh +++ b/aws-observability-terraform/fields.sh @@ -10,8 +10,8 @@ #----------------------------------------------------------------------------------------------------------------------------------------------------------- # Validate Sumo Logic environment/deployment. -if ! [[ "$SUMOLOGIC_ENV" =~ ^(au|ca|de|eu|jp|us2|in|fed|us1)$ ]]; then - echo "$SUMOLOGIC_ENV is invalid Sumo Logic deployment. For SUMOLOGIC_ENV, provide one from list : au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" +if ! [[ "$SUMOLOGIC_ENV" =~ ^(au|ca|de|eu|jp|us2|in|fed|us1|kr)$ ]]; then + echo "$SUMOLOGIC_ENV is invalid Sumo Logic deployment. For SUMOLOGIC_ENV, provide one from list : au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" exit 1 fi diff --git a/aws-observability-terraform/source-module/README.md b/aws-observability-terraform/source-module/README.md index 8e22a733..46fba312 100644 --- a/aws-observability-terraform/source-module/README.md +++ b/aws-observability-terraform/source-module/README.md @@ -5,7 +5,7 @@ | [terraform](#requirement\_terraform) | >= 0.13.0 | | [aws](#requirement\_aws) | >= 5.16.2, < 6.0.0 | | [random](#requirement\_random) | >= 3.1.0 | -| [sumologic](#requirement\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#requirement\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#requirement\_time) | >= 0.11.1 | ## Providers @@ -15,7 +15,7 @@ | [aws](#provider\_aws) | >= 5.16.2, < 6.0.0 | | [null](#provider\_null) | n/a | | [random](#provider\_random) | >= 3.1.0 | -| [sumologic](#provider\_sumologic) | >= 2.31.0, < 3.0.0 | +| [sumologic](#provider\_sumologic) | >= 2.31.3, < 3.0.0 | | [time](#provider\_time) | >= 0.11.1 | ## Modules @@ -89,7 +89,7 @@ | [collect\_root\_cause\_data](#input\_collect\_root\_cause\_data) | Select the Sumo Logic Root Cause Explorer Source.
You have the following options:
Inventory Source - Creates a Sumo Logic Inventory Source used by Root Cause Explorer.
Xray Source - Creates a Sumo Logic AWS X-Ray Source that collects X-Ray Trace Metrics from your AWS account.
Both - Install both Inventory and Xray sources.
None - Skips installation of both sources. | `string` | `"Both"` | no | | [elb\_log\_source\_url](#input\_elb\_log\_source\_url) | Required if you are already collecting ALB logs. Provide the existing Sumo Logic ALB Source API URL. The account, accountid, and region fields will be added to the Source. For information on how to determine the URL, see [View or Download Source JSON Configuration](https://help.sumologic.com/03Send-Data/Sources/03Use-JSON-to-Configure-Sources/Local-Configuration-File-Management/View-or-Download-Source-JSON-Configuration). | `string` | `""` | no | | [elb\_source\_details](#input\_elb\_source\_details) | Provide details for the Sumo Logic ALB source. If not provided, then defaults will be used.
To enable collection of application load balancer logs, set collect\_elb\_logs to true and provide configuration information for the bucket.
If create\_bucket is false, provide a name of an existing S3 bucket where you would like to store loadbalancer logs. If this is empty, a new bucket will be created in the region.
If create\_bucket is true, the script creates a bucket, the name of the bucket has to be unique; this is achieved internally by generating a random-id and then post-fixing it to the “aws-observability-” string.
path\_expression - This is required in case the above existing bucket is already configured to receive ALB access logs. If this is blank, Sumo Logic will store logs in the path expression: *elasticloadbalancing/AWSLogs/*/elasticloadbalancing/*/* | 
object({
    source_name     = string
    source_category = string
    description     = string
    bucket_details = object({
      create_bucket        = bool
      bucket_name          = string
      path_expression      = string
      force_destroy_bucket = bool
    })
    fields = map(string)
  })
| 
{
  "bucket_details": {
    "bucket_name": "aws-observability-random-id",
    "create_bucket": true,
    "force_destroy_bucket": true,
    "path_expression": "*elasticloadbalancing/AWSLogs//elasticloadbalancing//*"
  },
  "description": "This source is created using Sumo Logic terraform AWS Observability module to collect AWS Application LoadBalancer logs.",
  "fields": {},
  "source_category": "aws/observability/alb/logs",
  "source_name": "Elb Logs (Region)"
}
| no | -| [environment](#input\_environment) | Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | +| [environment](#input\_environment) | Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security | `string` | n/a | yes | | [existing\_iam\_details](#input\_existing\_iam\_details) | Provide an existing AWS IAM role arn value which provides access to AWS S3 Buckets, AWS CloudWatch Metrics API and Sumo Logic Inventory data.
If kept empty, a new IAM role will be created with the required permissions.
For more details on permissions, check the iam policy tmpl files at /source-module/templates folder. | 
object({
    create_iam_role = bool
    iam_role_arn    = string
  })
| 
{
  "create_iam_role": true,
  "iam_role_arn": ""
}
| no | | [inventory\_source\_details](#input\_inventory\_source\_details) | Provide details for the Sumo Logic AWS Inventory source. If not provided, then defaults will be used. | 
object({
    source_name         = string
    source_category     = string
    description         = string
    limit_to_namespaces = list(string)
    fields              = map(string)
  })
| 
{
  "description": "This source is created using Sumo Logic terraform AWS Observability module to collect AWS inventory metadata.",
  "fields": {},
  "limit_to_namespaces": [
    "AWS/ApplicationELB",
    "AWS/ApiGateway",
    "AWS/DynamoDB",
    "AWS/Lambda",
    "AWS/RDS",
    "AWS/ECS",
    "AWS/ElastiCache",
    "AWS/ELB",
    "AWS/NetworkELB",
    "AWS/SQS",
    "AWS/SNS",
    "AWS/AutoScaling",
    "AWS/EC2"
  ],
  "source_category": "aws/observability/inventory",
  "source_name": "AWS Inventory (Region)"
}
| no | | [sumologic\_collector\_details](#input\_sumologic\_collector\_details) | Provide details for the Sumo Logic collector. If not provided, then defaults will be used.
The Collector will be created if any new source will be created and \"sumologic\_existing\_collector\_id\" is empty. | 
object({
    collector_name = string
    description    = string
    fields         = map(string)
  })
| 
{
  "collector_name": "AWS Observability (AWS Account Alias) (Account ID)",
  "description": "This collector is created using Sumo Logic terraform AWS Observability module.",
  "fields": {}
}
| no | diff --git a/aws-observability-terraform/source-module/main.tf b/aws-observability-terraform/source-module/main.tf index eb933a96..c6912d52 100644 --- a/aws-observability-terraform/source-module/main.tf +++ b/aws-observability-terraform/source-module/main.tf @@ -25,7 +25,6 @@ resource "time_sleep" "wait_for_minutes" { module "cloudtrail_module" { depends_on = [time_sleep.wait_for_minutes] for_each = toset(local.create_cloudtrail_source ? ["cloudtrail_module"] : []) - source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudtrail" create_collector = false @@ -64,7 +63,6 @@ module "cloudtrail_module" { module "elb_module" { depends_on = [time_sleep.wait_for_minutes] for_each = toset(local.create_elb_source ? ["elb_module"] : []) - source = "SumoLogic/sumo-logic-integrations/sumologic//aws/elb" create_collector = false @@ -98,7 +96,7 @@ module "elb_module" { } auto_enable_access_logs = var.auto_enable_access_logs - app_semantic_version = "1.0.12" + app_semantic_version = "1.0.14" auto_enable_access_logs_options = { filter = "'Type': 'application'|'type': 'application'" remove_on_delete_stack = true @@ -142,7 +140,7 @@ module "classic_lb_module" { } } auto_enable_access_logs = var.auto_enable_classic_lb_access_logs - app_semantic_version = "1.0.12" + app_semantic_version = "1.0.14" auto_enable_access_logs_options = { bucket_prefix = local.auto_classic_lb_path_exp auto_enable_logging = "ELB" @@ -154,7 +152,6 @@ module "classic_lb_module" { module "cloudwatch_metrics_source_module" { depends_on = [time_sleep.wait_for_minutes] for_each = local.create_cw_metrics_source ? toset(var.cloudwatch_metrics_source_details.limit_to_namespaces) : [] - source = "SumoLogic/sumo-logic-integrations/sumologic//aws/cloudwatchmetrics" create_collector = false @@ -182,7 +179,6 @@ module "cloudwatch_metrics_source_module" { module "kinesis_firehose_for_metrics_source_module" { depends_on = [time_sleep.wait_for_minutes] for_each = toset(local.create_kf_metrics_source ? ["kinesis_firehose_for_metrics_source_module"] : []) - source = "SumoLogic/sumo-logic-integrations/sumologic//aws/kinesisfirehoseformetrics" create_collector = false diff --git a/aws-observability-terraform/source-module/variables.tf b/aws-observability-terraform/source-module/variables.tf index d302ab2d..45dd2f08 100644 --- a/aws-observability-terraform/source-module/variables.tf +++ b/aws-observability-terraform/source-module/variables.tf @@ -1,20 +1,21 @@ variable "environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { - condition = contains([ - "au", - "ca", - "de", - "eu", - "jp", - "us1", - "us2", - "in", - "fed"], var.environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." - } + condition = contains([ + "au", + "ca", + "de", + "eu", + "fed", + "in", + "jp", + "kr", + "us1", + "us2"], var.environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." + } } variable "access_id" { diff --git a/aws-observability-terraform/source-module/versions.tf b/aws-observability-terraform/source-module/versions.tf index 9a357ee9..e3956d93 100644 --- a/aws-observability-terraform/source-module/versions.tf +++ b/aws-observability-terraform/source-module/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 5.16.2, < 6.0.0" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } time = { diff --git a/aws-observability-terraform/variables.tf b/aws-observability-terraform/variables.tf index ed784af3..9277864c 100644 --- a/aws-observability-terraform/variables.tf +++ b/aws-observability-terraform/variables.tf @@ -1,6 +1,6 @@ variable "sumologic_environment" { type = string - description = "Enter au, ca, de, eu, jp, us2, in, fed or us1. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + description = "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. For more information on Sumo Logic deployments visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" validation { condition = contains([ @@ -8,12 +8,13 @@ variable "sumologic_environment" { "ca", "de", "eu", + "fed", + "in", "jp", + "kr", "us1", - "us2", - "in", - "fed"], var.sumologic_environment) - error_message = "The value must be one of au, ca, de, eu, jp, us1, us2, in, or fed." + "us2"], var.sumologic_environment) + error_message = "The value must be one of au, ca, de, eu, fed, in, jp, kr, us1 or us2." } } diff --git a/aws-observability-terraform/versions.tf b/aws-observability-terraform/versions.tf index 9a357ee9..e3956d93 100644 --- a/aws-observability-terraform/versions.tf +++ b/aws-observability-terraform/versions.tf @@ -7,7 +7,7 @@ terraform { version = ">= 5.16.2, < 6.0.0" } sumologic = { - version = ">= 2.31.0, < 3.0.0" + version = ">= 2.31.3, < 3.0.0" source = "SumoLogic/sumologic" } time = { diff --git a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip deleted file mode 100644 index 44e42d3a..00000000 Binary files a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip and /dev/null differ diff --git a/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip new file mode 100644 index 00000000..0dc0a44b Binary files /dev/null and b/aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip differ diff --git a/aws-observability/apps/alb/alb_app.template.yaml b/aws-observability/apps/alb/alb_app.template.yaml index bfbd0121..34bc6545 100755 --- a/aws-observability/apps/alb/alb_app.template.yaml +++ b/aws-observability/apps/alb/alb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -93,7 +93,7 @@ Metadata: Parameters: Section1aSumoDeployment: Type: String - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Default: "" Section1bSumoAccessID: Type: String @@ -291,10 +291,10 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 CodeUri: Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: diff --git a/aws-observability/apps/apigateway/api_gateway_app.template.yaml b/aws-observability/apps/apigateway/api_gateway_app.template.yaml index de1655b2..ba1c4b9c 100755 --- a/aws-observability/apps/apigateway/api_gateway_app.template.yaml +++ b/aws-observability/apps/apigateway/api_gateway_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/autoenable/auto_enable.template.yaml b/aws-observability/apps/autoenable/auto_enable.template.yaml index ead02638..44eae706 100644 --- a/aws-observability/apps/autoenable/auto_enable.template.yaml +++ b/aws-observability/apps/autoenable/auto_enable.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution." Parameters: SumoLogicResourceRemoveOnDeleteStack: @@ -124,7 +124,7 @@ Resources: Properties: Location: ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-s3-logging-auto-enable - SemanticVersion: 1.0.12 + SemanticVersion: 1.0.14 Parameters: BucketName: !Ref ALBS3LogsBucketName BucketPrefix: "elasticloadbalancing" @@ -139,7 +139,7 @@ Resources: Properties: Location: ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-s3-logging-auto-enable - SemanticVersion: 1.0.12 + SemanticVersion: 1.0.14 Parameters: BucketName: !Ref ELBS3LogsBucketName BucketPrefix: !Ref ELBS3LogsBucketPrefix diff --git a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml index fb5c7e54..d3c380e8 100644 --- a/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml +++ b/aws-observability/apps/cloudwatchmetrics/cloudwatchmetrics.template.yaml @@ -1,12 +1,12 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces." +Description: "Version - v2.10.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces." Parameters: SumoLogicDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" SumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/common/resources.template.yaml b/aws-observability/apps/common/resources.template.yaml index ccc277f9..edb363a5 100755 --- a/aws-observability/apps/common/resources.template.yaml +++ b/aws-observability/apps/common/resources.template.yaml @@ -1,12 +1,12 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics." +Description: "Version - v2.10.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics." Parameters: SumoLogicDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" SumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." @@ -483,11 +483,11 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 Description: "Lambda Function for deploying SumoLogic AWS Observability Solution." CodeUri: Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: @@ -527,11 +527,11 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 Description: "Lambda Function for deploying SumoLogic AWS Observability Solution." CodeUri: Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: diff --git a/aws-observability/apps/controltower/controltower.template.yaml b/aws-observability/apps/controltower/controltower.template.yaml index 04c60967..0b8958ce 100644 --- a/aws-observability/apps/controltower/controltower.template.yaml +++ b/aws-observability/apps/controltower/controltower.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: AWS::Serverless-2016-10-31 -Description: "Version - v2.9.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets." +Description: "Version - v2.10.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets." Globals: Function: @@ -49,7 +49,7 @@ Parameters: - us1 - in - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2 Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -212,7 +212,7 @@ Resources: from botocore.exceptions import ClientError name = 'SUMO-LOGIC-AWS-OBSERVABILITY' - templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" + templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml" ALL = ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"] diff --git a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml index c40f5c26..7c714bc8 100755 --- a/aws-observability/apps/dynamodb/dynamodb_app.template.yaml +++ b/aws-observability/apps/dynamodb/dynamodb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml index c74db900..68236225 100755 --- a/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml +++ b/aws-observability/apps/ec2metrics/ec2_metrics_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: AWS::CloudFormation::Interface: @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/ecs/ecs_app.template.yaml b/aws-observability/apps/ecs/ecs_app.template.yaml index 8b4a8fe8..bf9cc116 100755 --- a/aws-observability/apps/ecs/ecs_app.template.yaml +++ b/aws-observability/apps/ecs/ecs_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/elasticache/elasticache_app.template.yaml b/aws-observability/apps/elasticache/elasticache_app.template.yaml index 0f100e5e..fe8c74df 100755 --- a/aws-observability/apps/elasticache/elasticache_app.template.yaml +++ b/aws-observability/apps/elasticache/elasticache_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/elb/elb_app.template.yaml b/aws-observability/apps/elb/elb_app.template.yaml index d01b1175..c0d2603f 100755 --- a/aws-observability/apps/elb/elb_app.template.yaml +++ b/aws-observability/apps/elb/elb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -93,7 +93,7 @@ Metadata: Parameters: Section1aSumoDeployment: Type: String - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Default: "" Section1bSumoAccessID: Type: String @@ -288,10 +288,10 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 CodeUri: Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: diff --git a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml index a03b35b4..881abfea 100644 --- a/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml +++ b/aws-observability/apps/hostmetricsfields/host_metrics_add_fields.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account." +Description: "Version - v2.10.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account." Metadata: 'AWS::CloudFormation::Interface': @@ -49,7 +49,7 @@ Parameters: - us1 - in - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2 Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -180,10 +180,10 @@ Resources: Type: AWS::Lambda::Function Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 Code: S3Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname] - S3Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + S3Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: !GetAtt LambdaRole.Arn diff --git a/aws-observability/apps/lambda/lambda_app.template.yaml b/aws-observability/apps/lambda/lambda_app.template.yaml index 96ab32e6..190f27c9 100755 --- a/aws-observability/apps/lambda/lambda_app.template.yaml +++ b/aws-observability/apps/lambda/lambda_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -105,7 +105,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/nlb/nlb_app.template.yaml b/aws-observability/apps/nlb/nlb_app.template.yaml index ab90f01a..5c516210 100755 --- a/aws-observability/apps/nlb/nlb_app.template.yaml +++ b/aws-observability/apps/nlb/nlb_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -73,7 +73,7 @@ Metadata: Parameters: Section1aSumoDeployment: Type: String - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Default: "" Section1bSumoAccessID: Type: String diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml index 0d45dbde..0c01739e 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.test.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.10.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -51,16 +51,7 @@ Parameters: AllowedValues: - stag - long - - au - - ca - - de - - eu - - jp - - us2 - - us1 - - in - - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter stag, long" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -367,10 +358,10 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 CodeUri: Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: @@ -537,7 +528,7 @@ Resources: Properties: Location: ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-s3-logging-auto-enable - SemanticVersion: 1.0.12 + SemanticVersion: 1.0.14 Parameters: BucketName: !Ref CommonS3Bucket BucketPrefix: "elasticloadbalancing" diff --git a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml index a34e94fc..0682c4d1 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.nested.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.10.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -54,11 +54,12 @@ Parameters: - de - eu - jp + - kr - us2 - us1 - in - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2 Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -365,10 +366,10 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 CodeUri: Bucket: !FindInMap [RegionMap, !Ref 'AWS::Region', bucketname] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: @@ -535,7 +536,7 @@ Resources: Properties: Location: ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-s3-logging-auto-enable - SemanticVersion: 1.0.12 + SemanticVersion: 1.0.14 Parameters: BucketName: !Ref CommonS3Bucket BucketPrefix: "elasticloadbalancing" diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml index fae8e340..b7bbb005 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.template.test.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.10.0: Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -29,16 +29,7 @@ Parameters: AllowedValues: - stag - long - - au - - ca - - de - - eu - - jp - - us2 - - us1 - - in - - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter stag, long" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -60,7 +51,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.9.0" + Version: "v2.10.0" Resources: diff --git a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml index c9bb0fa8..839e2351 100644 --- a/aws-observability/apps/permissionchecker/permissioncheck.template.yaml +++ b/aws-observability/apps/permissionchecker/permissioncheck.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." +Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template." Transform: 'AWS::Serverless-2016-10-31' Metadata: @@ -32,11 +32,12 @@ Parameters: - de - eu - jp + - kr - us2 - us1 - in - fed - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2 Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -58,7 +59,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.9.0" + Version: "v2.10.0" Resources: diff --git a/aws-observability/apps/rds/rds_app.template.yaml b/aws-observability/apps/rds/rds_app.template.yaml index 2cddbafb..42a63d4e 100755 --- a/aws-observability/apps/rds/rds_app.template.yaml +++ b/aws-observability/apps/rds/rds_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml index ee5faa86..0b2d2853 100755 --- a/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml +++ b/aws-observability/apps/rootcause/rootcauseexplorer.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app." +Description: "Version - v2.10.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app." Metadata: 'AWS::CloudFormation::Interface': @@ -100,7 +100,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." @@ -318,10 +318,10 @@ Resources: Type: 'AWS::Serverless::Function' Properties: Handler: main.handler - Runtime: python3.11 + Runtime: python3.12 CodeUri: Bucket: !FindInMap [ RegionMap, !Ref 'AWS::Region', bucketname ] - Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.18.zip" + Key: "sumologic-aws-observability/apps/SumoLogicAWSObservabilityHelper/SumoLogicAWSObservabilityHelperv2.0.19.zip" MemorySize: 128 Timeout: 900 Role: diff --git a/aws-observability/apps/sns/sns_app.template.yaml b/aws-observability/apps/sns/sns_app.template.yaml index 12f07d60..dd13c547 100755 --- a/aws-observability/apps/sns/sns_app.template.yaml +++ b/aws-observability/apps/sns/sns_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/apps/sqs/sqs_app.template.yaml b/aws-observability/apps/sqs/sqs_app.template.yaml index 7bb8d940..91f1e3ec 100755 --- a/aws-observability/apps/sqs/sqs_app.template.yaml +++ b/aws-observability/apps/sqs/sqs_app.template.yaml @@ -1,6 +1,6 @@ AWSTemplateFormatVersion: '2010-09-09' Transform: 'AWS::Serverless-2016-10-31' -Description: "Version - v2.9.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution." +Description: "Version - v2.10.0: Template to setup the SQS app with AWS and Sumo Logic resources for AWS Observability Solution." Metadata: 'AWS::CloudFormation::Interface': @@ -74,7 +74,7 @@ Parameters: Section1aSumoDeployment: Type: String Default: "" - Description: "Enter au, ca, de, eu, jp, us2, in, fed or us1." + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2" Section1bSumoAccessID: Type: String Description: "Sumo Logic Access ID. Used for Sumo Logic API calls." diff --git a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosix.sh b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosix.sh index 72c47023..034765e2 100644 --- a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosix.sh +++ b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosix.sh @@ -51,7 +51,7 @@ then AWS_REGION=us-east-1; fi -masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" +masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml" #identify sumo deployment associated with sumo accessId and accessKey export apiUrl="https://api.sumologic.com" diff --git a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosixTest.sh b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosixTest.sh index ed20ce7c..092471b7 100644 --- a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosixTest.sh +++ b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOPosixTest.sh @@ -51,7 +51,7 @@ then AWS_REGION=us-east-1; fi -masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" +masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml" #identify sumo deployment associated with sumo accessId and accessKey export apiUrl="https://api.sumologic.com" diff --git a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWin.ps1 b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWin.ps1 index c4838e8e..5c7fcb0b 100644 --- a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWin.ps1 +++ b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWin.ps1 @@ -41,7 +41,7 @@ $now=Get-Date echo "AWS Observability Script initiated at : $now" #identify sumo deployment associated with sumo accessId and accessKey -$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" +$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml" $apiUrl="https://api.sumologic.com" $deployment="us1" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWinTest.ps1 b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWinTest.ps1 index 10e6acf5..fcc9403c 100644 --- a/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWinTest.ps1 +++ b/aws-observability/scripts/AWSOAutoSetupScript/DeployAWSOWinTest.ps1 @@ -41,7 +41,7 @@ $now=Get-Date echo "AWS Observability Script initiated at : $now" #identify sumo deployment associated with sumo accessId and accessKey -$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml" +$masterTemplateURL="https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml" $apiUrl="https://api.sumologic.com" $deployment="us1" [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 diff --git a/aws-observability/scripts/DeployTemplate/DeployTemplate.sh b/aws-observability/scripts/DeployTemplate/DeployTemplate.sh index 7a90fdad..1d751fc0 100755 --- a/aws-observability/scripts/DeployTemplate/DeployTemplate.sh +++ b/aws-observability/scripts/DeployTemplate/DeployTemplate.sh @@ -19,7 +19,7 @@ export parameters_path=parameters-${ENV_NAME}.json # Downloading the template to local for use. Remove if the template with same name if already present. rm sumologic_observability_template.yaml -aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.9.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml +aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.10.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml # Deploy the template. If the Stack name already exist, stack will be updated else created. aws cloudformation deploy --profile ${AWS_PROFILE} --region ${AWS_REGION} \ diff --git a/aws-observability/scripts/JsonToS3.sh b/aws-observability/scripts/JsonToS3.sh index f2cf6a50..09a9d805 100644 --- a/aws-observability/scripts/JsonToS3.sh +++ b/aws-observability/scripts/JsonToS3.sh @@ -5,7 +5,7 @@ echo "Start S3 upload Script....." export AWS_PROFILE="prod" export bucket_name=sumologic-appdev-aws-sam-apps -export version=v2.9.0 +export version=v2.10.0 export match_case="App" if [[ ${AWS_PROFILE} == 'default' ]] diff --git a/aws-observability/scripts/TestTemplate.sh b/aws-observability/scripts/TestTemplate.sh index 36197e39..b33dfaba 100644 --- a/aws-observability/scripts/TestTemplate.sh +++ b/aws-observability/scripts/TestTemplate.sh @@ -1,7 +1,7 @@ #!/bin/sh export folder_name=rootcause -export template_version="v2.9.0" +export template_version="v2.10.0" export template_bucket="sumologic-appdev-aws-sam-apps" export lambda_arn="arn:aws:lambda:ap-south-1:668508221233:function:LambdaFucntion-LambdaHelper-1C1GGLRYPWBB0" diff --git a/aws-observability/scripts/YamlToS3.sh b/aws-observability/scripts/YamlToS3.sh index 1089c653..e2c33109 100755 --- a/aws-observability/scripts/YamlToS3.sh +++ b/aws-observability/scripts/YamlToS3.sh @@ -50,7 +50,7 @@ fi # Upload all templates to sumologic-appdev-aws-sam-apps bucket with version information. if [[ ${AWS_PROFILE} == 'default' ]] then - export version=v2.9.0 + export version=v2.10.0 aws s3 cp apps/ s3://${bucket_name}/aws-observability-versions/${version}/ --recursive --include "*.template.yaml" --exclude '*.zip' --exclude '*.sh' --exclude 'apps/*/test/*' --exclude '*/test/*' --acl public-read --profile ${AWS_PROFILE} diff --git a/aws-observability/sync.sh b/aws-observability/sync.sh index fc721909..10567192 100644 --- a/aws-observability/sync.sh +++ b/aws-observability/sync.sh @@ -6,7 +6,7 @@ APPS_TEMPLATES_DIR=./apps APPS_JSON_DIR=./json # Bucket name -CF_VERSION=v2.9.0 +CF_VERSION=v2.10.0 BUCKET_REGION=us-east-1 BUCKET=sumologic-appdev-aws-sam-apps S3_KEY_PREFIX=aws-observability-versions/${CF_VERSION} diff --git a/aws-observability/templates/sumologic_observability.master.template.yaml b/aws-observability/templates/sumologic_observability.master.template.yaml index f314b925..04603341 100644 --- a/aws-observability/templates/sumologic_observability.master.template.yaml +++ b/aws-observability/templates/sumologic_observability.master.template.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" +Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" Metadata: 'AWS::CloudFormation::Interface': @@ -162,12 +162,13 @@ Parameters: - ca - de - eu + - fed + - in - jp - - us2 + - kr - us1 - - in - - fed - Description: "Enter au, ca, de, eu, fed, in, jp, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" + - us2 + Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2. Visit https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security" Section1bSumoLogicAccessID: Type: String Description: "Sumo Logic Access ID. Visit https://help.sumologic.com/Manage/Security/Access-Keys#Create_an_access_key" @@ -474,7 +475,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.9.0" + Version: "v2.10.0" CollectorDetails: SumoLogicAccountID: 926226587429 CollectorNamePrefix: "aws-observability" @@ -620,7 +621,7 @@ Resources: sumoOrgId: !Ref Section1dSumoLogicOrganizationId solutionName: 'AWSO' - solutionVersion: 'v2.9.0' + solutionVersion: 'v2.10.0' deploymentSource: 'cloudFormation' TelemetryEndpoint: "https://endpoint1.collection.us2.sumologic.com/receiver/v1/http/ZaVnC4dhaV1S68eao6UYB3LFtqQ7ur1xYlT1EHCfXdhvi6uPNc0aUXIpvq5i_aHewOp5xxxwnGZ5MmSWDR6qV5td4exMM4pZE4Tk6rqKvgextLx7I6IRpg==" scanInterval: 60 diff --git a/aws-observability/templates/sumologic_observability.mp.test.yaml b/aws-observability/templates/sumologic_observability.mp.test.yaml index 10a92749..f6debc35 100755 --- a/aws-observability/templates/sumologic_observability.mp.test.yaml +++ b/aws-observability/templates/sumologic_observability.mp.test.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" +Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" Metadata: 'AWS::CloudFormation::Interface': @@ -500,7 +500,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.9.0" + Version: "v2.10.0" CollectorDetails: SumoLogicAccountID: 246946804217 CollectorNamePrefix: "aws-observability" diff --git a/aws-observability/templates/sumologic_observability.mp.yaml b/aws-observability/templates/sumologic_observability.mp.yaml index 9451b9b4..37c86f5b 100755 --- a/aws-observability/templates/sumologic_observability.mp.yaml +++ b/aws-observability/templates/sumologic_observability.mp.yaml @@ -1,5 +1,5 @@ AWSTemplateFormatVersion: '2010-09-09' -Description: "Version - v2.9.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" +Description: "Version - v2.10.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability" Metadata: 'AWS::CloudFormation::Interface': @@ -498,7 +498,7 @@ Mappings: CommonData: NestedTemplate: BucketName: "sumologic-appdev-aws-sam-apps" - Version: "v2.9.0" + Version: "v2.10.0" CollectorDetails: SumoLogicAccountID: 926226587429 CollectorNamePrefix: "aws-observability"