From a1dc95674f199a5975da06e2a0c02652daab4ad9 Mon Sep 17 00:00:00 2001
From: Lukas Macura <lukas@macura.cz>
Date: Tue, 19 Apr 2016 10:41:34 +0200
Subject: [PATCH] New version of fsx plugin with updated template

---
 fsx/control.zaf  | 10 +++++-----
 fsx/template.xml | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/fsx/control.zaf b/fsx/control.zaf
index 0bd49cd..9918adb 100644
--- a/fsx/control.zaf
+++ b/fsx/control.zaf
@@ -4,7 +4,7 @@ Description::
  Plugin which will make deeper look into directory structure using discovery
 ::
 
-Version: 0.5
+Version: 0.6
 Url: https://raw.githubusercontent.com/limosek/zaf-plugins/master/fsx
 Web: https://github.com/limosek/zaf-plugins/
 Maintainer: Lukas Macura <lukas@macura.cz>
@@ -49,7 +49,7 @@ asroot|root)
 aszabbix|zabbix)
   shift;;
 esac
-. $ZAF_LIB_DIR/preload.sh
+{INCLUDES}
  
 [ "$#" -lt 6 ] && zaf_err "Bad parameters!"
 dir="$1"
@@ -98,7 +98,7 @@ asroot|root)
 aszabbix|zabbix)
   shift;;
 esac
-. $ZAF_LIB_DIR/preload.sh
+{INCLUDES}
 
 [ -z "$1" ] && zaf_err "Directory must be entered."
 
@@ -126,7 +126,7 @@ asroot|root)
 aszabbix|zabbix)
   shift;;
 esac
-. $ZAF_LIB_DIR/preload.sh
+{INCLUDES}
 
 [ -z "$1" ] && zaf_err "Directory must be entered."
 
@@ -151,7 +151,7 @@ asroot|root)
 aszabbix|zabbix)
   shift;;
 esac
-. $ZAF_LIB_DIR/preload.sh
+{INCLUDES}
 
 [ -z "$1" ] && zaf_err "Directory must be entered."
 
diff --git a/fsx/template.xml b/fsx/template.xml
index 9363a4a..f3f86f6 100644
--- a/fsx/template.xml
+++ b/fsx/template.xml
@@ -31,11 +31,11 @@
             <items/>
             <discovery_rules>
                 <discovery_rule>
-                    <name>ZAF fsx discovery of biggest directories in /var</name>
+                    <name>ZAF fsx discovery of biggest directories in {$FSX_DIR}</name>
                     <type>7</type>
                     <snmp_community/>
                     <snmp_oid/>
-                    <key>fsx.discovery[{$FSX_USER},/var/,%,100,d,du/-,100]</key>
+                    <key>fsx.discovery[{$FSX_USER},{$FSX_DIR},%,100,d,du/-,100]</key>
                     <delay>300</delay>
                     <status>0</status>
                     <allowed_hosts/>
@@ -61,7 +61,7 @@
                         <conditions/>
                     </filter>
                     <lifetime>30</lifetime>
-                    <description>Discover directories under /var</description>
+                    <description>Discover directories under {$FSX_DIR}</description>
                     <item_prototypes>
                         <item_prototype>
                             <name>Path {#PATH} disk usage</name>
@@ -169,7 +169,16 @@
                     <host_prototypes/>
                 </discovery_rule>
             </discovery_rules>
-            <macros/>
+            <macros>
+ 		<macro>
+                    <macro>{$FSX_USER}</macro>
+                    <value>zabbix</value>
+                </macro>
+		    <macro>
+                    <macro>{$FSX_DIR}</macro>
+                    <value>/var/</value>
+                </macro>
+	    </macros>
             <templates/>
             <screens/>
         </template>