few small fixes

Signed-off-by: Sally O'Malley <[email protected]>
securesign · Sep 19, 2023 · d0a331d · d0a331d
1 parent d85e19e
commit d0a331d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/charts/scaffolding/README.md b/charts/scaffolding/README.md
@@ -66,11 +66,11 @@ OPENSHIFT_APPS_SUBDOMAIN=apps.$(oc get dns cluster -o jsonpath='{ .spec.baseDoma
 
 ### Monitor Sigstore Components with Grafana
 
-For real-time analytics through Grafana, refer to our [enable-grafana-monitoring.md](enable-grafana-monitoring.md) guide.
+For real-time analytics through Grafana, refer to our [enable-grafana-monitoring.md](../../enable-grafana-monitoring.md) guide.
 
 ### Sign and/or verify artifacts!
 
-Follow [this](./sign-verify.md) to sign and/or verify artifacts.
+Follow [this](../../sign-verify.md) to sign and/or verify artifacts.
 
 ## Requirements
 

diff --git a/charts/scaffolding/README.md.gotmpl b/charts/scaffolding/README.md.gotmpl
@@ -64,11 +64,11 @@ OPENSHIFT_APPS_SUBDOMAIN=apps.$(oc get dns cluster -o jsonpath='{ .spec.baseDoma
 
 ### Monitor Sigstore Components with Grafana
 
-For real-time analytics through Grafana, refer to our [enable-grafana-monitoring.md](enable-grafana-monitoring.md) guide.
+For real-time analytics through Grafana, refer to our [enable-grafana-monitoring.md](../../enable-grafana-monitoring.md) guide.
 
 ### Sign and/or verify artifacts!
 
-Follow [this](./sign-verify.md) to sign and/or verify artifacts.
+Follow [this](../../sign-verify.md) to sign and/or verify artifacts.
 
 {{ template "chart.requirementsSection" . }}
 

diff --git a/enable-grafana-monitoring.md b/enable-grafana-monitoring.md
@@ -45,17 +45,15 @@ export MYSQL_PASSWORD=$(oc -n trillian-system get secrets trillian-mysql -o=json
 export MYSQL_DATABASE=$(oc -n trillian-system get secrets trillian-mysql -o=jsonpath="{.data.mysql-database}" | base64 -d)
 ```
 
-```bash
-envsubst < grafana/dashboards/datasource.yaml > grafana/dashboards/temp_datasource.yaml 
-mv grafana/dashboards/temp_datasource.yaml grafana/dashboards/datasource.yaml
-```
 ## Step 5: Creating datasources & dashboards
 
 Finally, the datasources and dashboards can be created.
 
 ```bash
-oc apply -k grafana/dashboards
+envsubst < grafana/dashboards/datasource.yaml | oc apply -f -
+oc apply -f grafana/dashboards/dashboard.yaml
 ```
+
 ## Step 6: Access the UI
 
 To find the Grafana UI route, execute:

diff --git a/grafana/dashboards/kustomization.yaml b/grafana/dashboards/kustomization.yaml