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

Plugin lxc: simplify interface of "lxc_cgroup" and rename function

Browse source
This commit is contained in:
Lars Kruse 2019-08-12 01:27:39 +02:00
parent 33b2f3ed8b
commit 8b1d537602
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugins/lxc/lxc-multigraph
View file

@ -109,9 +109,11 @@ function active_guests {
} }
function lxc_cgroup { function get_lxc_cgroup_info {
local guest_name="$1"
local field="$2"
# lxc3 (lxc < 3: may output some warnings if there is cruft in your config dir) # lxc3 (lxc < 3: may output some warnings if there is cruft in your config dir)
lxc-cgroup -o /dev/stdout -l INFO $* | sed 's/^.*lxc_cgroup.c:main:[0-9][0-9]* - //' lxc-cgroup -o /dev/stdout -l INFO -n "$guest_name" "$field" | sed 's/^.*lxc_cgroup.c:main:[0-9][0-9]* - //'
} }
@ -164,7 +166,7 @@ lxc_count_processes () {
if [ -e /usr/bin/cgm ]; then if [ -e /usr/bin/cgm ]; then
cgm getvalue cpu "lxc/$guest_name" tasks 2>/dev/null | wc -l cgm getvalue cpu "lxc/$guest_name" tasks 2>/dev/null | wc -l
else else
lxc_cgroup -n "$guest_name" tasks | wc -l get_lxc_cgroup_info "$guest_name" "tasks" | wc -l
fi fi
} }
@ -337,14 +339,14 @@ for guest_name in $active_guests
do do
for cpu_usage in user system for cpu_usage in user system
do do
echo "$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").value $(lxc_cgroup -n "$guest_name" cpuacct.stat | grep "$cpu_usage" | awk '{ print $2; }')" echo "$(clean_fieldname "cpu_${cpu_usage}__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "cpuacct.stat" | grep "$cpu_usage" | awk '{ print $2; }')"
done done
done done
echo "multigraph lxc_cpu_time" echo "multigraph lxc_cpu_time"
for guest_name in $active_guests for guest_name in $active_guests
do do
echo "$(clean_fieldname "cpu_time__${guest_name}").value $(lxc_cgroup -n "$guest_name" cpuacct.usage)" echo "$(clean_fieldname "cpu_time__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "cpuacct.usage")"
done done
echo "multigraph lxc_logins" echo "multigraph lxc_logins"
@ -381,9 +383,9 @@ echo "multigraph lxc_ram"
for guest_name in $active_guests for guest_name in $active_guests
do do
cat <<EOF cat <<EOF
$(clean_fieldname "mem_usage__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.usage_in_bytes) $(clean_fieldname "mem_usage__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.usage_in_bytes")
$(clean_fieldname "mem_cache__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_cache | awk '{print $2;}') $(clean_fieldname "mem_cache__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_cache | awk '{print $2;}')
$(clean_fieldname "mem_active__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_active_anon | awk '{print $2;}') $(clean_fieldname "mem_active__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_active_anon | awk '{print $2;}')
$(clean_fieldname "mem_inactive__${guest_name}").value $(lxc_cgroup -n "$guest_name" memory.stat | grep total_inactive_anon | awk '{print $2;}') $(clean_fieldname "mem_inactive__${guest_name}").value $(get_lxc_cgroup_info "$guest_name" "memory.stat" | grep total_inactive_anon | awk '{print $2;}')
EOF EOF
done done