chore: updates

src/pepr/zarf.yaml

@@ -52,31 +52,18 @@ components:
     actions:
       onDeploy:
         before:
-          - cmd: ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-api-token meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-module meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-tls meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate serviceaccount -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate clusterrolebinding pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate clusterrole pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate role -n pepr-system pepr-uds-core-store meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate rolebinding -n pepr-system pepr-uds-core-store meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate service -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate service -n pepr-system pepr-uds-core-watcher meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate deployment -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate deployment -n pepr-system pepr-uds-core-watcher meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate mutatingwebhookconfiguration -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
-          - cmd: ./zarf tools kubectl annotate validatingwebhookconfiguration -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
-            mute: true
+          - cmd: |
+              ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-api-token meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-module meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate secret -n pepr-system pepr-uds-core-tls meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate serviceaccount -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate clusterrolebinding pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate clusterrole pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate role -n pepr-system pepr-uds-core-store meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate rolebinding -n pepr-system pepr-uds-core-store meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate service -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate service -n pepr-system pepr-uds-core-watcher meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate deployment -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate deployment -n pepr-system pepr-uds-core-watcher meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate mutatingwebhookconfiguration -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true
+              ./zarf tools kubectl annotate validatingwebhookconfiguration -n pepr-system pepr-uds-core meta.helm.sh/release-name=module --overwrite || true

src/vector/README.md

@@ -34,3 +34,7 @@ Vector has been chosen as our replacement for Promtail. Primary motivations incl
 1. Vector is [significantly more performant](https://github.com/vectordotdev/vector?tab=readme-ov-file#performance) than other tooling in the space on most categories of metrics.
 
 As with any decisions of tooling in core this can always be reevaluated in the future as different tools or factors affect how we look at our logging stack.
+
+### Upgrade Considerations
+
+During the upgrade there may be some duplication/overlap of log lines shipped to Loki due to the transition from Promtail's "position" file to Vector's "checkpoint" file (both used for tracking the last log line scraped/shipped). Grafana provides a built in feature to de-duplicate log entries when querying Loki.

src/vector/common/zarf.yaml

@@ -14,7 +14,7 @@ components:
         localPath: ../chart
       - name: vector
         url: https://helm.vector.dev
-        version: 0.36.0
+        version: 0.36.1
         namespace: vector
         gitPath: charts/vector
         valuesFiles:

src/vector/values/registry1-values.yaml

@@ -1,3 +1,3 @@
 image:
   repository: registry1.dso.mil/ironbank/opensource/timberio/vector
-  tag: 0.40.2
+  tag: 0.41.1

src/vector/values/unicorn-values.yaml

@@ -1,3 +1,3 @@
 image:
   repository: cgr.dev/du-uds-defenseunicorns/vector
-  tag: 0.40.1
+  tag: 0.41.1

src/vector/values/upstream-values.yaml

@@ -1,3 +1,3 @@
 image:
   repository: timberio/vector
-  tag: 0.40.2-distroless-static
+  tag: 0.41.1-distroless-static

src/vector/values/values.yaml

@@ -3,6 +3,9 @@ role: "Agent"
 
 customConfig:
   data_dir: /var/lib/vector
+  # Ensure e2e delivery of events
+  acknowledgements:
+    enabled: true
   sources:
     pod_logs:
       type: "kubernetes_logs"
@@ -30,6 +33,14 @@ customConfig:
             .kubernetes.pod_labels.app = .kubernetes.pod_name
           }
         }
+        if !exists(.kubernetes.pod_labels.component) {
+          if exists(.kubernetes.pod_labels."app.kubernetes.io/component") {
+            .kubernetes.pod_labels.component = .kubernetes.pod_labels."app.kubernetes.io/component"
+          } else {
+            .kubernetes.pod_labels.component = ""
+          }
+        }
+
     node_logs_labelled:
       type: remap
       inputs: ["node_logs"]
@@ -54,6 +65,7 @@ customConfig:
         app: '{{`{{ kubernetes.pod_labels.app }}`}}'
         job: '{{`{{ kubernetes.pod_namespace }}`}}/{{`{{ kubernetes.pod_labels.app }}`}}'
         container: '{{`{{ kubernetes.container_name }}`}}'
+        component: '{{`{{ kubernetes.pod_labels.component }}`}}'
         host: '{{`{{ kubernetes.pod_node_name }}`}}'
         file: '{{`{{ file }}`}}'
       buffer:

src/vector/zarf.yaml

@@ -17,7 +17,7 @@ components:
         valuesFiles:
           - values/upstream-values.yaml
     images:
-      - timberio/vector:0.40.2-distroless-static
+      - timberio/vector:0.41.1-distroless-static
 
   - name: vector
     required: true
@@ -31,7 +31,7 @@ components:
         valuesFiles:
           - values/registry1-values.yaml
     images:
-      - registry1.dso.mil/ironbank/opensource/timberio/vector:0.40.2
+      - registry1.dso.mil/ironbank/opensource/timberio/vector:0.41.1
 
   - name: vector
     required: true
@@ -45,4 +45,4 @@ components:
         valuesFiles:
           - values/unicorn-values.yaml
     images:
-      - cgr.dev/du-uds-defenseunicorns/vector:0.40.1 # todo: patch 0.40.2 update
+      - cgr.dev/du-uds-defenseunicorns/vector:0.41.1