diff --git a/plugins/varnish4/README.md b/plugins/varnish4/README.md index c861ce3b..f8700e85 100644 --- a/plugins/varnish4/README.md +++ b/plugins/varnish4/README.md @@ -19,9 +19,12 @@ your actual plugins directory. In your plugins.conf add ``` [varnish4_*] + group varnish env.varnishstat varnishstat env.name ``` +`group varnish` Since Varnish version 4.1, Varnish shared log utilities must be run in a context with *varnish* group membership. + `env.varnishstat` can be a full path to varnishstat if it's not in the path already. diff --git a/plugins/varnish4/varnish4_ b/plugins/varnish4/varnish4_ index ed0833e1..e1ac4601 100644 --- a/plugins/varnish4/varnish4_ +++ b/plugins/varnish4/varnish4_ @@ -34,6 +34,7 @@ The plugin needs to be able to execute varnishstat. The configuration section shows the defaults [varnish4_*] + group varnish env.varnishstat varnishstat env.name @@ -630,15 +631,15 @@ my %ASPECTS = ( }, 'bans_tested' => { 'type' => 'DERIVE', - 'min' => '0' + 'min' => '0' }, 'bans_obj_killed' => { 'type' => 'DERIVE', - 'min' => '0' + 'min' => '0' }, 'bans_tests_tested' => { 'type' => 'DERIVE', - 'min' => '0' + 'min' => '0' }, 'bans_dups' => { 'type' => 'GAUGE' @@ -750,6 +751,7 @@ my %ASPECTS = ( }, 'sess_pipe_overflow' => { 'type' => 'DERIVE' + } } }, @@ -778,9 +780,9 @@ my %ASPECTS = ( sub translate_type { my $d = $_[0]; - if ($d eq "i") { + if ($d eq "i" or $d eq "g") { $d = "GAUGE"; - } elsif ($d eq "a") { + } elsif ($d eq "a" or $d eq "c") { $d = "DERIVE"; } return $d;