From 64976b91334db4c2f97d6fd75e7f3882bc4da5da Mon Sep 17 00:00:00 2001 From: Noah Birrer Date: Mon, 7 Oct 2024 16:19:51 -0400 Subject: [PATCH 1/4] chore: monitoring layer --- .github/filters.yaml | 5 +++++ .github/workflows/publish.yaml | 2 +- packages/monitoring/readme.md | 8 ++++++++ packages/monitoring/tasks.yaml | 9 +++++++++ packages/monitoring/zarf.yaml | 21 +++++++++++++++++++++ packages/standard/zarf.yaml | 4 ++-- release-please-config.json | 1 + 7 files changed, 47 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 55806ed4c..428937213 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..47282bcc0 --- /dev/null +++ b/packages/monitoring/readme.md @@ -0,0 +1,8 @@ +# 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 \ No newline at end of file diff --git a/packages/monitoring/tasks.yaml b/packages/monitoring/tasks.yaml new file mode 100644 index 000000000..fc654076b --- /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 \ No newline at end of file diff --git a/packages/monitoring/zarf.yaml b/packages/monitoring/zarf.yaml new file mode 100644 index 000000000..c47a467ec --- /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"] + +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", From 8e5382939340ca7c9bfa39d961177b47291f1ef4 Mon Sep 17 00:00:00 2001 From: Noah Birrer Date: Mon, 7 Oct 2024 16:23:03 -0400 Subject: [PATCH 2/4] chore: fix lint failure --- packages/monitoring/tasks.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/monitoring/tasks.yaml b/packages/monitoring/tasks.yaml index fc654076b..3de4e5238 100644 --- a/packages/monitoring/tasks.yaml +++ b/packages/monitoring/tasks.yaml @@ -6,4 +6,4 @@ tasks: - name: validate actions: - task: prometheus:validate - - task: grafana:validate \ No newline at end of file + - task: grafana:validate From ba98e01e57194eba4e36f6975ea322ca9e1a04c1 Mon Sep 17 00:00:00 2001 From: Noah Birrer Date: Mon, 7 Oct 2024 17:32:47 -0400 Subject: [PATCH 3/4] fix: add dependency on `identity-authorization` --- packages/monitoring/zarf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/monitoring/zarf.yaml b/packages/monitoring/zarf.yaml index c47a467ec..02881df98 100644 --- a/packages/monitoring/zarf.yaml +++ b/packages/monitoring/zarf.yaml @@ -6,7 +6,7 @@ metadata: # x-release-please-start-version version: "0.28.0" # x-release-please-end - x-uds-dependencies: ["base"] + x-uds-dependencies: ["base", "identity-authorization"] components: # Prometheus From a09559075cbbc737aee255ee1511809f5a71df82 Mon Sep 17 00:00:00 2001 From: Noah Birrer Date: Mon, 7 Oct 2024 17:35:20 -0400 Subject: [PATCH 4/4] [ci skip] docs: update readme --- packages/monitoring/readme.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/monitoring/readme.md b/packages/monitoring/readme.md index 47282bcc0..e08fe67f7 100644 --- a/packages/monitoring/readme.md +++ b/packages/monitoring/readme.md @@ -1,8 +1,9 @@ # UDS Core Monitoring This layer of UDS Core provides monitoring capabilities. Currently it includes the application(s): -- Grafana -- Prometheus +- grafana +- prometheus To deploy this layer you must also deploy its dependent layer(s): -- Base \ No newline at end of file +- base +- identity-authorization \ No newline at end of file