Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-22 02:51:03 +00:00
Code Issues Releases Wiki Activity

varnish4_: Varnish 4.1 compatibiltiy

Browse source
This commit is contained in:
Valur Hrafn Einarsson 2015-11-09 10:24:04 +00:00
parent 9b0c3d69c7
commit 0cb53cdbd3
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/varnish4/README.md
View file

@ -19,9 +19,12 @@ your actual plugins directory.
In your plugins.conf add In your plugins.conf add
``` ```
[varnish4_*] [varnish4_*]
group varnish
env.varnishstat varnishstat env.varnishstat varnishstat
env.name 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 `env.varnishstat` can be a full path to varnishstat if it's
not in the path already. not in the path already.

21
plugins/varnish4/varnish4_
View file

@ -34,6 +34,7 @@ The plugin needs to be able to execute varnishstat.
The configuration section shows the defaults The configuration section shows the defaults
[varnish4_*] [varnish4_*]
group varnish
env.varnishstat varnishstat env.varnishstat varnishstat
env.name env.name
@ -630,15 +631,15 @@ my %ASPECTS = (
}, },
'bans_tested' => { 'bans_tested' => {
'type' => 'DERIVE', 'type' => 'DERIVE',
'min' => '0' 'min' => '0'
}, },
'bans_obj_killed' => { 'bans_obj_killed' => {
'type' => 'DERIVE', 'type' => 'DERIVE',
'min' => '0' 'min' => '0'
}, },
'bans_tests_tested' => { 'bans_tests_tested' => {
'type' => 'DERIVE', 'type' => 'DERIVE',
'min' => '0' 'min' => '0'
}, },
'bans_dups' => { 'bans_dups' => {
'type' => 'GAUGE' 'type' => 'GAUGE'
@ -714,24 +715,31 @@ my %ASPECTS = (
}, },
'sess_drop' => { 'sess_drop' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'backend_unhealthy' => { 'backend_unhealthy' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'fetch_failed' => { 'fetch_failed' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'backend_busy' => { 'backend_busy' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'threads_failed' => { 'threads_failed' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'threads_limited' => { 'threads_limited' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'threads_destroyed' => { 'threads_destroyed' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'thread_queue_len' => { 'thread_queue_len' => {
'type' => 'GAUGE' 'type' => 'GAUGE'
@ -741,15 +749,18 @@ my %ASPECTS = (
}, },
'esi_errors' => { 'esi_errors' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'esi_warnings' => { 'esi_warnings' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'sess_fail' => { 'sess_fail' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
}, },
'sess_pipe_overflow' => { 'sess_pipe_overflow' => {
'type' => 'DERIVE' 'type' => 'DERIVE'
} }
} }
}, },
@ -778,9 +789,9 @@ my %ASPECTS = (
sub translate_type sub translate_type
{ {
my $d = $_[0]; my $d = $_[0];
if ($d eq "i") { if ($d eq "i" or $d eq "g") {
$d = "GAUGE"; $d = "GAUGE";
} elsif ($d eq "a") { } elsif ($d eq "a" or $d eq "c") {
$d = "DERIVE"; $d = "DERIVE";
} }
return $d; return $d;