From 196c0572019643272d9a263598e6c4be11602b56 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Sun, 10 Jun 2018 14:54:15 +0200 Subject: [PATCH] lxc_ram: simplify config with/without 'areastack' --- plugins/lxc/lxc_ram | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/plugins/lxc/lxc_ram b/plugins/lxc/lxc_ram index 6ab81b44..6bb765e6 100755 --- a/plugins/lxc/lxc_ram +++ b/plugins/lxc/lxc_ram @@ -76,36 +76,20 @@ do_config() { echo 'graph_vlabel byte' echo 'graph_category memory' - if [ "$areastack" = "true" ]; then - for guest_name in $guest_names; do - guest="$(clean_fieldname "$guest_name")" - echo "mem_usage_$guest.label $guest_name: Mem usage" - echo "mem_usage_$guest.type GAUGE" + for guest_name in $guest_names; do + guest="$(clean_fieldname "$guest_name")" + echo "mem_usage_$guest.label $guest_name: Mem usage" + echo "mem_usage_$guest.type GAUGE" + if [ "$areastack" = "true" ]; then echo "mem_usage_$guest.draw AREASTACK" - done - - for guest_name in $guest_names; do - guest="$(clean_fieldname "$guest_name")" - echo "mem_cache_$guest.label $guest_name: Cache" - echo "mem_cache_$guest.type GAUGE" - echo "mem_active_$guest.label $guest_name: Active" - echo "mem_active_$guest.type GAUGE" - echo "mem_inactive_$guest.label $guest_name: Inactive" - echo "mem_inactive_$guest.type GAUGE" - done - else - for guest_name in $guest_names; do - guest="$(clean_fieldname "$guest_name")" - echo "mem_usage_$guest.label $guest_name: Mem usage" - echo "mem_usage_$guest.type GAUGE" - echo "mem_cache_$guest.label $guest_name: Cache" - echo "mem_cache_$guest.type GAUGE" - echo "mem_active_$guest.label $guest_name: Active" - echo "mem_active_$guest.type GAUGE" - echo "mem_inactive_$guest.label $guest_name: Inactive" - echo "mem_inactive_$guest.type GAUGE" - done - fi + fi + echo "mem_cache_$guest.label $guest_name: Cache" + echo "mem_cache_$guest.type GAUGE" + echo "mem_active_$guest.label $guest_name: Active" + echo "mem_active_$guest.type GAUGE" + echo "mem_inactive_$guest.label $guest_name: Inactive" + echo "mem_inactive_$guest.type GAUGE" + done }