From eea657be8bc810150491aa94b51bfc6a6e6fdb4b Mon Sep 17 00:00:00 2001 From: Chris Sibbitt Date: Thu, 7 Dec 2023 15:46:22 -0500 Subject: [PATCH] Basic Auth in Grafana no longer supported (#525) --- .../assembly_advanced-features.adoc | 2 - ...and-setting-grafana-login-credentials.adoc | 41 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 doc-Service-Telemetry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc diff --git a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc index 28916ec4..5a99812a 100644 --- a/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc +++ b/doc-Service-Telemetry-Framework/assemblies/assembly_advanced-features.adoc @@ -27,8 +27,6 @@ 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] - //Editing the metrics retention time period include::../modules/con_metrics-retention-time-period.adoc[leveloffset=+1] diff --git a/doc-Service-Telemetry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc b/doc-Service-Telemetry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc deleted file mode 100644 index b158ee74..00000000 --- a/doc-Service-Telemetry-Framework/modules/proc_retrieving-and-setting-grafana-login-credentials.adoc +++ /dev/null @@ -1,41 +0,0 @@ -[id="proc-retrieving-and-setting-grafana-credentials_{context}"] -= Retrieving and setting Grafana login credentials - -[role="_abstract"] -When Grafana is enabled, you can login using OpenShift authentication, or the default username and password set by the Grafana Operator. - -[WARNING] -==== -Ensure that you log in to access the dashboards with the _Log in with OpenShift_ button, because the default username and password set by the Grafana Operator is deprecated. -==== - -You can override the credentials in the `ServiceTelemetry` object to have {Project} ({ProjectShort}) set the username and password for Grafana instead. - -.Procedure - -. Log in to {OpenShift}. -. Change to the `service-telemetry` namespace: -+ -[source,bash] ----- -$ oc project service-telemetry ----- -. Retrieve the existing username and password from the {ProjectShort} object: -+ -[source,bash] ----- -$ oc get stf default -o jsonpath="{.spec.graphing.grafana['adminUser','adminPassword']}" ----- - -. To modify the default values of the Grafana administrator username and password through the ServiceTelemetry object, use the `graphing.grafana.adminUser` and `graphing.grafana.adminPassword` parameters. -+ -[source,bash] ----- -$ oc edit stf default ----- -. Wait for the grafana pod to restart with the new credentials in place -+ -[source,bash] ----- -$ oc get po -l app=grafana -w -----