[master] 5d372d6 fix remaining stats details

[Nils Goroll]

commit 5d372d6fd8d659a912f8957ff68d8b4adfdce241
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Jun 12 14:23:51 2017 +0200

    fix remaining stats details
    
    Most of the work was done in a93c4555ef664ce2835cb43d4cccddd188a27ecf, this
    commit fixes remaining regressions compared with 5.1.2 release
    
    Fixes #2340

diff --git a/bin/varnishd/main.vsc b/bin/varnishd/main.vsc
index 97ca0a2..962e4c8 100644
--- a/bin/varnishd/main.vsc
+++ b/bin/varnishd/main.vsc
@@ -327,36 +327,44 @@
 
 .. varnish_vsc:: s_req_hdrbytes
 	:oneliner:	Request header bytes
+	:format:	bytes
 
 	Total request header bytes received
 
 .. varnish_vsc:: s_req_bodybytes
 	:oneliner:	Request body bytes
+	:format:	bytes
 
 	Total request body bytes received
 
 .. varnish_vsc:: s_resp_hdrbytes
 	:oneliner:	Response header bytes
+	:format:	bytes
 
 	Total response header bytes transmitted
 
 .. varnish_vsc:: s_resp_bodybytes
 	:oneliner:	Response body bytes
+	:format:	bytes
 
 	Total response body bytes transmitted
+	:format:	bytes
 
 .. varnish_vsc:: s_pipe_hdrbytes
 	:oneliner:	Pipe request header bytes
+	:format:	bytes
 
 	Total request bytes received for piped sessions
 
 .. varnish_vsc:: s_pipe_in
 	:oneliner:	Piped bytes from client
+	:format:	bytes
 
 	Total number of bytes forwarded from clients in pipe sessions
 
 .. varnish_vsc:: s_pipe_out
 	:oneliner:	Piped bytes to client
+	:format:	bytes
 
 	Total number of bytes forwarded to clients in pipe sessions
 
@@ -636,6 +644,7 @@
 
 .. varnish_vsc:: bans_persisted_bytes
 	:type:	gauge
+	:format:	bytes
 	:level:	diag
 	:oneliner:	Bytes used by the persisted ban lists
 
@@ -643,6 +652,7 @@
 
 .. varnish_vsc:: bans_persisted_fragmentation
 	:type:	gauge
+	:format:	bytes
 	:level:	diag
 	:oneliner:	Extra bytes in persisted ban lists due to fragmentation
 
@@ -718,6 +728,7 @@
 
 .. varnish_vsc:: vsm_free
 	:type:	gauge
+	:format:	bytes
 	:level:	diag
 	:oneliner:	Free VSM space
 
@@ -726,6 +737,7 @@
 
 .. varnish_vsc:: vsm_used
 	:type:	gauge
+	:format:	bytes
 	:level:	diag
 	:oneliner:	Used VSM space
 
@@ -734,6 +746,7 @@
 
 .. varnish_vsc:: vsm_cooling
 	:type:	gauge
+	:format:	bytes
 	:level:	debug
 	:oneliner:	Cooling VSM space
 
@@ -743,6 +756,7 @@
 
 .. varnish_vsc:: vsm_overflow
 	:type:	gauge
+	:format:	bytes
 	:level:	diag
 	:oneliner:	Overflow VSM space
 
@@ -753,6 +767,7 @@
 
 .. varnish_vsc:: vsm_overflowed
 	:level:	diag
+	:format:	bytes
 	:oneliner:	Overflowed VSM space
 
 	Total number of bytes which did not fit in the shared memory used
diff --git a/bin/varnishd/mgt.vsc b/bin/varnishd/mgt.vsc
index 6aee001..d766e99 100644
--- a/bin/varnishd/mgt.vsc
+++ b/bin/varnishd/mgt.vsc
@@ -11,6 +11,7 @@
 
 .. varnish_vsc:: uptime
 	:type:	counter
+	:format:	duration
 	:level:	info
 	:oneliner:	Management process uptime
 
diff --git a/bin/varnishd/vbe.vsc b/bin/varnishd/vbe.vsc
index 6ce7ee1..fee72bf 100644
--- a/bin/varnishd/vbe.vsc
+++ b/bin/varnishd/vbe.vsc
@@ -11,6 +11,7 @@
 
 .. varnish_vsc:: happy
 	:type:	bitmap
+	:format:	bitmap
 	:level:	info
 	:oneliner:	Happy health probes
 
diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
index 0b38843..2d39f7b 100644
--- a/lib/libvcc/vsctool.py
+++ b/lib/libvcc/vsctool.py
@@ -43,7 +43,7 @@ import collections
 TYPES = [ "counter", "gauge", "bitmap" ]
 CTYPES = [ "uint64_t" ]
 LEVELS = [ "info", "diag", "debug" ]
-FORMATS = [ "integer", "bytes", "duration" ]
+FORMATS = [ "integer", "bytes", "bitmap", "duration" ]
 
 PARAMS = {
 	"type":		["counter", TYPES],