From 78b99b8595e49db5d42bd037863b9ab15c8f5e05 Mon Sep 17 00:00:00 2001 From: dipohl Date: Mon, 27 Feb 2017 00:25:28 +0100 Subject: [PATCH] Category Tree: Reduce number of categories memcached -> memory (memcached) --- plugins/memcached/memcached_bytes_ | 2 +- plugins/memcached/memcached_bytes_all | 2 +- plugins/memcached/memcached_connections_ | 2 +- .../memcached_ext_bytes_ | 2 +- .../memcached_ext_connections_ | 2 +- .../memcached_ext_hits_ | 2 +- .../memcached_ext_items_ | 2 +- .../memcached_ext_requests_ | 2 +- .../memcached_ext_traffic_ | 2 +- plugins/memcached/memcached_hits_ | 2 +- plugins/memcached/memcached_items_ | 2 +- plugins/memcached/memcached_multi_ | 30 +++++++++---------- plugins/memcached/memcached_requests_ | 2 +- plugins/memcached/memcached_servers_ | 10 +++---- plugins/memcached/memcached_traffic_ | 2 +- 15 files changed, 33 insertions(+), 33 deletions(-) rename plugins/{memcached_ext => memcached}/memcached_ext_bytes_ (97%) rename plugins/{memcached_ext => memcached}/memcached_ext_connections_ (97%) rename plugins/{memcached_ext => memcached}/memcached_ext_hits_ (97%) rename plugins/{memcached_ext => memcached}/memcached_ext_items_ (97%) rename plugins/{memcached_ext => memcached}/memcached_ext_requests_ (97%) rename plugins/{memcached_ext => memcached}/memcached_ext_traffic_ (97%) diff --git a/plugins/memcached/memcached_bytes_ b/plugins/memcached/memcached_bytes_ index 34be30bc..c9aeefb3 100755 --- a/plugins/memcached/memcached_bytes_ +++ b/plugins/memcached/memcached_bytes_ @@ -11,7 +11,7 @@ if ($cmd eq 'config') { print "graph_title Memcached bytes used\n"; print "graph_args --base 1024 -l 0\n"; print "graph_vlabel bytes\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the size of the memcached cache.\n"; print "bytes.label bytes used\n"; print "bytes.info Number of bytes currently used\n"; diff --git a/plugins/memcached/memcached_bytes_all b/plugins/memcached/memcached_bytes_all index 72a5d679..7b7bbe95 100755 --- a/plugins/memcached/memcached_bytes_all +++ b/plugins/memcached/memcached_bytes_all @@ -40,7 +40,7 @@ if ($cmd eq 'config') { print "graph_title Memcached bytes used for all instances\n"; print "graph_args --base 1024 -l 0\n"; print "graph_vlabel bytes\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the size of the memcached cache for every instance.\n"; foreach my $instance_name (keys(%instances)) { diff --git a/plugins/memcached/memcached_connections_ b/plugins/memcached/memcached_connections_ index 55c3e051..068707ab 100755 --- a/plugins/memcached/memcached_connections_ +++ b/plugins/memcached/memcached_connections_ @@ -11,7 +11,7 @@ if ($cmd eq 'config') { print "graph_title Memcached connections\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel connections\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the connections to the memcached server.\n"; print "connections.label connections\n"; print "connections.info Number of connections to memcached\n"; diff --git a/plugins/memcached_ext/memcached_ext_bytes_ b/plugins/memcached/memcached_ext_bytes_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_bytes_ rename to plugins/memcached/memcached_ext_bytes_ index 10642a94..8dda1871 100755 --- a/plugins/memcached_ext/memcached_ext_bytes_ +++ b/plugins/memcached/memcached_ext_bytes_ @@ -34,7 +34,7 @@ if ($cmd eq 'config') { print "graph_title Memcached bytes used on $label\n"; print "graph_args --base 1024 -l 0\n"; print "graph_vlabel bytes\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the size of the memcached cache.\n"; print "bytes.label bytes used\n"; print "bytes.info Number of bytes currently used\n"; diff --git a/plugins/memcached_ext/memcached_ext_connections_ b/plugins/memcached/memcached_ext_connections_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_connections_ rename to plugins/memcached/memcached_ext_connections_ index 57d1be7c..326c3afc 100755 --- a/plugins/memcached_ext/memcached_ext_connections_ +++ b/plugins/memcached/memcached_ext_connections_ @@ -34,7 +34,7 @@ if ($cmd eq 'config') { print "graph_title Memcached connections on $label\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel connections\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the connections to the memcached server.\n"; print "connections.label connections\n"; print "connections.info Number of connections to memcached\n"; diff --git a/plugins/memcached_ext/memcached_ext_hits_ b/plugins/memcached/memcached_ext_hits_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_hits_ rename to plugins/memcached/memcached_ext_hits_ index d2a7724d..2aca77a5 100755 --- a/plugins/memcached_ext/memcached_ext_hits_ +++ b/plugins/memcached/memcached_ext_hits_ @@ -36,7 +36,7 @@ if ($cmd eq 'config') { print "graph_title Memcached cache hits and misses on $label\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of cache hits and misses.\n"; print "hits.label hits\n"; print "hits.info Number of cache hits\n"; diff --git a/plugins/memcached_ext/memcached_ext_items_ b/plugins/memcached/memcached_ext_items_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_items_ rename to plugins/memcached/memcached_ext_items_ index 39b56503..19e359f4 100755 --- a/plugins/memcached_ext/memcached_ext_items_ +++ b/plugins/memcached/memcached_ext_items_ @@ -35,7 +35,7 @@ if ($cmd eq 'config') { print "graph_title Memcached cached items on $label\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel items\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of items stored by the memcached server.\n"; print "items.label items\n"; print "items.info Number of cached items\n"; diff --git a/plugins/memcached_ext/memcached_ext_requests_ b/plugins/memcached/memcached_ext_requests_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_requests_ rename to plugins/memcached/memcached_ext_requests_ index b7b75fce..9c1d9017 100755 --- a/plugins/memcached_ext/memcached_ext_requests_ +++ b/plugins/memcached/memcached_ext_requests_ @@ -35,7 +35,7 @@ if ($cmd eq 'config') { print "graph_title Memcached requests on $label\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of get and set requests.\n"; print "gets.label gets\n"; print "gets.info Number of get requests\n"; diff --git a/plugins/memcached_ext/memcached_ext_traffic_ b/plugins/memcached/memcached_ext_traffic_ similarity index 97% rename from plugins/memcached_ext/memcached_ext_traffic_ rename to plugins/memcached/memcached_ext_traffic_ index 640efc43..a9354ca0 100755 --- a/plugins/memcached_ext/memcached_ext_traffic_ +++ b/plugins/memcached/memcached_ext_traffic_ @@ -35,7 +35,7 @@ if ($cmd eq 'config') { print "graph_title Memcached network traffic on $label\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel bits per \${graph_period}\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the network traffic of the memcached server.\n"; print "up.label bits in\n"; print "up.info Traffic received by memcached\n"; diff --git a/plugins/memcached/memcached_hits_ b/plugins/memcached/memcached_hits_ index d6697728..c0cdc5e2 100755 --- a/plugins/memcached/memcached_hits_ +++ b/plugins/memcached/memcached_hits_ @@ -18,7 +18,7 @@ if ($cmd eq 'config') { print "graph_title Memcached cache hits and misses -- $title\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of cache hits and misses.\n"; print "hits.label hits\n"; print "hits.info Number of cache hits\n"; diff --git a/plugins/memcached/memcached_items_ b/plugins/memcached/memcached_items_ index a8de9c26..92b6cf9f 100755 --- a/plugins/memcached/memcached_items_ +++ b/plugins/memcached/memcached_items_ @@ -11,7 +11,7 @@ if ($cmd eq 'config') { print "graph_title Memcached cached items\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel items\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of items stored by the memcached server.\n"; print "items.label items\n"; print "items.info Number of cached items\n"; diff --git a/plugins/memcached/memcached_multi_ b/plugins/memcached/memcached_multi_ index aa307c37..f38affa0 100755 --- a/plugins/memcached/memcached_multi_ +++ b/plugins/memcached/memcached_multi_ @@ -183,7 +183,7 @@ $graphs{items} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Items in Memcached', - category => 'memcached', + category => 'memory', title => 'Items', info => 'Number of items in use by memcached', }, @@ -197,7 +197,7 @@ $graphs{memory} = { config => { args => '--base 1024 --lower-limit 0', vlabel => 'Bytes Used', - category => 'memcached', + category => 'memory', title => 'Memory Usage', info => 'Memory consumption of memcached', }, @@ -212,7 +212,7 @@ $graphs{bytes} = { args => '--base 1000', vlabel => 'bits in (-) / out (+)', title => 'Network Traffic', - category => 'memcached', + category => 'memory', info => 'Network traffic in (-) / out (+) of the machine', order => 'bytes_read bytes_written', }, @@ -228,7 +228,7 @@ $graphs{conns} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Connections per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Connections', info => 'Number of connections being handled by memcached', order => 'max_conns curr_conns avg_conns', @@ -244,7 +244,7 @@ $graphs{commands} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Commands per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Commands', info => 'Number of commands being handled by memcached', }, @@ -290,7 +290,7 @@ $graphs{evictions} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Evictions per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Evictions', info => 'Number of evictions per second', }, @@ -308,7 +308,7 @@ $graphs{unfetched} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Unfetched Items per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Unfetched Items', info => 'Number of items that were never touched get/incr/append/etc before X occurred', }, @@ -324,7 +324,7 @@ $graphs{slabchnks} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Available Chunks for this Slab', - category => 'memcached', + category => 'memory', title => 'Chunk Usage for Slab: ', info => 'This graph shows you the chunk usage for this memory slab.', }, @@ -339,7 +339,7 @@ $graphs{slabhits} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Hits per Slab per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Hits for Slab: ', info => 'This graph shows you the successful hit rate for this memory slab.', }, @@ -359,7 +359,7 @@ $graphs{slabevics} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Evictions per Slab per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Evictions for Slab: ', info => 'This graph shows you the eviction rate for this memory slab.', }, @@ -377,7 +377,7 @@ $graphs{slabevictime} = { config => { args => '--base 1000 --lower-limit 0', vlabel => ' since Request for LEI', - category => 'memcached', + category => 'memory', title => 'Eviction Request Time for Slab: ', info => 'This graph shows you the time since we requested the last evicted item', }, @@ -391,7 +391,7 @@ $graphs{slabitems} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Items per Slab', - category => 'memcached', + category => 'memory', title => 'Items in Slab: ', info => 'This graph shows you the number of items and reclaimed items per slab.', }, @@ -405,7 +405,7 @@ $graphs{slabitemtime} = { config => { args => '--base 1000 --lower-limit 0', vlabel => ' since item was stored', - category => 'memcached', + category => 'memory', title => 'Age of Eldest Item in Slab: ', info => 'This graph shows you the time of the eldest item in this slab', }, @@ -418,7 +418,7 @@ $graphs{slabunfetched} = { config => { args => '--base 1000 --lower-limit 0', vlabel => 'Unfetched Items per ${graph_period}', - category => 'memcached', + category => 'memory', title => 'Unfetched Items in Slab: ', info => 'Number of items that were never touched get/incr/append/etc before X occurred', }, @@ -863,7 +863,7 @@ sub print_rootmulti_config { # Lets tell munin about the graph we are referencing and print the main config print "multigraph memcached_multi_$plugin\n"; while ( my ($key, $value) = each(%graphconf)) { - if ($key eq 'category') { $value = 'memcached' }; + if ($key eq 'category') { $value = 'memory' }; print "graph_$key $value\n"; } # Lets tell munin about our data values and how to treat them diff --git a/plugins/memcached/memcached_requests_ b/plugins/memcached/memcached_requests_ index b414b674..47d7a7f5 100755 --- a/plugins/memcached/memcached_requests_ +++ b/plugins/memcached/memcached_requests_ @@ -18,7 +18,7 @@ if ($cmd eq 'config') { print "graph_title Memcached requests -- $title\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of get and set requests.\n"; print "gets.label gets\n"; print "gets.info Number of get requests\n"; diff --git a/plugins/memcached/memcached_servers_ b/plugins/memcached/memcached_servers_ index f1262035..bad7f167 100644 --- a/plugins/memcached/memcached_servers_ +++ b/plugins/memcached/memcached_servers_ @@ -93,31 +93,31 @@ if ($cmd eq 'config') { print "graph_title Memcached bytes used\n"; print "graph_args --base 1024 -l 0\n"; print "graph_vlabel bytes\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the size of the memcached cache.\n"; } elsif ($mode eq 'hits') { print "graph_title Memcached cache hits and misses\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of cache hits and misses.\n"; } elsif ($mode eq 'items') { print "graph_title Memcached cached items\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel items\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of items stored by the memcached server.\n"; } elsif ($mode eq 'requests') { print "graph_title Memcached requests\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel requests\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the number of get and set requests.\n"; } elsif ($mode eq 'traffic') { print "graph_title Memcached network traffic\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel bits per \${graph_period}\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the network traffic of the memcached server.\n"; } diff --git a/plugins/memcached/memcached_traffic_ b/plugins/memcached/memcached_traffic_ index b30eee0d..a47cb40a 100755 --- a/plugins/memcached/memcached_traffic_ +++ b/plugins/memcached/memcached_traffic_ @@ -11,7 +11,7 @@ if ($cmd eq 'config') { print "graph_title Memcached network traffic\n"; print "graph_args --base 1000 -l 0\n"; print "graph_vlabel bits per \${graph_period}\n"; - print "graph_category memcached\n"; + print "graph_category memory\n"; print "graph_info This graph monitors the network traffic of the memcached server.\n"; print "up.label bits in\n"; print "up.info Traffic received by memcached\n";