From ab6f4e3c6efcab485b6a0ba04757c4227f8e4d9f Mon Sep 17 00:00:00 2001
From: Lars Kruse <devel@sumpfralle.de>
Date: Sun, 11 Aug 2019 23:40:21 +0200
Subject: [PATCH] Plugin lxc: fix configurable RAM graphing

Previously (before the multigraph conversion) the configuration setting
for "lxc_ram" was called "areastack".  The multigraph conversion
documented a new configuration setting "ram_areastack", but it was not
used, yet.
Thus we can switch to a more descriptive name: "ram_display_stacked".
---
 plugins/lxc/lxc-multigraph | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/plugins/lxc/lxc-multigraph b/plugins/lxc/lxc-multigraph
index 37c4dcc3..5ea96a40 100755
--- a/plugins/lxc/lxc-multigraph
+++ b/plugins/lxc/lxc-multigraph
@@ -15,7 +15,7 @@ lxc-multigraph - Plugin to monitor LXC containers (v2.0)
     # memory usage of containers drawn as
     # stacked area charts (changes graph
     # order) -- defaults to false
-    # env.ram_areastack true
+    # env.ram_display_stacked true
 
     # lxc container path, default below
     #env.lxcpath /var/lib/lxc
@@ -84,6 +84,8 @@ or GPLv3 license or later, at your option
 . $MUNIN_LIBDIR/plugins/plugin.sh
 
 lxcpath=${lxcpath:-/var/lib/lxc}
+ram_display_stacked=${ram_display_stacked:-false}
+
 
 # --- FUNCTIONS
 
@@ -307,15 +309,16 @@ EOF
 
    for n in $active_guests
    do
-      cat <<EOF
-$(clean_fieldname "mem_usage__${n}").label ${n}: Mem usage
-$(clean_fieldname "mem_usage__${n}").type GAUGE
-EOF
-      if [ "$areastack" = "true" ]; then
-         echo $(clean_fieldname "mem_usage__${n}").draw AREASTACK
+      if [ "$ram_display_stacked" = "true" ]; then
+         draw_style="AREASTACK"
+      else
+         draw_style="LINE1"
       fi
 
       cat <<EOF
+$(clean_fieldname "mem_usage__${n}").label ${n}: Mem usage
+$(clean_fieldname "mem_usage__${n}").type GAUGE
+$(clean_fieldname "mem_usage__${n}").draw $draw_style
 $(clean_fieldname "mem_cache__${n}").label ${n}: Cache
 $(clean_fieldname "mem_cache__${n}").type GAUGE
 $(clean_fieldname "mem_active__${n}").label ${n}: Active