From 815263b583f9e56145ac0d9cfa5395d094b00002 Mon Sep 17 00:00:00 2001 From: Anthony D'Atri Date: Sun, 20 Sep 2020 17:37:58 -0700 Subject: [PATCH] doc/man: Add optional reweight-by-utilization args doc/mgr: Grammar and wording for Prometheus labels doc/rados: Spelling and clarity Signed-off-by: Anthony D'Atri --- doc/man/8/ceph.rst | 8 +++++--- doc/mgr/prometheus.rst | 4 ++-- doc/rados/configuration/bluestore-config-ref.rst | 2 +- doc/rados/configuration/network-config-ref.rst | 5 ++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst index 715e667dac1fa..ec06fe356b0be 100644 --- a/doc/man/8/ceph.rst +++ b/doc/man/8/ceph.rst @@ -1193,12 +1193,14 @@ Usage:: ceph osd reweight-by-pg {} { [} + ceph osd reweight-by-utilization { { {}}} {--no-increasing} Subcommand ``rm`` removes osd(s) [...] from the OSD map. diff --git a/doc/mgr/prometheus.rst b/doc/mgr/prometheus.rst index 87296be391471..6fcb292f98fa4 100644 --- a/doc/mgr/prometheus.rst +++ b/doc/mgr/prometheus.rst @@ -241,8 +241,8 @@ Example configuration --------------------- This example shows a single node configuration running ceph-mgr and -node_exporter on a server called ``senta04``. Note that this requires to add the -appropriate instance label to every ``node_exporter`` target individually. +node_exporter on a server called ``senta04``. Note that this requires one +to add an appropriate and unique ``instance`` label to each ``node_exporter`` target. This is just an example: there are other ways to configure prometheus scrape targets and label rewrite rules. diff --git a/doc/rados/configuration/bluestore-config-ref.rst b/doc/rados/configuration/bluestore-config-ref.rst index 027444616cd6f..96a95d571734b 100644 --- a/doc/rados/configuration/bluestore-config-ref.rst +++ b/doc/rados/configuration/bluestore-config-ref.rst @@ -141,7 +141,7 @@ automatically manage these within the space of ``block``. Automatic Cache Sizing ====================== -Bluestore can be configured to automatically resize it's caches when TCMalloc +Bluestore can be configured to automatically resize its caches when TCMalloc is configured as the memory allocator and the ``bluestore_cache_autotune`` setting is enabled. This option is currently enabled by default. Bluestore will attempt to keep OSD heap memory usage under a designated target size via diff --git a/doc/rados/configuration/network-config-ref.rst b/doc/rados/configuration/network-config-ref.rst index 80c6480a7e199..efbd55b3194b4 100644 --- a/doc/rados/configuration/network-config-ref.rst +++ b/doc/rados/configuration/network-config-ref.rst @@ -17,7 +17,10 @@ improvement with a second "cluster" network in a large cluster. It is possible to run a Ceph Storage Cluster with two networks: a public (front-side) network and a cluster (back-side) network. However, this approach -complicates network configuration (both hardware and software) and does not usually have a significant impact on overall performance. For this reason, we generally recommend that dual-NIC systems either be configured with two IPs on the same network, or bonded. +complicates network configuration (both hardware and software) and does not usually +have a significant impact on overall performance. For this reason, we recommend +that for resilience and capacity dual-NIC systems either active/active bond +these interfaces or implemebnt a layer 3 multipath strategy with eg. FRR. If, despite the complexity, one still wishes to use two networks, each :term:`Ceph Node` will need to have more than one NIC. See `Hardware -- 2.39.5