From 5ecb040bb27d8fed2a15617830cc6805df9c6ec7 Mon Sep 17 00:00:00 2001
From: Noah <40781376+noahpb@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:20:34 -0400
Subject: [PATCH] feat: add monitoring layer (#872)

## Description
Adds the monitoring functional layer

## Related Issue

Fixes https://github.com/defenseunicorns/uds-core/issues/829

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [Contributor
Guide](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)
followed

---------

Co-authored-by: Micah Nagel <micah.nagel@defenseunicorns.com>
---
 .github/filters.yaml           |  5 +++++
 .github/workflows/publish.yaml |  2 +-
 packages/monitoring/readme.md  |  9 +++++++++
 packages/monitoring/tasks.yaml |  9 +++++++++
 packages/monitoring/zarf.yaml  | 21 +++++++++++++++++++++
 packages/standard/zarf.yaml    |  4 ++--
 release-please-config.json     |  1 +
 7 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 packages/monitoring/readme.md
 create mode 100644 packages/monitoring/tasks.yaml
 create mode 100644 packages/monitoring/zarf.yaml

diff --git a/.github/filters.yaml b/.github/filters.yaml
index 032af0a17..81bb4c1a3 100644
--- a/.github/filters.yaml
+++ b/.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/**"
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 71f454bc3..0a4b7a6f9 100644
--- a/.github/workflows/publish.yaml
+++ b/.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
diff --git a/packages/monitoring/readme.md b/packages/monitoring/readme.md
new file mode 100644
index 000000000..e08fe67f7
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/packages/monitoring/tasks.yaml b/packages/monitoring/tasks.yaml
new file mode 100644
index 000000000..3de4e5238
--- /dev/null
+++ b/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
diff --git a/packages/monitoring/zarf.yaml b/packages/monitoring/zarf.yaml
new file mode 100644
index 000000000..02881df98
--- /dev/null
+++ b/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
diff --git a/packages/standard/zarf.yaml b/packages/standard/zarf.yaml
index 2117e5c6e..75816559c 100644
--- a/packages/standard/zarf.yaml
+++ b/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
diff --git a/release-please-config.json b/release-please-config.json
index 07e21e0da..1460f8ee1 100644
--- a/release-please-config.json
+++ b/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",