From b9554b0840d6973a3abc71d0f816e32c70202dd2 Mon Sep 17 00:00:00 2001 From: Zac Dover Date: Tue, 11 May 2021 09:19:10 +1000 Subject: [PATCH] doc/cephadm: rewrite "config ssl/tls f. grafana" This PR streamlines the grammar in the subsection called "Configuring SSL/TLS for Grafana" in the monitoring.rst file. It also corrects the prompt rst. Signed-off-by: Zac Dover --- doc/cephadm/monitoring.rst | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/cephadm/monitoring.rst b/doc/cephadm/monitoring.rst index e2e180c22bf..96037295860 100644 --- a/doc/cephadm/monitoring.rst +++ b/doc/cephadm/monitoring.rst @@ -108,26 +108,25 @@ completed, you should see something like this from ``ceph orch ls`` Configuring SSL/TLS for Grafana ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``cephadm`` will deploy Grafana using the certificate defined in the ceph -key/value store. If a certificate is not specified, ``cephadm`` will generate a -self-signed certificate during deployment of the Grafana service. +``cephadm`` deploys Grafana using the certificate defined in the ceph +key/value store. If no certificate is specified, ``cephadm`` generates a +self-signed certificate during the deployment of the Grafana service. -A custom certificate can be configured using the following commands. +A custom certificate can be configured using the following commands: -.. code-block:: bash +.. prompt:: bash # ceph config-key set mgr/cephadm/grafana_key -i $PWD/key.pem ceph config-key set mgr/cephadm/grafana_crt -i $PWD/certificate.pem -If you already deployed Grafana, you need to ``reconfig`` the service for the -configuration to be updated. +If you have already deployed Grafana, run ``reconfig`` on the service to +update its configuration: -.. code-block:: bash +.. prompt:: bash # ceph orch reconfig grafana -The ``reconfig`` command also takes care of setting the right URL for Ceph -Dashboard. +The ``reconfig`` command also sets the proper URL for Ceph Dashboard. Using custom images ~~~~~~~~~~~~~~~~~~~ -- 2.39.5