UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit c25ecadf authored by Ryan Garcia's avatar Ryan Garcia :dizzy: Committed by Ernest Chuang
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

(cherry picked from commit 302a2a77)

54e75ac6 Fixing monitoring release and flux dashboards to bb template
aac387bb Tempo cypress-test kynvero exceptions
8d70663c Fixing flux dashboards
ccc34298 Updating to new tags for relevant packages
parent 1d08a910
No related merge requests found
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:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/loki.git
path: "./chart"
tag: "3.0.5-bb.2"
tag: "3.0.5-bb.3"
# -- Flux reconciliation overrides specifically for the Loki Package
flux: {}
......@@ -602,7 +602,7 @@ monitoring:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
path: "./chart"
tag: "36.2.1-bb.0"
tag: "36.2.1-bb.1"
# -- Flux reconciliation overrides specifically for the Monitoring Package
flux:
......@@ -1088,7 +1088,7 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
path: "./chart"
tag: "1.18.6-bb.5"
tag: "1.18.6-bb.6"
# -- Flux reconciliation overrides specifically for the Anchore Package
flux:
......
......@@ -382,6 +382,7 @@ kyvernopolicies:
- twistlock
- sonarqube
- logging
- tempo
names:
- "*-cypress-test*"
parameters:
......@@ -410,6 +411,7 @@ kyvernopolicies:
- twistlock
- sonarqube
- logging
- tempo
names:
- "*-cypress-test*"
parameters:
......@@ -448,6 +450,7 @@ kyvernopolicies:
- twistlock
- sonarqube
- logging
- tempo
names:
- "*-cypress-test*"
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