From bd6c6cf9e221eb428fddd133d1d617081dc90de1 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Sat, 21 Jul 2018 09:27:28 -0700 Subject: [PATCH] docs: clean up FAQs, add initial lists of metrics Signed-off-by: Gyuho Lee --- docs/faq.rst | 22 +++++++++------------- docs/index.rst | 6 ++---- docs/operate.rst | 43 ++++++++++++++++++++++++++++--------------- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 4a760ba64..30fd5a861 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -1,45 +1,41 @@ .. _faq: -FAQs -#### - - General -======= +####### What is etcd? -------------- +============= etcd is a consistent distributed key-value store. Mainly used as a separate coordination service, in distributed systems. And designed to hold small amounts of data that can fit entirely in memory. How to pronounce etcd? ----------------------- +====================== etcd is pronounced ``/etˈ-sē-dē/`` or ``/etˈ-see-dee/``, and means distributed ``etc`` directory. Do clients have to send requests to the etcd leader? ----------------------------------------------------- +==================================================== `Raft `_ is leader-based; the leader handles all client requests which need cluster consensus. However, the client does not need to know which node is the leader. Any request that requires consensus sent to a follower is automatically forwarded to the leader. Requests that do not require consensus (e.g., serialized reads) can be processed by any cluster member. Configuration -============= +############# Difference between listen--urls, advertise-client-urls or initial-advertise-peer-urls? ---------------------------------------------------------------------------------------------------- +=================================================================================================== -``listen-client-urls`` and ``listen-peer-urls`` specify the local addresses etcd server binds to for accepting incoming connections. To listen on a port for all interfaces, specify ``0.0.0.0`` as the listen IP address. +``--listen-client-urls`` and ``--listen-peer-urls`` specify the local addresses etcd server binds to for accepting incoming connections. To listen on a port for all interfaces, specify ``0.0.0.0`` as the listen IP address. -``advertise-client-urls`` and ``initial-advertise-peer-urls`` specify the addresses etcd clients or other etcd members should use to contact the etcd server. The advertise addresses must be reachable from the remote machines. Do not advertise addresses like ``localhost`` or ``0.0.0.0`` for a production setup since these addresses are unreachable from remote machines. +``--advertise-client-urls`` and ``--initial-advertise-peer-urls`` specify the addresses etcd clients or other etcd members should use to contact the etcd server. The advertise addresses must be reachable from the remote machines. Do not advertise addresses like ``localhost`` or ``0.0.0.0`` for a production setup since these addresses are unreachable from remote machines. Changing "listen-peer-urls" or "initial-advertise-peer-urls" does not update advertised peer URLs in member list output? ------------------------------------------------------------------------------------------------------------------------- +======================================================================================================================== A member's advertised peer URLs come from ``--initial-advertise-peer-urls`` on initial cluster boot. Changing the listen peer URLs or the initial advertise peers after booting the member won't affect the exported advertise peer URLs (e.g. ``etcdctl member list`` output remains the same), since changes must go through quorum to avoid membership configuration split brain. Use `etcdctl member update` to update a member's peer URLs. diff --git a/docs/index.rst b/docs/index.rst index 8f9eb4123..f2a14f6ca 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -7,20 +7,18 @@ This is official etcd documentation. Still working in progress... * :ref:`set-up`: setting up an etcd cluster. -* :ref:`operate`: operating an etcd cluster. * :ref:`monitor`: monitoring an etcd cluster. -* :ref:`faq`: frequently asked questions. * :ref:`client-architecture`: describes etcd client components. .. toctree:: :maxdepth: 3 - :caption: Set up + :caption: Get started set-up .. toctree:: :maxdepth: 3 - :caption: Operate + :caption: Operations operate diff --git a/docs/operate.rst b/docs/operate.rst index 41a3cf596..9cef198c0 100644 --- a/docs/operate.rst +++ b/docs/operate.rst @@ -1,18 +1,3 @@ -.. _operate: - - -Operate -####### - -TODO - - -Introduction -============ - -TODO - - .. _monitor: @@ -20,3 +5,31 @@ Monitor ####### TODO + + +List of metrics +############### + +Latest +====== + +.. literalinclude:: metrics-latest + :language: BASH + +v3.3 +==== + +.. literalinclude:: metrics-v3.3 + :language: BASH + +v3.2 +==== + +.. literalinclude:: metrics-v3.2 + :language: BASH + +v3.1 +==== + +.. literalinclude:: metrics-v3.1 + :language: BASH