Skip to content

Commit a3b2f07

Browse files
authored
Merge pull request ceph#58922 from zdover23/wip-doc-2024-07-30-cephadm-services-monitoring-using-custom-images
doc/cephadm: edit "Using Custom Images" Reviewed-by: Adam King <[email protected]>
2 parents 6703cff + e99fc5c commit a3b2f07

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

doc/cephadm/services/monitoring.rst

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ Using custom images
196196
~~~~~~~~~~~~~~~~~~~
197197

198198
It is possible to install or upgrade monitoring components based on other
199-
images. To do so, the name of the image to be used needs to be stored in the
200-
configuration first. The following configuration options are available.
199+
images. The ID of the image that you plan to use must be stored in the
200+
configuration. The following configuration options are available:
201201

202202
- ``container_image_prometheus``
203203
- ``container_image_grafana``
@@ -213,51 +213,53 @@ configuration first. The following configuration options are available.
213213
- ``container_image_jaeger_collector``
214214
- ``container_image_jaeger_query``
215215

216-
Custom images can be set with the ``ceph config`` command
217-
218-
.. code-block:: bash
216+
Custom images can be set with the ``ceph config`` command. To set custom images, run a command of the following form:
217+
218+
.. prompt:: bash #
219219

220-
ceph config set mgr mgr/cephadm/<option_name> <value>
220+
ceph config set mgr mgr/cephadm/<option_name> <value>
221221

222-
For example
222+
For example:
223223

224-
.. code-block:: bash
224+
.. prompt:: bash #
225225

226-
ceph config set mgr mgr/cephadm/container_image_prometheus prom/prometheus:v1.4.1
226+
ceph config set mgr mgr/cephadm/container_image_prometheus prom/prometheus:v1.4.1
227227

228-
If there were already running monitoring stack daemon(s) of the type whose
229-
image you've changed, you must redeploy the daemon(s) in order to have them
230-
actually use the new image.
228+
If you were already running monitoring stack daemon(s) of the same image type
229+
that you changed, then you must redeploy the daemon(s) in order to make them
230+
use the new image.
231231

232-
For example, if you had changed the prometheus image
232+
For example, if you changed the Prometheus image, you would have to run the
233+
following command in order to pick up the changes:
233234

234235
.. prompt:: bash #
235236

236-
ceph orch redeploy prometheus
237+
ceph orch redeploy prometheus
237238

238239

239240
.. note::
240241

241242
By setting a custom image, the default value will be overridden (but not
242-
overwritten). The default value changes when updates become available.
243-
By setting a custom image, you will not be able to update the component
244-
you have set the custom image for automatically. You will need to
245-
manually update the configuration (image name and tag) to be able to
246-
install updates.
243+
overwritten). The default value will change when an update becomes
244+
available. If you set a custom image, you will not be able automatically
245+
to update the component you have modified with the custom image. You will
246+
need to manually update the configuration (that includes the image name
247+
and the tag) to be able to install updates.
247248

248-
If you choose to go with the recommendations instead, you can reset the
249-
custom image you have set before. After that, the default value will be
250-
used again. Use ``ceph config rm`` to reset the configuration option
249+
If you choose to accept the recommendations, you can reset the custom
250+
image that you have set before. If you do this, the default value will be
251+
used again. Use ``ceph config rm`` to reset the configuration option, in
252+
a command of the following form:
251253

252-
.. code-block:: bash
254+
.. prompt:: bash #
253255

254-
ceph config rm mgr mgr/cephadm/<option_name>
256+
ceph config rm mgr mgr/cephadm/<option_name>
255257

256-
For example
258+
For example:
257259

258-
.. code-block:: bash
260+
.. prompt:: bash #
259261

260-
ceph config rm mgr mgr/cephadm/container_image_prometheus
262+
ceph config rm mgr mgr/cephadm/container_image_prometheus
261263

262264
See also :ref:`cephadm-airgap`.
263265

0 commit comments

Comments
 (0)