From 2ad552cb0461dbe382728c289e2a4a09832961c2 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Wed, 25 Mar 2015 15:13:27 +0100 Subject: [PATCH] Normalize php's plugin categories --- plugins/php/eaccelerator-python | 4 ++-- plugins/php/eaccelerator-usage | 2 +- plugins/php/php-cgi | 2 +- plugins/php/php-fastcgi | 2 +- plugins/php/php5-fpm_status | 2 +- plugins/php/php_apc_ | 6 +++--- plugins/php/php_eaccelerator | 2 +- plugins/php/php_fpm_process | 2 +- plugins/php/php_opcache | 2 +- plugins/php/php_sessions | 2 +- plugins/php/php_time_execution | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/php/eaccelerator-python b/plugins/php/eaccelerator-python index 8c2da346..2260db1f 100755 --- a/plugins/php/eaccelerator-python +++ b/plugins/php/eaccelerator-python @@ -32,7 +32,7 @@ config = { 'graph_title eacceleratory memory usage\n' + 'graph_info This graph shows memory performance of PHP eaccelerator module\n' + 'graphs_args -1 0\n' + - 'graph_category php\n' + + 'graph_category php-eaccelerator\n' + 'memorysize.label total\n' + 'memorysize.draw AREA\n' + @@ -47,7 +47,7 @@ config = { 'graph_title eacceleratory cached scripts\n' + 'graph_info This graph shows how many scripts are cached by PHP eaccelerator module\n' + 'graphs_args -1 0\n' + - 'graph_category php\n' + + 'graph_category php-eaccelerator\n' + 'cachedscripts.label cached scripts\n' + 'cachedscripts.draw LINE1\n' + diff --git a/plugins/php/eaccelerator-usage b/plugins/php/eaccelerator-usage index a4f740a6..6f72e1b4 100755 --- a/plugins/php/eaccelerator-usage +++ b/plugins/php/eaccelerator-usage @@ -51,7 +51,7 @@ if ($#ARGV eq 0) { if ($ARGV[0] eq 'config') { print "eAccelerator\n"; print "graph_title eAccelerator\n"; - print "graph_category php\n"; + print "graph_category php-eaccelerator\n"; print "memusage.label Memory Usage %\n"; print "memusage.warning 95\n"; print "memusage.critical 95\n"; diff --git a/plugins/php/php-cgi b/plugins/php/php-cgi index 69545d15..7e809a78 100755 --- a/plugins/php/php-cgi +++ b/plugins/php/php-cgi @@ -23,7 +23,7 @@ fi if [ "$1" = "config" ]; then echo "graph_title PHP CGI Memory"; echo "graph_vlabel PHP CGI Memory usage in GB"; - echo "graph_category apache"; + echo "graph_category php-cgi"; echo "graph_args -l 0"; echo "php_cgi_ram.label PHP CGI Used RAM"; echo "php_cgi_ram.draw LINE2"; diff --git a/plugins/php/php-fastcgi b/plugins/php/php-fastcgi index e4cd41dd..b79d3168 100755 --- a/plugins/php/php-fastcgi +++ b/plugins/php/php-fastcgi @@ -90,7 +90,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "config") { print "graph_title PHP CGI [MB]\n"; print "graph_vlabel PHP CGI Memory usage\n"; - print "graph_category php\n"; + print "graph_category php-fastcgi\n"; print "graph_args -l 0\n"; print "php_cgi_ram.label PHP CGI Used RAM\n"; print "php_cgi_ram.draw LINE2\n"; diff --git a/plugins/php/php5-fpm_status b/plugins/php/php5-fpm_status index c885225d..b05bb485 100755 --- a/plugins/php/php5-fpm_status +++ b/plugins/php/php5-fpm_status @@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then echo "graph_args --base 1000 -l 0" echo "graph_vlabel Processes" echo "graph_scale yes" - echo "graph_category nginx" + echo "graph_category php-fpm" echo "graph_info This graph shows the php5-fpm process manager status from pool: $pool" echo "active.label Active processes" echo "active.type GAUGE" diff --git a/plugins/php/php_apc_ b/plugins/php/php_apc_ index 65d464f4..3217392a 100755 --- a/plugins/php/php_apc_ +++ b/plugins/php/php_apc_ @@ -56,7 +56,7 @@ cat <<'EOM' graph_title APC Memory usage graph_args -l 0 --base 1024 graph_vlabel Memory usage -graph_category apache +graph_category php-apc graph_order mem_used mem_avail graph_total Total mem_avail.label Memory available @@ -76,7 +76,7 @@ cat <<'EOM' graph_title APC Hits graph_args -l 0 graph_vlabel Cache hits -graph_category apache +graph_category php-apc graph_total Total num_misses.label Missed num_misses.draw AREA @@ -95,7 +95,7 @@ cat <<'EOM' graph_title APC Percents graph_args -l 0 --upper-limit 100 graph_vlabel Cache Percents % -graph_category apache +graph_category php-apc hits.label hits hits.draw AREA hits.min 0 diff --git a/plugins/php/php_eaccelerator b/plugins/php/php_eaccelerator index 69fc2d01..0091d7b0 100755 --- a/plugins/php/php_eaccelerator +++ b/plugins/php/php_eaccelerator @@ -34,7 +34,7 @@ url = ENV['url'] || 'http://127.0.0.1/control.php' if ARGV[0]=="config" print "EAccelerator Monitoring\n" print "graph_title PHP Eaccelerator\n" - print "graph_category Apache\n" + print "graph_category php-eaccelerator\n" print "Memoryusagepercentage.label Memory Usage %\n" print "Memoryusagepercentage.warning 95\n" print "Memoryusagepercentage.critical 95\n" diff --git a/plugins/php/php_fpm_process b/plugins/php/php_fpm_process index 40fabd30..e306da83 100755 --- a/plugins/php/php_fpm_process +++ b/plugins/php/php_fpm_process @@ -121,7 +121,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" ) print "graph_args --base 1000 -l 0\n"; print "graph_vlabel Processes\n"; print "graph_scale yes\n"; - print "graph_category php\n"; + print "graph_category php-fpm\n"; print "graph_info This graph shows the php5-fpm process manager status from pool: $pool\n"; print "active.label Active processes\n"; print "active.type GAUGE\n"; diff --git a/plugins/php/php_opcache b/plugins/php/php_opcache index 252cd110..ce9a795c 100644 --- a/plugins/php/php_opcache +++ b/plugins/php/php_opcache @@ -36,7 +36,7 @@ cat <<'EOM' graph_title OPCache Memory usage graph_args -l 0 --base 1024 graph_vlabel Memory usage -graph_category nginx +graph_category php-opcache graph_order mem_used mem_free graph_total Total mem_free.label Memory Free diff --git a/plugins/php/php_sessions b/plugins/php/php_sessions index f7219e09..50b1629c 100755 --- a/plugins/php/php_sessions +++ b/plugins/php/php_sessions @@ -53,7 +53,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title Apache/PHP Sessions' echo 'graph_info This graph shows active Apache/PHP sessions.' - echo 'graph_category apache' + echo 'graph_category php-sessions' echo "graph_args --lower-limit 0" echo 'graph_vlabel n' diff --git a/plugins/php/php_time_execution b/plugins/php/php_time_execution index deb0409e..9f0c252f 100644 --- a/plugins/php/php_time_execution +++ b/plugins/php/php_time_execution @@ -53,7 +53,7 @@ if [ "$1" = "config" ]; then echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Time in microsecond' - echo "graph_category PHP" + echo "graph_category php-time" echo "graph_info This graph shows load time in ms of $target" echo "minloadtime.label Min time" echo "minloadtime.info Min time"