From 02496a0a485cd9e23be05ac6a9735c14017b3444 Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Wed, 10 Aug 2016 18:12:58 -0700 Subject: [PATCH 1/5] Add more details into specific failure reasons. --- .../http_conn_man/access_log.rst | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/configuration/http_conn_man/access_log.rst b/docs/configuration/http_conn_man/access_log.rst index cad9b0d74cbfd..2e9bc95ed0880 100644 --- a/docs/configuration/http_conn_man/access_log.rst +++ b/docs/configuration/http_conn_man/access_log.rst @@ -70,15 +70,18 @@ entry. The following command operators are supported: %FAILURE_REASON% Additional failure reason if any in addition to response code. Possible values are: - * **LH**: Local health check failed. - * **UH**: No healthy upstream. - * **UT**: Upstream request timeout. - * **LR**: Connection local reset. - * **UR**: Upstream remote reset. - * **UF**: Upstream connection failure. - * **UC**: Upstream connection termination. - * **UO**: Upstream overflow (circuit breaking). - * **NR**: No route configured for a given request. + * **LH**: Local service failed :ref:`health check request ` + in addition to 503 response code. + * **UH**: No healthy upstream hosts in upstream cluster in addition to 503 response code. + * **UT**: Upstream request timeout in addition to 504 response code. + * **LR**: Connection local reset in addition to 503 response code. + * **UR**: Upstream remote reset in addition to 503 response code. + * **UF**: Upstream connection failure in addition to 503 response code. + * **UC**: Upstream connection termination in addition to 503 response code. + * **UO**: Upstream overflow (circuit breaking) in addition to 503 response code. + Envoy performed :ref:`circuit breaking `. + * **NR**: No :ref:`route configured ` for a given request + in addition to 404 response code. %UPSTREAM_HOST% Upstream host URL (e.g., tcp://ip:port for TCP connections). From a6127350039668bab9700d677d92267e3d29e07b Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Wed, 10 Aug 2016 18:14:52 -0700 Subject: [PATCH 2/5] remove spaces. --- .../http_conn_man/access_log.rst | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/configuration/http_conn_man/access_log.rst b/docs/configuration/http_conn_man/access_log.rst index 2e9bc95ed0880..12011a5b99ee1 100644 --- a/docs/configuration/http_conn_man/access_log.rst +++ b/docs/configuration/http_conn_man/access_log.rst @@ -70,18 +70,18 @@ entry. The following command operators are supported: %FAILURE_REASON% Additional failure reason if any in addition to response code. Possible values are: - * **LH**: Local service failed :ref:`health check request ` - in addition to 503 response code. - * **UH**: No healthy upstream hosts in upstream cluster in addition to 503 response code. - * **UT**: Upstream request timeout in addition to 504 response code. - * **LR**: Connection local reset in addition to 503 response code. - * **UR**: Upstream remote reset in addition to 503 response code. - * **UF**: Upstream connection failure in addition to 503 response code. - * **UC**: Upstream connection termination in addition to 503 response code. - * **UO**: Upstream overflow (circuit breaking) in addition to 503 response code. - Envoy performed :ref:`circuit breaking `. - * **NR**: No :ref:`route configured ` for a given request - in addition to 404 response code. + * **LH**: Local service failed :ref:`health check request ` + in addition to 503 response code. + * **UH**: No healthy upstream hosts in upstream cluster in addition to 503 response code. + * **UT**: Upstream request timeout in addition to 504 response code. + * **LR**: Connection local reset in addition to 503 response code. + * **UR**: Upstream remote reset in addition to 503 response code. + * **UF**: Upstream connection failure in addition to 503 response code. + * **UC**: Upstream connection termination in addition to 503 response code. + * **UO**: Upstream overflow (circuit breaking) in addition to 503 response code. + Envoy performed :ref:`circuit breaking `. + * **NR**: No :ref:`route configured ` for a given request + in addition to 404 response code. %UPSTREAM_HOST% Upstream host URL (e.g., tcp://ip:port for TCP connections). From 2a752813b76b5d4309bfd68e15f1c04f87376e73 Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Wed, 10 Aug 2016 18:15:54 -0700 Subject: [PATCH 3/5] Add Makefile. --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000..9b9c60646efa2 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +VENV := build/venv +DOCS_OUTPUT_DIR ?= generated/docs + +.PHONY: docs +docs: + rm -fr generated/docs + mkdir -p generated/docs + docs/build.sh $(DOCS_OUTPUT_DIR) From cb0ef3b902d6337605d1da53da3e983f022baf54 Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Wed, 10 Aug 2016 18:20:41 -0700 Subject: [PATCH 4/5] Fix tab in Makefile. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9b9c60646efa2..aaed3a20869e7 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,6 @@ DOCS_OUTPUT_DIR ?= generated/docs .PHONY: docs docs: - rm -fr generated/docs - mkdir -p generated/docs - docs/build.sh $(DOCS_OUTPUT_DIR) + rm -fr generated/docs + mkdir -p generated/docs + docs/build.sh $(DOCS_OUTPUT_DIR) From a08c83ca09f1f72168a21a892b299fd4dc970a3a Mon Sep 17 00:00:00 2001 From: Roman Dzhabarov Date: Wed, 10 Aug 2016 18:29:37 -0700 Subject: [PATCH 5/5] Refine definitions. --- docs/configuration/http_conn_man/access_log.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/configuration/http_conn_man/access_log.rst b/docs/configuration/http_conn_man/access_log.rst index 12011a5b99ee1..0fe2e7833c52b 100644 --- a/docs/configuration/http_conn_man/access_log.rst +++ b/docs/configuration/http_conn_man/access_log.rst @@ -70,18 +70,15 @@ entry. The following command operators are supported: %FAILURE_REASON% Additional failure reason if any in addition to response code. Possible values are: - * **LH**: Local service failed :ref:`health check request ` - in addition to 503 response code. + * **LH**: Local service failed :ref:`health check request ` in addition to 503 response code. * **UH**: No healthy upstream hosts in upstream cluster in addition to 503 response code. * **UT**: Upstream request timeout in addition to 504 response code. * **LR**: Connection local reset in addition to 503 response code. * **UR**: Upstream remote reset in addition to 503 response code. * **UF**: Upstream connection failure in addition to 503 response code. * **UC**: Upstream connection termination in addition to 503 response code. - * **UO**: Upstream overflow (circuit breaking) in addition to 503 response code. - Envoy performed :ref:`circuit breaking `. - * **NR**: No :ref:`route configured ` for a given request - in addition to 404 response code. + * **UO**: Upstream overflow (:ref:`circuit breaking `) in addition to 503 response code. + * **NR**: No :ref:`route configured ` for a given request in addition to 404 response code. %UPSTREAM_HOST% Upstream host URL (e.g., tcp://ip:port for TCP connections).