diff --git a/README.md b/README.md index 86c6101..1fc4bb7 100644 --- a/README.md +++ b/README.md @@ -7,18 +7,18 @@ Terraform module which creates a ecs app | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3.0 | -| [aws](#requirement\_aws) | >= 4.67, != 5.71.0 | +| [aws](#requirement\_aws) | >= 4.67 | | [elasticsearch](#requirement\_elasticsearch) | 2.0.7 | -| [elasticstack](#requirement\_elasticstack) | 0.11.4 | +| [elasticstack](#requirement\_elasticstack) | 0.11.9 | | [gosoline](#requirement\_gosoline) | 1.3.0 | -| [grafana](#requirement\_grafana) | 3.7.0 | -| [sentry](#requirement\_sentry) | 0.13.1 | +| [grafana](#requirement\_grafana) | 3.10.0 | +| [sentry](#requirement\_sentry) | 0.13.2 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 4.67, != 5.71.0 | +| [aws](#provider\_aws) | >= 4.67 | ## Modules @@ -29,15 +29,15 @@ Terraform module which creates a ecs app | [cloudwatch\_label](#module\_cloudwatch\_label) | justtrackio/label/null | 0.26.0 | | [container\_definition](#module\_container\_definition) | cloudposse/ecs-container-definition/aws | 0.61.1 | | [container\_definition\_fluentbit](#module\_container\_definition\_fluentbit) | cloudposse/ecs-container-definition/aws | 0.61.1 | -| [ecr](#module\_ecr) | terraform-aws-modules/ecr/aws | 2.2.1 | +| [ecr](#module\_ecr) | terraform-aws-modules/ecr/aws | 2.3.0 | | [ecr\_label](#module\_ecr\_label) | justtrackio/label/null | 0.26.0 | | [ecs\_label](#module\_ecs\_label) | justtrackio/label/null | 0.26.0 | | [ecs\_service\_task\_customized\_autoscaling](#module\_ecs\_service\_task\_customized\_autoscaling) | justtrackio/ecs-autoscaling/aws | 1.2.0 | | [ecs\_service\_task\_predefined\_autoscaling](#module\_ecs\_service\_task\_predefined\_autoscaling) | justtrackio/ecs-autoscaling/aws | 1.2.0 | | [ecs\_service\_task\_schedule](#module\_ecs\_service\_task\_schedule) | justtrackio/ecs-autoscaling/aws | 1.2.0 | -| [monitoring](#module\_monitoring) | justtrackio/ecs-gosoline-monitoring/aws | 2.4.0 | -| [sentry](#module\_sentry) | justtrackio/project/sentry | 1.3.0 | -| [service\_task](#module\_service\_task) | justtrackio/ecs-alb-service-task/aws | 1.4.0 | +| [monitoring](#module\_monitoring) | justtrackio/ecs-gosoline-monitoring/aws | 2.5.0 | +| [sentry](#module\_sentry) | justtrackio/project/sentry | 1.4.1 | +| [service\_task](#module\_service\_task) | justtrackio/ecs-alb-service-task/aws | 1.5.0 | | [ssm\_label](#module\_ssm\_label) | justtrackio/label/null | 0.26.0 | | [this](#module\_this) | justtrackio/label/null | 0.26.0 | @@ -54,6 +54,7 @@ Terraform module which creates a ecs app | [aws_lb_listener.https](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/lb_listener) | data source | | [aws_ssm_parameter.container_tag](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source | | [aws_ssm_parameter.grafana_token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source | +| [aws_ssm_parameter.keep_api_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source | | [aws_ssm_parameter.sentry_token](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source | | [aws_vpc.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | data source | @@ -161,6 +162,12 @@ Terraform module which creates a ecs app | [propagate\_tags](#input\_propagate\_tags) | Specifies whether to propagate the tags from the task definition or the service to the tasks. The valid values are SERVICE and TASK\_DEFINITION | `string` | `null` | no | | [regex\_replace\_chars](#input\_regex\_replace\_chars) | Terraform regular expression (regex) string.
Characters matching the regex will be removed from the ID elements.
If not set, `"/[^a-zA-Z0-9-]/"` is used to remove all characters other than hyphens, letters and digits. | `string` | `null` | no | | [scheduled\_autoscaling\_ignore\_changes\_min\_max\_capacity](#input\_scheduled\_autoscaling\_ignore\_changes\_min\_max\_capacity) | Whether or not to ignore min\_capacity/max\_capacity changes on the aws\_appautoscaling\_target of the scheduled autoscaling module | `bool` | `true` | no | +| [sentry\_alarm\_action\_match](#input\_sentry\_alarm\_action\_match) | Trigger actions when an event is captured by Sentry and `any` or `all` of the specified conditions happen. | `string` | `"any"` | no | +| [sentry\_alarm\_actions](#input\_sentry\_alarm\_actions) | List of actions. In JSON string format. | `string` | `"[]"` | no | +| [sentry\_alarm\_conditions](#input\_sentry\_alarm\_conditions) | List of conditions. In JSON string format. | `string` | `"[]"` | no | +| [sentry\_alarm\_filter\_match](#input\_sentry\_alarm\_filter\_match) | A string determining which filters need to be true before any actions take place. Required when a value is provided for filters. | `string` | `"all"` | no | +| [sentry\_alarm\_filters](#input\_sentry\_alarm\_filters) | A list of filters that determine if a rule fires after the necessary conditions have been met. In JSON string format. | `string` | `null` | no | +| [sentry\_alarm\_frequency](#input\_sentry\_alarm\_frequency) | Perform actions at most once every X minutes for this issue. | `number` | `5` | no | | [sentry\_dsn](#input\_sentry\_dsn) | Define a custom sentry dsn if `sentry_enabled` is set to `false` | `string` | `null` | no | | [sentry\_enabled](#input\_sentry\_enabled) | Set to false to prevent the module from creating any resources for sentry | `bool` | `true` | no | | [service\_placement\_constraints](#input\_service\_placement\_constraints) | The rules that are taken into consideration during task placement. Maximum number of placement\_constraints is 10. See [`placement_constraints`](https://www.terraform.io/docs/providers/aws/r/ecs_service.html#placement_constraints-1) docs | 
list(object({
    type       = string
    expression = string
  }))
| `[]` | no | diff --git a/data.tf b/data.tf index 2d09e7e..1a99d1f 100644 --- a/data.tf +++ b/data.tf @@ -17,6 +17,10 @@ data "aws_ecs_cluster" "default" { cluster_name = module.this.environment } +data "aws_ssm_parameter" "keep_api_key" { + name = "/keep/api_key" +} + data "aws_ssm_parameter" "sentry_token" { name = "/sentry/token" } diff --git a/ecr.tf b/ecr.tf index 0243e9b..95ee519 100644 --- a/ecr.tf +++ b/ecr.tf @@ -10,7 +10,7 @@ module "ecr_label" { module "ecr" { source = "terraform-aws-modules/ecr/aws" - version = "2.2.1" + version = "2.3.0" repository_name = module.ecr_label.id tags = module.ecr_label.tags diff --git a/main.tf b/main.tf index 2d9748d..14606f2 100644 --- a/main.tf +++ b/main.tf @@ -185,7 +185,7 @@ module "container_definition_fluentbit" { module "service_task" { source = "justtrackio/ecs-alb-service-task/aws" - version = "1.4.0" + version = "1.5.0" circuit_breaker_deployment_enabled = var.circuit_breaker_deployment_enabled circuit_breaker_rollback_enabled = var.circuit_breaker_rollback_enabled diff --git a/monitoring.tf b/monitoring.tf index e52a50b..d074da4 100644 --- a/monitoring.tf +++ b/monitoring.tf @@ -12,7 +12,7 @@ locals { module "monitoring" { count = var.monitoring_enabled ? 1 : 0 source = "justtrackio/ecs-gosoline-monitoring/aws" - version = "2.4.0" + version = "2.5.0" context = module.this.context diff --git a/sentry.tf b/sentry.tf index 4199037..c4db872 100644 --- a/sentry.tf +++ b/sentry.tf @@ -1,13 +1,48 @@ +locals { + sentry_alarm_actions = var.sentry_alarm_actions != "[]" ? var.sentry_alarm_actions : jsonencode( + [ + { + id : "sentry.rules.actions.notify_event_service.NotifyEventServiceAction", + service : "webhooks" + } + ] + ) + + sentry_alarm_conditions = var.sentry_alarm_conditions != "[]" ? var.sentry_alarm_conditions : jsonencode( + [ + { + id : "sentry.rules.conditions.first_seen_event.FirstSeenEventCondition" + } + ] + ) + + sentry_alarm_filters = var.sentry_alarm_filters != null ? var.sentry_alarm_filters : jsonencode( + [ + { + id : "sentry.rules.filters.level.LevelFilter", + match : "gte", + level : "40" + } + ] + ) +} + module "sentry" { count = module.this.enabled && var.sentry_enabled ? 1 : 0 source = "justtrackio/project/sentry" - version = "1.3.0" + version = "1.4.1" context = module.this.context label_order = var.label_orders.sentry -} -moved { - from = module.sentry - to = module.sentry[0] + alarm_enabled = var.alarm_enabled + + alarm_actions = local.sentry_alarm_actions + alarm_action_match = var.sentry_alarm_action_match + alarm_conditions = local.sentry_alarm_conditions + alarm_filters = local.sentry_alarm_filters + alarm_filter_match = var.sentry_alarm_filter_match + alarm_frequency = var.sentry_alarm_frequency + + webhook_url = "https://keep-backend.${module.this.organizational_unit}-monitoring.${var.domain}/alerts/event/sentry?api_key=${data.aws_ssm_parameter.keep_api_key.value}" } diff --git a/variables.tf b/variables.tf index 4ddab1d..6fd3120 100644 --- a/variables.tf +++ b/variables.tf @@ -643,6 +643,42 @@ variable "scheduled_autoscaling_ignore_changes_min_max_capacity" { default = true } +variable "sentry_alarm_actions" { + type = string + description = "List of actions. In JSON string format." + default = "[]" +} + +variable "sentry_alarm_action_match" { + type = string + description = "Trigger actions when an event is captured by Sentry and `any` or `all` of the specified conditions happen." + default = "any" +} + +variable "sentry_alarm_conditions" { + type = string + description = "List of conditions. In JSON string format." + default = "[]" +} + +variable "sentry_alarm_filters" { + type = string + description = "A list of filters that determine if a rule fires after the necessary conditions have been met. In JSON string format." + default = null +} + +variable "sentry_alarm_filter_match" { + type = string + description = "A string determining which filters need to be true before any actions take place. Required when a value is provided for filters." + default = "all" +} + +variable "sentry_alarm_frequency" { + type = number + description = "Perform actions at most once every X minutes for this issue." + default = 5 +} + variable "sentry_dsn" { type = string description = "Define a custom sentry dsn if `sentry_enabled` is set to ``false" diff --git a/versions.tf b/versions.tf index 63d4dad..fc9ac2c 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 4.67, != 5.71.0" + version = ">= 4.67" } elasticsearch = { @@ -17,17 +17,17 @@ terraform { grafana = { source = "grafana/grafana" - version = "3.7.0" + version = "3.10.0" } elasticstack = { source = "elastic/elasticstack" - version = "0.11.4" + version = "0.11.9" } sentry = { source = "jianyuan/sentry" - version = "0.13.1" + version = "0.13.2" } }