Update dependencies and versions and support for inferred services (#18)

Author: brettcurtis

.gitignore

@@ -27,6 +27,9 @@ override.tf.json
 # Ignore plan output files
 plan.out
 
+# Ignore checkov directories and files
+.external_modules
+
 # Ignore Infracost directories and files
 .infracost
 

.pre-commit-config.yaml

@@ -29,11 +29,12 @@ repos:
       - id: terraform_docs
 
   - repo: https://github.com/bridgecrewio/checkov.git
-    rev: 3.2.296
+    rev: 3.2.343
     hooks:
       - id: checkov
         verbose: true
         args:
+          - --download-external-modules=true
           - --skip-check
           - "CKV_TF_1"
           - --quiet

regional/README.md

@@ -11,8 +11,8 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.16.1 |
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.33.0 |
+| <a name="provider_helm"></a> [helm](#provider\_helm) | 2.17.0 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.35.1 |
 
 ## Modules
 
@@ -37,7 +37,7 @@ No requirements.
 | <a name="input_cluster_prefix"></a> [cluster\_prefix](#input\_cluster\_prefix) | Prefix for your cluster name, region, and zone (if applicable) will be added to the end of the cluster name | `string` | n/a | yes |
 | <a name="input_limits_cpu"></a> [limits\_cpu](#input\_limits\_cpu) | CPU limits for the Datadog Operator | `string` | `"200m"` | no |
 | <a name="input_limits_memory"></a> [limits\_memory](#input\_limits\_memory) | Memory limits for the Datadog Operator | `string` | `"64Mi"` | no |
-| <a name="input_operator_version"></a> [operator\_version](#input\_operator\_version) | The version of the Datadog Operator to install | `string` | `"2.3.0"` | no |
+| <a name="input_operator_version"></a> [operator\_version](#input\_operator\_version) | The version of the Datadog Operator to install | `string` | `"2.5.0"` | no |
 | <a name="input_requests_cpu"></a> [requests\_cpu](#input\_requests\_cpu) | CPU requests for the Datadog Operator | `string` | `"100m"` | no |
 | <a name="input_requests_memory"></a> [requests\_memory](#input\_requests\_memory) | Memory requests for the Datadog Operator | `string` | `"32Mi"` | no |
 | <a name="input_watch_namespaces"></a> [watch\_namespaces](#input\_watch\_namespaces) | Restricts the Operator to watch its managed resources on specific namespaces - set to [""] to watch all namespaces | `list(string)` | <pre>[<br/>  "datadog"<br/>]</pre> | no |

regional/manifests/README.md

@@ -11,7 +11,7 @@ No requirements.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.33.0 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | 2.35.1 |
 
 ## Modules
 
@@ -62,7 +62,7 @@ No requirements.
 | <a name="input_node_agent_log_level"></a> [node\_agent\_log\_level](#input\_node\_agent\_log\_level) | Node Agent log level | `string` | `"info"` | no |
 | <a name="input_node_agent_requests_cpu"></a> [node\_agent\_requests\_cpu](#input\_node\_agent\_requests\_cpu) | CPU requests for the Datadog Node Agent | `string` | `"100m"` | no |
 | <a name="input_node_agent_requests_memory"></a> [node\_agent\_requests\_memory](#input\_node\_agent\_requests\_memory) | Memory requests for the Datadog Node Agent | `string` | `"128Mi"` | no |
-| <a name="input_node_agent_tag"></a> [node\_agent\_tag](#input\_node\_agent\_tag) | Tag for the Datadog node agent image | `string` | `"7.59.0"` | no |
+| <a name="input_node_agent_tag"></a> [node\_agent\_tag](#input\_node\_agent\_tag) | Tag for the Datadog node agent image | `string` | `"7.60.1"` | no |
 | <a name="input_node_agent_tolerations"></a> [node\_agent\_tolerations](#input\_node\_agent\_tolerations) | Tolerations for the Datadog node agent | <pre>list(object({<br/>    key      = string<br/>    operator = string<br/>    value    = string<br/>    effect   = string<br/>  }))</pre> | `[]` | no |
 | <a name="input_registry"></a> [registry](#input\_registry) | Docker registry for the Datadog container images | `string` | n/a | yes |
 | <a name="input_team"></a> [team](#input\_team) | Team name to be used as a tag in Datadog | `string` | n/a | yes |

regional/manifests/locals.tf

@@ -2,6 +2,20 @@
 # https://www.terraform.io/docs/language/values/locals.html
 
 locals {
+  cluster_agent_env_vars = [
+
+    # Datadog Inferred Services:
+
+    {
+      name  = "DD_APM_COMPUTE_STATS_BY_SPAN_KIND"
+      value = "true"
+    },
+    {
+      name  = "DD_APM_PEER_TAGS_AGGREGATION"
+      value = "true"
+    }
+  ]
+
   cluster_name = module.helpers.zone != null ? "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.zone}-${module.helpers.env}" : "${var.cluster_prefix}-${module.helpers.region}-${module.helpers.env}"
 
   kubernetes_monitor_templates = {

regional/manifests/main.tf

@@ -67,7 +67,8 @@ resource "kubernetes_manifest" "agent" {
 
         sbom = {
           containerImage = {
-            enabled = var.enable_sbom
+            enabled                   = var.enable_sbom
+            uncompressedLayersSupport = true
           }
 
           enabled = var.enable_sbom
@@ -91,7 +92,7 @@ resource "kubernetes_manifest" "agent" {
 
       override = {
         clusterAgent = {
-          env = var.cluster_agent_env_vars
+          env = concat(local.cluster_agent_env_vars, var.cluster_agent_env_vars)
 
           labels = {
             "tags.datadoghq.com/env"     = module.helpers.environment

regional/manifests/variables.tf

@@ -204,7 +204,7 @@ variable "node_agent_requests_memory" {
 variable "node_agent_tag" {
   description = "Tag for the Datadog node agent image"
   type        = string
-  default     = "7.59.0"
+  default     = "7.60.1"
 }
 
 variable "node_agent_tolerations" {

regional/variables.tf

@@ -39,7 +39,7 @@ variable "limits_memory" {
 variable "operator_version" {
   description = "The version of the Datadog Operator to install"
   type        = string
-  default     = "2.3.0"
+  default     = "2.5.0"
 }
 
 variable "requests_cpu" {