diff --git a/examples/spot-instance/README.md b/examples/spot-instance/README.md index 0bb326b..41252e4 100644 --- a/examples/spot-instance/README.md +++ b/examples/spot-instance/README.md @@ -12,7 +12,7 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 4.67.0 | +| [aws](#provider\_aws) | >= 3.41 | ## Modules diff --git a/modules/adot/README.md b/modules/adot/README.md index 0506806..da2df98 100644 --- a/modules/adot/README.md +++ b/modules/adot/README.md @@ -75,7 +75,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| | [adot\_collector\_policy\_arns](#input\_adot\_collector\_policy\_arns) | List of IAM policy ARNs to attach to the ADOT collector service account. | `list(string)` | `[]` | no | -| [adot\_config](#input\_adot\_config) | accept\_namespace\_regex defines the list of namespaces from which metrics will be exported, and additional\_metrics defines additional metrics to export. | 
object({
    accept_namespace_regex = optional(string, "(default|kube-system)")
    additional_metrics     = optional(list(string), [])
    log_group_name         = optional(string, "adot")
    log_retention          = optional(number, 14)
    helm_values            = optional(any, null)
    logging_enable         = optional(bool, false)
    memory_limiter = optional(object(
      {
        limit_mib      = optional(number, 4000)
        check_interval = optional(string, "1s")
      }
      ), {
      limit_mib      = 4000
      check_interval = "1s"
      }
    )
    resources = optional(object({
      limit = object({
        cpu    = optional(string, "200m")
        memory = optional(string, "200Mi")
      })
      requests = object({
        cpu    = optional(string, "200m")
        memory = optional(string, "200Mi")
      })
      }), {
      limit = {
        cpu    = "200m"
        memory = "200Mi"
      }
      requests = {
        cpu    = "200m"
        memory = "200Mi"
    } })
  })
| 
{
  "accept_namespace_regex": "(default|kube-system)",
  "additional_metrics": [],
  "helm_values": null,
  "log_group_name": "adot",
  "log_retention": 14,
  "logging_enable": false,
  "resources": {
    "limit": {
      "cpu": "200m",
      "memory": "200Mi"
    },
    "requests": {
      "cpu": "200m",
      "memory": "200Mi"
    }
  }
}
| no | +| [adot\_config](#input\_adot\_config) | accept\_namespace\_regex defines the list of namespaces from which metrics will be exported, and additional\_metrics defines additional metrics to export. | 
object({
    accept_namespace_regex = optional(string, "(default|kube-system)")
    additional_metrics     = optional(list(string), [])
    log_group_name         = optional(string, "adot")
    log_retention          = optional(number, 14)
    helm_values            = optional(any, null)
    logging_enable         = optional(bool, false)
    memory_limiter = optional(object(
      {
        limit_mib      = optional(number, 1000)
        check_interval = optional(string, "1s")
      }
      ), {
      limit_mib      = 1000
      check_interval = "1s"
      }
    )
    resources = optional(object({
      limit = object({
        cpu    = optional(string, "200m")
        memory = optional(string, "200Mi")
      })
      requests = object({
        cpu    = optional(string, "200m")
        memory = optional(string, "200Mi")
      })
      }), {
      limit = {
        cpu    = "200m"
        memory = "200Mi"
      }
      requests = {
        cpu    = "200m"
        memory = "200Mi"
    } })
  })
| 
{
  "accept_namespace_regex": "(default|kube-system)",
  "additional_metrics": [],
  "helm_values": null,
  "log_group_name": "adot",
  "log_retention": 14,
  "logging_enable": false,
  "resources": {
    "limit": {
      "cpu": "200m",
      "memory": "200Mi"
    },
    "requests": {
      "cpu": "200m",
      "memory": "200Mi"
    }
  }
}
| no | | [adot\_log\_group\_name](#input\_adot\_log\_group\_name) | ADOT log group name | `string` | `"adot_log_group_name"` | no | | [adot\_version](#input\_adot\_version) | The version of the AWS Distro for OpenTelemetry addon to use. | `string` | `"v0.78.0-eksbuild.1"` | no | | [cluster\_name](#input\_cluster\_name) | K8s cluster name. | `string` | n/a | yes | diff --git a/modules/adot/role.tf b/modules/adot/role.tf index f82eb0e..7b363df 100644 --- a/modules/adot/role.tf +++ b/modules/adot/role.tf @@ -31,7 +31,7 @@ POLICY } resource "aws_iam_policy" "adot" { - name = "adot_policy" + name = "${var.cluster_name}-adot_policy" path = "/" description = "Adot Policy" diff --git a/modules/adot/tests/basic/README.md b/modules/adot/tests/basic/README.md index d2cf26c..97a80ae 100644 --- a/modules/adot/tests/basic/README.md +++ b/modules/adot/tests/basic/README.md @@ -15,7 +15,7 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.34.0 | +| [aws](#provider\_aws) | >= 3.41 | ## Modules diff --git a/modules/adot/tests/template_file/README.md b/modules/adot/tests/template_file/README.md index 466a3ea..b00238f 100644 --- a/modules/adot/tests/template_file/README.md +++ b/modules/adot/tests/template_file/README.md @@ -15,8 +15,8 @@ | Name | Version | |------|---------| -| [aws](#provider\_aws) | 4.63.0 | -| [helm](#provider\_helm) | 2.9.0 | +| [aws](#provider\_aws) | >= 3.41 | +| [helm](#provider\_helm) | >= 2.0 | | [test](#provider\_test) | n/a | ## Modules