Merge branch 'master' into csibbitt/STF-1549_prometheus_token_auth

infrawatch · Dec 7, 2023 · f8350bc · f8350bc
2 parents bb2bead + eea657b
commit f8350bc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 43 deletions.
diff --git a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc
@@ -27,10 +27,8 @@ ifdef::include_when_16[]
 //include::../modules/proc_overriding-the-default-grafana-container-image.adoc[leveloffset=+2]
 include::../modules/proc_importing-dashboards.adoc[leveloffset=+2]
 endif::include_when_16[]
-include::../modules/proc_retrieving-and-setting-grafana-login-credentials.adoc[leveloffset=+2]
 include::../modules/proc_connecting-an-external-dashboard-system.adoc[leveloffset=+2]
 
-
 //Editing the metrics retention time period
 include::../modules/con_metrics-retention-time-period.adoc[leveloffset=+1]
 include::../modules/proc_editing-the-metrics-retention-time-period-in-service-telemetry-framework.adoc[leveloffset=+2]

diff --git a/...ry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc b/...ry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc