Commit 5d372d6f authored by Nils Goroll's avatar Nils Goroll

fix remaining stats details

Most of the work was done in a93c4555, this
commit fixes remaining regressions compared with 5.1.2 release

Fixes #2340
parent 514f4db8
...@@ -327,36 +327,44 @@ ...@@ -327,36 +327,44 @@
.. varnish_vsc:: s_req_hdrbytes .. varnish_vsc:: s_req_hdrbytes
:oneliner: Request header bytes :oneliner: Request header bytes
:format: bytes
Total request header bytes received Total request header bytes received
.. varnish_vsc:: s_req_bodybytes .. varnish_vsc:: s_req_bodybytes
:oneliner: Request body bytes :oneliner: Request body bytes
:format: bytes
Total request body bytes received Total request body bytes received
.. varnish_vsc:: s_resp_hdrbytes .. varnish_vsc:: s_resp_hdrbytes
:oneliner: Response header bytes :oneliner: Response header bytes
:format: bytes
Total response header bytes transmitted Total response header bytes transmitted
.. varnish_vsc:: s_resp_bodybytes .. varnish_vsc:: s_resp_bodybytes
:oneliner: Response body bytes :oneliner: Response body bytes
:format: bytes
Total response body bytes transmitted Total response body bytes transmitted
:format: bytes
.. varnish_vsc:: s_pipe_hdrbytes .. varnish_vsc:: s_pipe_hdrbytes
:oneliner: Pipe request header bytes :oneliner: Pipe request header bytes
:format: bytes
Total request bytes received for piped sessions Total request bytes received for piped sessions
.. varnish_vsc:: s_pipe_in .. varnish_vsc:: s_pipe_in
:oneliner: Piped bytes from client :oneliner: Piped bytes from client
:format: bytes
Total number of bytes forwarded from clients in pipe sessions Total number of bytes forwarded from clients in pipe sessions
.. varnish_vsc:: s_pipe_out .. varnish_vsc:: s_pipe_out
:oneliner: Piped bytes to client :oneliner: Piped bytes to client
:format: bytes
Total number of bytes forwarded to clients in pipe sessions Total number of bytes forwarded to clients in pipe sessions
...@@ -636,6 +644,7 @@ ...@@ -636,6 +644,7 @@
.. varnish_vsc:: bans_persisted_bytes .. varnish_vsc:: bans_persisted_bytes
:type: gauge :type: gauge
:format: bytes
:level: diag :level: diag
:oneliner: Bytes used by the persisted ban lists :oneliner: Bytes used by the persisted ban lists
...@@ -643,6 +652,7 @@ ...@@ -643,6 +652,7 @@
.. varnish_vsc:: bans_persisted_fragmentation .. varnish_vsc:: bans_persisted_fragmentation
:type: gauge :type: gauge
:format: bytes
:level: diag :level: diag
:oneliner: Extra bytes in persisted ban lists due to fragmentation :oneliner: Extra bytes in persisted ban lists due to fragmentation
...@@ -718,6 +728,7 @@ ...@@ -718,6 +728,7 @@
.. varnish_vsc:: vsm_free .. varnish_vsc:: vsm_free
:type: gauge :type: gauge
:format: bytes
:level: diag :level: diag
:oneliner: Free VSM space :oneliner: Free VSM space
...@@ -726,6 +737,7 @@ ...@@ -726,6 +737,7 @@
.. varnish_vsc:: vsm_used .. varnish_vsc:: vsm_used
:type: gauge :type: gauge
:format: bytes
:level: diag :level: diag
:oneliner: Used VSM space :oneliner: Used VSM space
...@@ -734,6 +746,7 @@ ...@@ -734,6 +746,7 @@
.. varnish_vsc:: vsm_cooling .. varnish_vsc:: vsm_cooling
:type: gauge :type: gauge
:format: bytes
:level: debug :level: debug
:oneliner: Cooling VSM space :oneliner: Cooling VSM space
...@@ -743,6 +756,7 @@ ...@@ -743,6 +756,7 @@
.. varnish_vsc:: vsm_overflow .. varnish_vsc:: vsm_overflow
:type: gauge :type: gauge
:format: bytes
:level: diag :level: diag
:oneliner: Overflow VSM space :oneliner: Overflow VSM space
...@@ -753,6 +767,7 @@ ...@@ -753,6 +767,7 @@
.. varnish_vsc:: vsm_overflowed .. varnish_vsc:: vsm_overflowed
:level: diag :level: diag
:format: bytes
:oneliner: Overflowed VSM space :oneliner: Overflowed VSM space
Total number of bytes which did not fit in the shared memory used Total number of bytes which did not fit in the shared memory used
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
.. varnish_vsc:: uptime .. varnish_vsc:: uptime
:type: counter :type: counter
:format: duration
:level: info :level: info
:oneliner: Management process uptime :oneliner: Management process uptime
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
.. varnish_vsc:: happy .. varnish_vsc:: happy
:type: bitmap :type: bitmap
:format: bitmap
:level: info :level: info
:oneliner: Happy health probes :oneliner: Happy health probes
......
...@@ -43,7 +43,7 @@ import collections ...@@ -43,7 +43,7 @@ import collections
TYPES = [ "counter", "gauge", "bitmap" ] TYPES = [ "counter", "gauge", "bitmap" ]
CTYPES = [ "uint64_t" ] CTYPES = [ "uint64_t" ]
LEVELS = [ "info", "diag", "debug" ] LEVELS = [ "info", "diag", "debug" ]
FORMATS = [ "integer", "bytes", "duration" ] FORMATS = [ "integer", "bytes", "bitmap", "duration" ]
PARAMS = { PARAMS = {
"type": ["counter", TYPES], "type": ["counter", TYPES],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment