summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-12-07 13:36:54 +0100
committermh <mh@immerda.ch>2012-12-07 13:36:54 +0100
commit3d7b4433f02536a5ddfb11bf27d5174a9c1dc974 (patch)
tree4e7bb79e25c71eab65bdbfa04607f0f20bf86a7f
parent40bed26dda08c26518798f21e6df1fb6f0e8c561 (diff)
fix entries label parsingHEADmaster
-rw-r--r--files/munin/squid20
1 files changed, 11 insertions, 9 deletions
diff --git a/files/munin/squid b/files/munin/squid
index 3a84ef8..8d16161 100644
--- a/files/munin/squid
+++ b/files/munin/squid
@@ -180,8 +180,9 @@ if($ARGV[0] and $ARGV[0] eq "config")
$config{'squid_ipcache'}{'graph'}{'vlabel'} = 'Count';
$config{'squid_ipcache'}{'graph'}{'args'} = '--base 1000';# --logarithmic';
$config{'squid_ipcache'}{'graph'}{'category'} = 'squid';
- $config{'squid_ipcache'}{'graph'}{'order'} = 'request hits misses numhits neghits invdreqests entries';
- $config{'squid_ipcache'}{'field'}{'entries'}{'label'} = 'Entries';
+ $config{'squid_ipcache'}{'graph'}{'order'} = 'request hits misses numhits neghits invdreqests entries_in_use entries_cached';
+ $config{'squid_ipcache'}{'field'}{'entries_in_use'}{'label'} = 'Entries In Use';
+ $config{'squid_ipcache'}{'field'}{'entries_cached'}{'label'} = 'Entries Cached';
$config{'squid_ipcache'}{'field'}{'request'}{'label'} = 'Requests';
$config{'squid_ipcache'}{'field'}{'hits'}{'label'} = 'Hits';
$config{'squid_ipcache'}{'field'}{'neghits'}{'label'} = 'Negative Hits';
@@ -394,13 +395,14 @@ while (my $line = $cm->getline)
$cm = squid_requst('ipcache');
while (my $line = $cm->getline)
{
- if($line =~ /IPcache Entries:.*/) { $data{'squid_ipcache'}{'entries'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Requests:.*/) { $data{'squid_ipcache'}{'request'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Hits:.*/) { $data{'squid_ipcache'}{'hits'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Negative Hits:.*/) { $data{'squid_ipcache'}{'neghits'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Numeric Hits:.*/) { $data{'squid_ipcache'}{'numhits'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Misses:.*/) { $data{'squid_ipcache'}{'misses'} = ($line =~ /(\d+)/g)[0]; next; }
- if($line =~ /IPcache Invalid Request:.*/) { $data{'squid_ipcache'}{'invdreqests'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Entries In Use:.*/) { $data{'squid_ipcache'}{'entries_in_use'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Entries Cached:.*/) { $data{'squid_ipcache'}{'entries_cached'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Requests:.*/) { $data{'squid_ipcache'}{'request'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Hits:.*/) { $data{'squid_ipcache'}{'hits'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Negative Hits:.*/) { $data{'squid_ipcache'}{'neghits'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Numeric Hits:.*/) { $data{'squid_ipcache'}{'numhits'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Misses:.*/) { $data{'squid_ipcache'}{'misses'} = ($line =~ /(\d+)/g)[0]; next; }
+ if($line =~ /IPcache Invalid Request:.*/) { $data{'squid_ipcache'}{'invdreqests'} = ($line =~ /(\d+)/g)[0]; next; }
}
# ----------------- squid_traffic and squid_requests --------------------