Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-31 21:33:43 +00:00
Code Issues Releases Wiki Activity

Plugins apache_tmemory and apache_servers: multiple changes

Browse source 
* use base SI units for memory consumption
  (breaks graph values compared to older version)
* fix quoting for regular expressions
* use common defaults for configuration settings
This commit is contained in:
Lars Kruse 2020-04-21 20:11:27 +02:00
parent 16ab1d10e1
commit dbaeb0253c
3 changed files with 39 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

45
plugins/apache/apache_tmemmory
View file

@ -5,12 +5,13 @@
=head1 NAME
apache_tmemmory -Indicate the total memory used by apache
apache_tmemmory - Indicate the total memory used by apache
=head1 CONFIGURATION
[apache_*]
env.binname apache_binary_name
env.apuser user_running_apache (default: "www-data")
env.binname apache_binary_name (default: "apache2")
=head1 AUTHOR
@ -27,38 +28,32 @@ GPLv2
=cut
. $MUNIN_LIBDIR/plugins/plugin.sh
. "$MUNIN_LIBDIR/plugins/plugin.sh"
USR=$apuser
PROCS=$binname
USR=${apuser:-www-data}
PROCS=${binname:-apache2}
if [ "$1" = "autoconf" ]; then
echo yes
exit 0
echo yes
exit 0
fi
if [ "$1" = "config" ]; then
echo 'graph_title Total memory used by apache'
echo 'graph_args --base 1000 -l 0 '
echo 'graph_vlabel Mb'
echo 'graph_scale no'
echo 'graph_category webserver'
echo 'graph_info Indicate the total memory used by apache.'
echo 'graph_title Total memory used by apache'
echo 'graph_args --base 1024 -l 0 '
echo 'graph_vlabel bytes'
echo 'graph_scale no'
echo 'graph_category webserver'
echo 'graph_info Indicate the total memory used by apache.'
echo "servers.label servers"
echo "servers.type GAUGE"
echo "servers.min 0"
echo "servers.label servers"
echo "servers.type GAUGE"
echo "servers.min 0"
exit 0
exit 0
fi
VAL1=`ps auxf | grep ${PROCS} | grep -v grep | awk '{s+=$6} END {print s}'`
VAL2=`expr $VAL1 / 1024`
echo "servers.value $VAL2"
total_memory=$(ps auxf | grep -- "$PROCS" | grep "^$USR" | grep -v grep | awk '{s+=$6} END {print s * 1024}')
echo "servers.value $total_memory"