Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01: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
Show Stats 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
```
[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.

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
[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'
@ -714,24 +715,31 @@ my %ASPECTS = (
},
'sess_drop' => {
'type' => 'DERIVE'
},
'backend_unhealthy' => {
'type' => 'DERIVE'
},
'fetch_failed' => {
'type' => 'DERIVE'
},
'backend_busy' => {
'type' => 'DERIVE'
},
'threads_failed' => {
'type' => 'DERIVE'
},
'threads_limited' => {
'type' => 'DERIVE'
},
'threads_destroyed' => {
'type' => 'DERIVE'
},
'thread_queue_len' => {
'type' => 'GAUGE'
@ -741,15 +749,18 @@ my %ASPECTS = (
},
'esi_errors' => {
'type' => 'DERIVE'
},
'esi_warnings' => {
'type' => 'DERIVE'
},
'sess_fail' => {
'type' => 'DERIVE'
},
'sess_pipe_overflow' => {
'type' => 'DERIVE'
}
}
},
@ -778,9 +789,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;