UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 302a2a77 authored by Ryan Garcia's avatar Ryan Garcia :dizzy:
Browse files

Merge branch '1243-dashboards' into 'master'

Resolve "Migrate BigBang Package Grafana Dashboards to their own Packages"

Closes #1243

See merge request platform-one/big-bang/bigbang!1873
parents 1e547e32 88c5fbe8
No related branches found
No related tags found
1 merge request!1873Resolve "Migrate BigBang Package Grafana Dashboards to their own Packages"
Pipeline #885389 passed
apiVersion: kpt.dev/v1alpha1
kind: Kptfile
metadata:
name: dashboards
upstream:
type: git
git:
commit: 4b4e6b1be3413358654e74f98bac5339aed28868
repo: https://github.com/fluxcd/flux2
directory: /manifests/monitoring/grafana/dashboards
ref: v0.26.1
This diff is collapsed.
This diff is collapsed.
{{- if .Values.monitoring.enabled }}
apiVersion: v1
kind: ConfigMap
metadata:
name: flux-grafana-dashboards
namespace: monitoring
labels:
grafana_dashboard: "1"
data:
flux-cluster-dashboard.json: |
{{ .Files.Get "dashboards/flux/cluster.json" | nindent 4 }}
flux-control-plane-dashboard.json: |
{{ .Files.Get "dashboards/flux/control-plane.json" | nindent 4 }}
{{- end }}
...@@ -509,7 +509,7 @@ loki: ...@@ -509,7 +509,7 @@ loki:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/loki.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/loki.git
path: "./chart" path: "./chart"
tag: "3.0.5-bb.2" tag: "3.0.5-bb.3"
# -- Flux reconciliation overrides specifically for the Loki Package # -- Flux reconciliation overrides specifically for the Loki Package
flux: {} flux: {}
...@@ -602,7 +602,7 @@ monitoring: ...@@ -602,7 +602,7 @@ monitoring:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
path: "./chart" path: "./chart"
tag: "36.2.1-bb.0" tag: "36.2.1-bb.1"
# -- Flux reconciliation overrides specifically for the Monitoring Package # -- Flux reconciliation overrides specifically for the Monitoring Package
flux: flux:
...@@ -1088,7 +1088,7 @@ addons: ...@@ -1088,7 +1088,7 @@ addons:
git: git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
path: "./chart" path: "./chart"
tag: "1.18.6-bb.5" tag: "1.18.6-bb.6"
# -- Flux reconciliation overrides specifically for the Anchore Package # -- Flux reconciliation overrides specifically for the Anchore Package
flux: flux:
......
...@@ -382,6 +382,7 @@ kyvernopolicies: ...@@ -382,6 +382,7 @@ kyvernopolicies:
- twistlock - twistlock
- sonarqube - sonarqube
- logging - logging
- tempo
names: names:
- "*-cypress-test*" - "*-cypress-test*"
parameters: parameters:
...@@ -410,6 +411,7 @@ kyvernopolicies: ...@@ -410,6 +411,7 @@ kyvernopolicies:
- twistlock - twistlock
- sonarqube - sonarqube
- logging - logging
- tempo
names: names:
- "*-cypress-test*" - "*-cypress-test*"
parameters: parameters:
...@@ -448,6 +450,7 @@ kyvernopolicies: ...@@ -448,6 +450,7 @@ kyvernopolicies:
- twistlock - twistlock
- sonarqube - sonarqube
- logging - logging
- tempo
names: names:
- "*-cypress-test*" - "*-cypress-test*"
update-image-pull-policy: update-image-pull-policy:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment