Sync Terraform & Helm changes

GitOrigin-RevId: 2f8d09c67ca92686953ecedf43f84ca4c6efb73a

terraform/fullnode/aws/backup.tf

@@ -49,9 +49,16 @@ data "aws_iam_policy_document" "backup-assume-role" {
 data "aws_iam_policy_document" "backup" {
   statement {
     actions = [
-      "s3:GetObject",
       "s3:ListBucket",
       "s3:PutObject",
+      "s3:GetObject",
+      "s3:GetObjectTagging",
+      "s3:DeleteObject",
+      "s3:DeleteObjectVersion",
+      "s3:GetObjectVersion",
+      "s3:GetObjectVersionTagging",
+      "s3:GetObjectACL",
+      "s3:PutObjectACL"
     ]
     resources = [
       "arn:aws:s3:::${aws_s3_bucket.backup.id}",

terraform/helm/vector-log-agent/files/vector-transforms.yaml

@@ -68,6 +68,10 @@ transforms:
           }
         }
       }
+      if exists(.fields) {
+        . = merge!(., .fields)
+        del(.fields)
+      }
       if exists(.level) && is_string(.level) {
         .level = downcase!(.level);
       }
@@ -78,3 +82,22 @@ transforms:
       if err == null {
         .timestamp = parsed_timestamp
       }
+
+  uptrace_logs:
+    type: remap
+    inputs:
+      - final_logs
+    source: |
+      . = flatten(., ".") # in order for fields to become individual, filterable top-level fields in uptrace we need to flatten nested objects into top-level keys.
+      .service.name = .k8s.labels.app
+
+  datadog_logs:
+    type: remap
+    inputs:
+      - final_logs
+    source: |
+      .ddsource = "k8s"
+      if is_string(.k8s.labels.app) {
+        .service = .k8s.labels.app
+      }
+      .ddtags, _ = "kube_cluster_name:" + .k8s.cluster + ",kube_namespace:" + .k8s.namespace + ",pod_name:" + .k8s.pod_name