UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 313df0bb authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch 'grafana-curl' into 'master'

Grafana: Use IB image for curl

Closes platform-one/big-bang/apps/core/monitoring#24

See merge request platform-one/big-bang/bigbang!953
parents f68b2fdb 1b634de5
No related branches found
No related tags found
1 merge request!953Grafana: Use IB image for curl
Pipeline #513087 passed
......@@ -389,7 +389,7 @@ monitoring:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
path: "./chart"
tag: "14.0.0-bb.10"
tag: "14.0.0-bb.11"
# -- Flux reconciliation overrides specifically for the Monitoring Package
flux:
......
......@@ -142,6 +142,32 @@ monitoring:
grafana:
testFramework:
enabled: false
dashboards:
default:
k8s-deployment:
gnetId: 741
revision: 1
datasource: Prometheus
downloadDashboards:
resources:
limits:
cpu: 20m
memory: 20Mi
requests:
cpu: 20m
memory: 20Mi
dashboardProviders:
dashboardproviders.yaml:
apiVersion: 1
providers:
- name: 'default'
orgId: 1
folder: ''
type: file
disableDeletion: false
editable: true
options:
path: /var/lib/grafana/dashboards
bbtests:
enabled: true
cypress:
......
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