feat: add monitoring layer

.github/filters.yaml

@@ -31,3 +31,8 @@ backup-restore:
 metrics-server:
   - "packages/metrics-server/**"
   - "src/metrics-server/**"
+
+monitoring:
+  - "packages/monitoring/**"
+  - "src/prometheus-stack/**"
+  - "src/grafana/**"

.github/workflows/publish.yaml

@@ -93,7 +93,7 @@ jobs:
     strategy:
       matrix:
         flavor: [upstream, registry1, unicorn]
-        layer: [base, identity-authorization, ui, runtime-security, backup-restore, logging, metrics-server]
+        layer: [base, identity-authorization, ui, runtime-security, backup-restore, logging, metrics-server, monitoring]
         arch: [amd64, arm64]
         exclude:
           - flavor: registry1

packages/monitoring/readme.md

@@ -0,0 +1,9 @@
+# UDS Core Monitoring
+
+This layer of UDS Core provides monitoring capabilities. Currently it includes the application(s):
+- grafana
+- prometheus
+
+To deploy this layer you must also deploy its dependent layer(s):
+- base
+- identity-authorization

packages/monitoring/tasks.yaml

@@ -0,0 +1,9 @@
+includes:
+  - prometheus: ../../src/prometheus-stack/tasks.yaml
+  - grafana: ../../src/grafana/tasks.yaml
+
+tasks:
+  - name: validate
+    actions:
+      - task: prometheus:validate
+      - task: grafana:validate

packages/monitoring/zarf.yaml

@@ -0,0 +1,21 @@
+kind: ZarfPackageConfig
+metadata:
+  name: core-monitoring
+  description: "UDS Core Monitoring (Prometheus and Grafana)"
+  authors: "Defense Unicorns - Product"
+  # x-release-please-start-version
+  version: "0.28.0"
+  # x-release-please-end
+  x-uds-dependencies: ["base", "identity-authorization"]
+
+components:
+  # Prometheus
+  - name: kube-prometheus-stack
+    required: true
+    import:
+      path: ../../src/prometheus-stack
+  # Grafana
+  - name: grafana
+    required: true
+    import:
+      path: ../../src/grafana

packages/standard/zarf.yaml

@@ -74,7 +74,7 @@ components:
   - name: kube-prometheus-stack
     required: true
     import:
-      path: ../../src/prometheus-stack
+      path: ../monitoring
 
   # Vector
   - name: vector
@@ -86,7 +86,7 @@ components:
   - name: grafana
     required: true
     import:
-      path: ../../src/grafana
+      path: ../monitoring
 
   # Authservice
   - name: authservice

release-please-config.json

@@ -20,6 +20,7 @@
         "packages/backup-restore/zarf.yaml",
         "packages/runtime-security/zarf.yaml",
         "packages/ui/zarf.yaml",
+        "packages/monitoring/zarf.yaml",
         "packages/metrics-server/zarf.yaml",
         "packages/standard/zarf.yaml",
         "bundles/k3d-slim-dev/uds-bundle.yaml",