Skip to content

Commit

Permalink
feat: add monitoring layer (#872)
Browse files Browse the repository at this point in the history
## Description
Adds the monitoring functional layer

## Related Issue

Fixes #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>
  • Loading branch information
noahpb and mjnagel authored Oct 8, 2024
1 parent 44f8ea5 commit 5ecb040
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .github/filters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@ backup-restore:
metrics-server:
- "packages/metrics-server/**"
- "src/metrics-server/**"

monitoring:
- "packages/monitoring/**"
- "src/prometheus-stack/**"
- "src/grafana/**"
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions packages/monitoring/readme.md
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions packages/monitoring/tasks.yaml
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions packages/monitoring/zarf.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions packages/standard/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ components:
- name: kube-prometheus-stack
required: true
import:
path: ../../src/prometheus-stack
path: ../monitoring

# Vector
- name: vector
Expand All @@ -86,7 +86,7 @@ components:
- name: grafana
required: true
import:
path: ../../src/grafana
path: ../monitoring

# Authservice
- name: authservice
Expand Down
1 change: 1 addition & 0 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 5ecb040

Please sign in to comment.