From 33504fe7f425cafa704924400072084c0c16ff5e Mon Sep 17 00:00:00 2001
From: Michele Grandolfo <m.grandolfo@reply.it>
Date: Tue, 20 Dec 2016 11:51:13 +0100
Subject: [PATCH] Corrected template metrics in order to work with webui

---
 .../templates-iaas/TEMPLATE_IAAS_1.7.xml      |   0
 .../TEMPLATES_METRICS_v1.9.xml                | 428 +++++++++---------
 .../TemplateWatcher_v1.7.xml                  |   0
 3 files changed, 214 insertions(+), 214 deletions(-)
 rename {template => templates}/templates-iaas/TEMPLATE_IAAS_1.7.xml (100%)
 rename template/templates-metrics/TEMPLATES_METRICS_v1.7.xml => templates/templates-metrics/TEMPLATES_METRICS_v1.9.xml (98%)
 rename {template => templates}/templates-watcher/TemplateWatcher_v1.7.xml (100%)

diff --git a/template/templates-iaas/TEMPLATE_IAAS_1.7.xml b/templates/templates-iaas/TEMPLATE_IAAS_1.7.xml
similarity index 100%
rename from template/templates-iaas/TEMPLATE_IAAS_1.7.xml
rename to templates/templates-iaas/TEMPLATE_IAAS_1.7.xml
diff --git a/template/templates-metrics/TEMPLATES_METRICS_v1.7.xml b/templates/templates-metrics/TEMPLATES_METRICS_v1.9.xml
similarity index 98%
rename from template/templates-metrics/TEMPLATES_METRICS_v1.7.xml
rename to templates/templates-metrics/TEMPLATES_METRICS_v1.9.xml
index 55ae3c8..b6ce720 100644
--- a/template/templates-metrics/TEMPLATES_METRICS_v1.7.xml
+++ b/templates/templates-metrics/TEMPLATES_METRICS_v1.9.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>2.0</version>
-    <date>2016-02-12T11:10:38Z</date>
+    <version>3.0</version>
+    <date>2016-12-20T10:47:29Z</date>
     <groups>
         <group>
             <name>Aggregator</name>
@@ -177,12 +177,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>APACHEProcessRunning</name>
+                    <name>JETTYPortListening</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,apache2]</key>
+                    <key>net.tcp.listen[{$JETTYPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -216,12 +216,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>CKANProcessRunning</name>
+                    <name>NGINXPortListening</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,ckan]</key>
+                    <key>net.tcp.listen[{$NGINXPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -255,12 +255,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JETTYPortListening</name>
+                    <name>POSTGRESQLPortListening</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$JETTYPORT}]</key>
+                    <key>net.tcp.listen[{$POSTGRESQLPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -294,12 +294,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JETTYProcessRunning</name>
+                    <name>APACHEProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,jetty]</key>
+                    <key>proc.num[,,,apache2]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -333,12 +333,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>NGINXPortListening</name>
+                    <name>CKANProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$NGINXPORT}]</key>
+                    <key>proc.num[,,,ckan]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -372,12 +372,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>NGINXProcessRunning</name>
+                    <name>JETTYProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,nginx]</key>
+                    <key>proc.num[,,,jetty]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -411,12 +411,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>POSTGRESQLPortListening</name>
+                    <name>NGINXProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$POSTGRESQLPORT}]</key>
+                    <key>proc.num[,,,nginx]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -730,19 +730,19 @@
             </applications>
             <items>
                 <item>
-                    <name>IaaSCeilometerCPULOAD</name>
+                    <name>IaaSCeilometerUPTIME</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>0</multiplier>
+                    <multiplier>1</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[cpu_util,{$UUID}]</key>
-                    <delay>600</delay>
+                    <key>ceilometer[cpu,{$UUID}]</key>
+                    <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
+                    <units>s</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -751,7 +751,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0.0000000001</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -773,19 +773,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerDISKEPHEMERALSIZE</name>
+                    <name>IaaSCeilometerCPULOAD</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[disk.ephemeral.size,{$UUID}]</key>
-                    <delay>30</delay>
+                    <key>ceilometer[cpu_util,{$UUID}]</key>
+                    <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>GB</units>
+                    <units>%</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -816,12 +816,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerMEMORYRAM</name>
+                    <name>IaaSCeilometerDISKEPHEMERALSIZE</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>1</multiplier>
+                    <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[memory,{$UUID}]</key>
+                    <key>ceilometer[disk.ephemeral.size,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -837,7 +837,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0.0009765625</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -859,19 +859,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerNETWORKIN</name>
+                    <name>IaaSCeilometerDISKROOTSIZE</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[network.incoming.bytes,{$UUID}]</key>
+                    <key>ceilometer[disk.root.size,{$UUID}]</key>
                     <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units>GB</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -902,19 +902,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerNETWORKOUT</name>
+                    <name>IaaSCeilometerMEMORYRAM</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>0</multiplier>
+                    <multiplier>1</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[network.outgoing.bytes,{$UUID}]</key>
+                    <key>ceilometer[memory,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units>GB</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -923,7 +923,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0.0009765625</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -945,19 +945,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerSTORAGE</name>
+                    <name>IaaSCeilometerNETWORKIN</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[disk.root.size,{$UUID}]</key>
+                    <key>ceilometer[network.incoming.bytes,{$UUID}]</key>
                     <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>GB</units>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -988,19 +988,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerUPTIME</name>
+                    <name>IaaSCeilometerNETWORKOUT</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>1</multiplier>
+                    <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[cpu,{$UUID}]</key>
+                    <key>ceilometer[network.outgoing.bytes,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>s</units>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -1009,7 +1009,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0.0000000001</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -1230,12 +1230,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JBPMProcessRunning</name>
+                    <name>MYSQLPortListening</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,java]</key>
+                    <key>net.tcp.listen[{$MYSQLJBPMPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -1269,12 +1269,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MYSQLPortListening</name>
+                    <name>JBPMProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$MYSQLJBPMPORT}]</key>
+                    <key>proc.num[,,,java]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -1473,12 +1473,12 @@
             <applications/>
             <items>
                 <item>
-                    <name>PENTAHOPostgresqlProcessRunning</name>
+                    <name>PENTAHOProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,postgresql]</key>
+                    <key>proc.num[,,,pentaho]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -1512,12 +1512,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>PENTAHOProcessRunning</name>
+                    <name>PENTAHOPostgresqlProcessRunning</name>
                     <type>7</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,pentaho]</key>
+                    <key>proc.num[,,,postgresql]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2258,12 +2258,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>APACHEProcessRunning</name>
+                    <name>JETTYPortListening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,apache2]</key>
+                    <key>net.tcp.listen[{$JETTYPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2297,12 +2297,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>CKANProcessRunning</name>
+                    <name>NGINXPortListening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,ckan]</key>
+                    <key>net.tcp.listen[{$NGINXPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2336,12 +2336,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JETTYPortListening</name>
+                    <name>POSTGRESQLPortListening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$JETTYPORT}]</key>
+                    <key>net.tcp.listen[{$POSTGRESQLPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2375,12 +2375,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JETTYProcessRunning</name>
+                    <name>APACHEProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,jetty]</key>
+                    <key>proc.num[,,,apache2]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2414,12 +2414,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>NGINXPortListening</name>
+                    <name>CKANProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$NGINXPORT}]</key>
+                    <key>proc.num[,,,ckan]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2453,12 +2453,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>NGINXProcessRunning</name>
+                    <name>JETTYProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,nginx]</key>
+                    <key>proc.num[,,,jetty]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2492,12 +2492,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>POSTGRESQLPortListening</name>
+                    <name>NGINXProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$POSTGRESQLPORT}]</key>
+                    <key>proc.num[,,,nginx]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2811,19 +2811,19 @@
             </applications>
             <items>
                 <item>
-                    <name>IaaSCeilometerCPULOAD</name>
+                    <name>IaaSCeilometerUPTIME</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>0</multiplier>
+                    <multiplier>1</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[cpu_util,{$UUID}]</key>
-                    <delay>600</delay>
+                    <key>ceilometer[cpu,{$UUID}]</key>
+                    <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>%</units>
+                    <units>s</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2832,7 +2832,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0.0000000001</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -2854,19 +2854,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerDISKEPHEMERALSIZE</name>
+                    <name>IaaSCeilometerCPULOAD</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[disk.ephemeral.size,{$UUID}]</key>
-                    <delay>30</delay>
+                    <key>ceilometer[cpu_util,{$UUID}]</key>
+                    <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>GB</units>
+                    <units>%</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2897,12 +2897,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerMEMORYRAM</name>
+                    <name>IaaSCeilometerDISKEPHEMERALSIZE</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>1</multiplier>
+                    <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[memory,{$UUID}]</key>
+                    <key>ceilometer[disk.ephemeral.size,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -2918,7 +2918,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0.0009765625</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -2940,19 +2940,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerNETWORKIN</name>
+                    <name>IaaSCeilometerSTORAGE</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[network.incoming.bytes,{$UUID}]</key>
+                    <key>ceilometer[disk.root.size,{$UUID}]</key>
                     <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units>GB</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -2983,19 +2983,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerNETWORKOUT</name>
+                    <name>IaaSCeilometerMEMORYRAM</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>0</multiplier>
+                    <multiplier>1</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[network.outgoing.bytes,{$UUID}]</key>
+                    <key>ceilometer[memory,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>B</units>
+                    <units>GB</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3004,7 +3004,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>1</formula>
+                    <formula>0.0009765625</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -3026,19 +3026,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerSTORAGE</name>
+                    <name>IaaSCeilometerNETWORKIN</name>
                     <type>10</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[disk.root.size,{$UUID}]</key>
+                    <key>ceilometer[network.incoming.bytes,{$UUID}]</key>
                     <delay>600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>GB</units>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3069,19 +3069,19 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>IaaSCeilometerUPTIME</name>
+                    <name>IaaSCeilometerNETWORKOUT</name>
                     <type>10</type>
                     <snmp_community/>
-                    <multiplier>1</multiplier>
+                    <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>ceilometer[cpu,{$UUID}]</key>
+                    <key>ceilometer[network.outgoing.bytes,{$UUID}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
                     <value_type>0</value_type>
                     <allowed_hosts/>
-                    <units>s</units>
+                    <units>B</units>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -3090,7 +3090,7 @@
                     <snmpv3_authpassphrase/>
                     <snmpv3_privprotocol>0</snmpv3_privprotocol>
                     <snmpv3_privpassphrase/>
-                    <formula>0.0000000001</formula>
+                    <formula>1</formula>
                     <delay_flex/>
                     <params/>
                     <ipmi_sensor/>
@@ -3272,12 +3272,12 @@
             <applications/>
             <items>
                 <item>
-                    <name>JBPMPortListening</name>
+                    <name>MYSQLPortListening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{JBPMPORT}]</key>
+                    <key>net.tcp.listen[{$MYSQLJBPMPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -3311,12 +3311,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>JBPMProcessRunning</name>
+                    <name>JBPMPortListening</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,jboss]</key>
+                    <key>net.tcp.listen[{JBPMPORT}]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -3350,12 +3350,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>MYSQLPortListening</name>
+                    <name>JBPMProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>net.tcp.listen[{$MYSQLJBPMPORT}]</key>
+                    <key>proc.num[,,,jboss]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -3550,12 +3550,12 @@
             <applications/>
             <items>
                 <item>
-                    <name>PENTAHOPostgresqlProcessRunning</name>
+                    <name>PENTAHOProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,postgresql]</key>
+                    <key>proc.num[,,,pentaho]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -3589,12 +3589,12 @@
                     <logtimefmt/>
                 </item>
                 <item>
-                    <name>PENTAHOProcessRunning</name>
+                    <name>PENTAHOPostgresqlProcessRunning</name>
                     <type>0</type>
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>proc.num[,,,pentaho]</key>
+                    <key>proc.num[,,,postgresql]</key>
                     <delay>30</delay>
                     <history>90</history>
                     <trends>365</trends>
@@ -4063,7 +4063,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateApache:net.tcp.listen[{$APACHEPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$APACHECKANPORT}].last()}&lt;&gt;1</expression>
             <name>ApachePortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4073,7 +4073,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$APACHECKANPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateApache:net.tcp.listen[{$APACHEPORT}].last()}&lt;&gt;1</expression>
             <name>ApachePortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4093,7 +4093,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveApache:net.tcp.listen[{$APACHEPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveApache:net.tcp.listen[{$APACHEPORT}].nodata(5m)}=1</expression>
             <name>ApachePortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4103,7 +4103,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateApache:net.tcp.listen[{$APACHEPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$APACHECKANPORT}].nodata(5m)}=1</expression>
             <name>ApachePortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4113,7 +4113,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$APACHECKANPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateApache:net.tcp.listen[{$APACHEPORT}].nodata(5m)}=1</expression>
             <name>ApachePortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4123,7 +4123,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$APACHECKANPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$APACHECKANPORT}].nodata(5m)}=1</expression>
             <name>ApachePortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4133,7 +4133,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,apache2].last()}=0</expression>
+            <expression>{TemplateActiveApache:proc.num[,,,apache2].last()}=0</expression>
             <name>ApacheProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4163,7 +4163,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveApache:proc.num[,,,apache2].last()}=0</expression>
+            <expression>{TemplateCkan:proc.num[,,,apache2].last()}=0</expression>
             <name>ApacheProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4173,7 +4173,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,apache2].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveApache:proc.num[,,,apache2].nodata(5m)}=1</expression>
             <name>ApacheProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4183,7 +4183,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,apache2].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,apache2].nodata(5m)}=1</expression>
             <name>ApacheProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4193,7 +4193,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveApache:proc.num[,,,apache2].nodata(1m)}=1</expression>
+            <expression>{TemplateApache:proc.num[,,,apache2].nodata(5m)}=1</expression>
             <name>ApacheProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4203,7 +4203,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateApache:proc.num[,,,apache2].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:proc.num[,,,apache2].nodata(5m)}=1</expression>
             <name>ApacheProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4233,7 +4233,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,ckan].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,ckan].nodata(5m)}=1</expression>
             <name>CkanProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4243,7 +4243,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,ckan].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:proc.num[,,,ckan].nodata(5m)}=1</expression>
             <name>CkanProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4253,7 +4253,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateGlassfish:net.tcp.listen[{$GLASSFISHPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveGlassfish:net.tcp.listen[{$GLASSFISHPORT}].last()}&lt;&gt;1</expression>
             <name>GlassfishPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4263,7 +4263,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveGlassfish:net.tcp.listen[{$GLASSFISHPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateGlassfish:net.tcp.listen[{$GLASSFISHPORT}].last()}&lt;&gt;1</expression>
             <name>GlassfishPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4273,7 +4273,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateGlassfish:net.tcp.listen[{$GLASSFISHPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveGlassfish:net.tcp.listen[{$GLASSFISHPORT}].nodata(5m)}=1</expression>
             <name>GlassfishPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4283,7 +4283,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveGlassfish:net.tcp.listen[{$GLASSFISHPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateGlassfish:net.tcp.listen[{$GLASSFISHPORT}].nodata(5m)}=1</expression>
             <name>GlassfishPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4313,7 +4313,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveGlassfish:proc.num[,,,glassfish].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveGlassfish:proc.num[,,,glassfish].nodata(5m)}=1</expression>
             <name>GlassfishProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4323,7 +4323,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateGlassfish:proc.num[,,,glassfish].nodata(1m)}=1</expression>
+            <expression>{TemplateGlassfish:proc.num[,,,glassfish].nodata(5m)}=1</expression>
             <name>GlassfishProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4343,7 +4343,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateHAProxy:proc.num[,,,haproxy].nodata(1m)}=1</expression>
+            <expression>{TemplateHAProxy:proc.num[,,,haproxy].nodata(5m)}=1</expression>
             <name>HAProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4373,8 +4373,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateHAProxy:net.tcp.listen[{HAPROXYPORT}].nodata(1m)}=1</expression>
-            <name>HAproxyPortListeningNoData</name>
+            <expression>{TemplateActiveHAProxy:net.tcp.listen[{$HAPROXYPORT}].nodata(5m)}=1</expression>
+            <name>HAProxyPortListeningNoData</name>
             <url/>
             <status>0</status>
             <priority>3</priority>
@@ -4383,8 +4383,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveHAProxy:net.tcp.listen[{$HAPROXYPORT}].nodata(1m)}=1</expression>
-            <name>HAProxyPortListeningNoData</name>
+            <expression>{TemplateHAProxy:net.tcp.listen[{HAPROXYPORT}].nodata(5m)}=1</expression>
+            <name>HAproxyPortListeningNoData</name>
             <url/>
             <status>0</status>
             <priority>3</priority>
@@ -4403,7 +4403,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveHAProxy:proc.num[,,,haproxy].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveHAProxy:proc.num[,,,haproxy].nodata(5m)}=1</expression>
             <name>HAProxyProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4433,7 +4433,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveIaaS:ceilometer[cpu,{$UUID}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveIaaS:ceilometer[cpu,{$UUID}].nodata(5m)}=1</expression>
             <name>iaasceilometerUptimeNoData</name>
             <url/>
             <status>0</status>
@@ -4443,7 +4443,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateIaaS:ceilometer[cpu,{$UUID}].nodata(1m)}=1</expression>
+            <expression>{TemplateIaaS:ceilometer[cpu,{$UUID}].nodata(5m)}=1</expression>
             <name>iaasceilometerUptimeNoData</name>
             <url/>
             <status>0</status>
@@ -4453,7 +4453,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJboss:net.tcp.listen[{$JBOSSPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveJboss:net.tcp.listen[{$JBOSSPORT}].last()}&lt;&gt;1</expression>
             <name>JbossPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4463,7 +4463,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJboss:net.tcp.listen[{$JBOSSPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateJboss:net.tcp.listen[{$JBOSSPORT}].last()}&lt;&gt;1</expression>
             <name>JbossPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4473,7 +4473,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJboss:net.tcp.listen[{$JBOSSPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveJboss:net.tcp.listen[{$JBOSSPORT}].nodata(5m)}=1</expression>
             <name>JbossPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4483,7 +4483,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJboss:net.tcp.listen[{$JBOSSPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateJboss:net.tcp.listen[{$JBOSSPORT}].nodata(5m)}=1</expression>
             <name>JbossPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4493,7 +4493,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJboss:proc.num[,,,jboss].last()}=0</expression>
+            <expression>{TemplateActiveJboss:proc.num[,,,jboss].last()}=0</expression>
             <name>JbossProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4503,7 +4503,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJboss:proc.num[,,,jboss].last()}=0</expression>
+            <expression>{TemplateJboss:proc.num[,,,jboss].last()}=0</expression>
             <name>JbossProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4513,7 +4513,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJboss:proc.num[,,,jboss].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveJboss:proc.num[,,,jboss].nodata(5m)}=1</expression>
             <name>JbossProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4543,7 +4543,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:net.tcp.listen[{JBPMPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveJBPM:net.tcp.listen[{$JBPMPORT}].nodata(5m)}=1</expression>
             <name>JbpmPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4553,7 +4553,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:net.tcp.listen[{$JBPMPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateJBPM:net.tcp.listen[{JBPMPORT}].nodata(5m)}=1</expression>
             <name>JbpmPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4583,8 +4583,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:proc.num[,,,jboss].nodata(1m)}=1</expression>
-            <name>JbpmProcessRunningNodata</name>
+            <expression>{TemplateActiveJBPM:proc.num[,,,java].nodata(5m)}=1</expression>
+            <name>JbpmProcessRunningNoData</name>
             <url/>
             <status>0</status>
             <priority>3</priority>
@@ -4593,7 +4593,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:proc.num[,,,java].nodata(1m)}=1</expression>
+            <expression>{TemplateJboss:proc.num[,,,jboss].nodata(5m)}=1</expression>
             <name>JbpmProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4603,8 +4603,8 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJboss:proc.num[,,,jboss].nodata(1m)}=1</expression>
-            <name>JbpmProcessRunningNoData</name>
+            <expression>{TemplateJBPM:proc.num[,,,jboss].nodata(5m)}=1</expression>
+            <name>JbpmProcessRunningNodata</name>
             <url/>
             <status>0</status>
             <priority>3</priority>
@@ -4613,7 +4613,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$JETTYPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$JETTYPORT}].last()}&lt;&gt;1</expression>
             <name>JettyPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4623,7 +4623,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$JETTYPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$JETTYPORT}].last()}&lt;&gt;1</expression>
             <name>JettyPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4633,7 +4633,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$JETTYPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$JETTYPORT}].nodata(5m)}=1</expression>
             <name>JettyPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4643,7 +4643,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$JETTYPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$JETTYPORT}].nodata(5m)}=1</expression>
             <name>JettyPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4653,7 +4653,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,jetty].last()}=0</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,jetty].last()}=0</expression>
             <name>JettyProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4663,7 +4663,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,jetty].last()}=0</expression>
+            <expression>{TemplateCkan:proc.num[,,,jetty].last()}=0</expression>
             <name>JettyProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4673,7 +4673,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,jetty].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,jetty].nodata(5m)}=1</expression>
             <name>JettyProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4683,7 +4683,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,jetty].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:proc.num[,,,jetty].nodata(5m)}=1</expression>
             <name>JettyProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4693,7 +4693,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveMySQL:net.tcp.listen[{$MYSQLPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].last()}&lt;&gt;1</expression>
             <name>MysqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4703,7 +4703,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveMySQL:net.tcp.listen[{$MYSQLPORT}].last()}&lt;&gt;1</expression>
             <name>MysqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4713,7 +4713,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateMySQL:net.tcp.listen[{$MYSQLPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].last()}&lt;&gt;1</expression>
             <name>MysqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4723,7 +4723,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateMySQL:net.tcp.listen[{$MYSQLPORT}].last()}&lt;&gt;1</expression>
             <name>MysqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -4733,7 +4733,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].nodata(5m)}=1</expression>
             <name>MysqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4743,7 +4743,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveMySQL:net.tcp.listen[{$MYSQLPORT}].nodata(5m)}=1</expression>
             <name>MysqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4753,7 +4753,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateMySQL:net.tcp.listen[{$MYSQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateJBPM:net.tcp.listen[{$MYSQLJBPMPORT}].nodata(5m)}=1</expression>
             <name>MysqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4763,7 +4763,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveMySQL:net.tcp.listen[{$MYSQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateMySQL:net.tcp.listen[{$MYSQLPORT}].nodata(5m)}=1</expression>
             <name>MysqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4773,7 +4773,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:proc.num[,,,mysql].last()}=0</expression>
+            <expression>{TemplateActiveJBPM:proc.num[,,,mysql].last()}=0</expression>
             <name>MysqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4793,7 +4793,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:proc.num[,,,mysql].last()}=0</expression>
+            <expression>{TemplateJBPM:proc.num[,,,mysql].last()}=0</expression>
             <name>MysqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4813,7 +4813,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveMySQL:proc.num[,,,mysql].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveJBPM:proc.num[,,,mysql].nodata(5m)}=1</expression>
             <name>MysqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4823,7 +4823,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateMySQL:proc.num[,,,mysql].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveMySQL:proc.num[,,,mysql].nodata(5m)}=1</expression>
             <name>MysqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4833,7 +4833,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateJBPM:proc.num[,,,mysql].nodata(1m)}=1</expression>
+            <expression>{TemplateJBPM:proc.num[,,,mysql].nodata(5m)}=1</expression>
             <name>MysqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4843,7 +4843,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveJBPM:proc.num[,,,mysql].nodata(1m)}=1</expression>
+            <expression>{TemplateMySQL:proc.num[,,,mysql].nodata(5m)}=1</expression>
             <name>MysqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4873,7 +4873,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$NGINXPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$NGINXPORT}].nodata(5m)}=1</expression>
             <name>NginxPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4883,7 +4883,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$NGINXPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$NGINXPORT}].nodata(5m)}=1</expression>
             <name>NginxPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -4913,7 +4913,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,nginx].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,nginx].nodata(5m)}=1</expression>
             <name>NginxProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4923,7 +4923,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,nginx].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:proc.num[,,,nginx].nodata(5m)}=1</expression>
             <name>NginxProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4933,7 +4933,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePentaho:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplateActivePentaho:proc.num[,,,postgresql].last()}=0</expression>
             <name>PentahoPostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4943,7 +4943,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePentaho:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplatePentaho:proc.num[,,,postgresql].last()}=0</expression>
             <name>PentahoPostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -4953,7 +4953,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePentaho:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplateActivePentaho:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PentahoPostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4963,7 +4963,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePentaho:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplatePentaho:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PentahoPostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -4993,7 +4993,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePentaho:proc.num[,,,pentaho].nodata(1m)}=1</expression>
+            <expression>{TemplateActivePentaho:proc.num[,,,pentaho].nodata(5m)}=1</expression>
             <name>PentahoProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5003,7 +5003,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePentaho:proc.num[,,,pentaho].nodata(1m)}=1</expression>
+            <expression>{TemplatePentaho:proc.num[,,,pentaho].nodata(5m)}=1</expression>
             <name>PentahoProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5013,7 +5013,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$POSTGRESQLPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$POSTGRESQLPORT}].last()}&lt;&gt;1</expression>
             <name>PostgresqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -5033,7 +5033,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$POSTGRESQLPORT}].last()}&lt;&gt;1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$POSTGRESQLPORT}].last()}&lt;&gt;1</expression>
             <name>PostgresqlPortListeningLastValue</name>
             <url/>
             <status>0</status>
@@ -5053,7 +5053,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:net.tcp.listen[{$POSTGRESQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:net.tcp.listen[{$POSTGRESQLPORT}].nodata(5m)}=1</expression>
             <name>PostgresqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5063,7 +5063,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePostgreSQL:net.tcp.listen[{$POSTGRESQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActivePostgreSQL:net.tcp.listen[{$POSTGRESQLPORT}].nodata(5m)}=1</expression>
             <name>PostgresqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5073,7 +5073,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePostgreSQL:net.tcp.listen[{$POSTGRESQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:net.tcp.listen[{$POSTGRESQLPORT}].nodata(5m)}=1</expression>
             <name>PostgresqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5083,7 +5083,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:net.tcp.listen[{$POSTGRESQLPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplatePostgreSQL:net.tcp.listen[{$POSTGRESQLPORT}].nodata(5m)}=1</expression>
             <name>PostgresqlPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5093,7 +5093,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePostgreSQL:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,postgresql].last()}=0</expression>
             <name>PostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5103,7 +5103,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplateActivePostgreSQL:proc.num[,,,postgresql].last()}=0</expression>
             <name>PostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5113,7 +5113,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePostgreSQL:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplateCkan:proc.num[,,,postgresql].last()}=0</expression>
             <name>PostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5123,7 +5123,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,postgresql].last()}=0</expression>
+            <expression>{TemplatePostgreSQL:proc.num[,,,postgresql].last()}=0</expression>
             <name>PostgresqlProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5133,7 +5133,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplatePostgreSQL:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveCkan:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5143,7 +5143,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateCkan:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplateActivePostgreSQL:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5153,7 +5153,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveCkan:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplateCkan:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5163,7 +5163,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActivePostgreSQL:proc.num[,,,postgresql].nodata(1m)}=1</expression>
+            <expression>{TemplatePostgreSQL:proc.num[,,,postgresql].nodata(5m)}=1</expression>
             <name>PostgresqlProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5193,7 +5193,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveRabbitMQ:net.tcp.listen[{$RABBITMQPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveRabbitMQ:net.tcp.listen[{$RABBITMQPORT}].nodata(5m)}=1</expression>
             <name>RabbitMQPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5203,7 +5203,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateRabbitMQ:net.tcp.listen[{$RABBITMQPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateRabbitMQ:net.tcp.listen[{$RABBITMQPORT}].nodata(5m)}=1</expression>
             <name>RabbitMQPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5233,7 +5233,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateRabbitMQ:proc.num[,,,rabbitmq].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveRabbitMQ:proc.num[,,,rabbitmq].nodata(5m)}=1</expression>
             <name>RabbitMQProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5243,7 +5243,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveRabbitMQ:proc.num[,,,rabbitmq].nodata(1m)}=1</expression>
+            <expression>{TemplateRabbitMQ:proc.num[,,,rabbitmq].nodata(5m)}=1</expression>
             <name>RabbitMQProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5253,7 +5253,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateVMaaS:net.tcp.service[ssh].last()}=0</expression>
+            <expression>{TemplateActiveVMaaS:net.tcp.service[ssh].last()}=0</expression>
             <name>SSHAvailableLastValue</name>
             <url/>
             <status>0</status>
@@ -5263,7 +5263,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveVMaaS:net.tcp.service[ssh].last()}=0</expression>
+            <expression>{TemplateVMaaS:net.tcp.service[ssh].last()}=0</expression>
             <name>SSHAvailableLastValue</name>
             <url/>
             <status>0</status>
@@ -5273,7 +5273,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveVMaaS:net.tcp.service[ssh].nodata(60s)}=1</expression>
+            <expression>{TemplateActiveVMaaS:net.tcp.service[ssh].nodata(5m)}=1</expression>
             <name>SSHAvailableNoData</name>
             <url/>
             <status>0</status>
@@ -5283,7 +5283,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateVMaaS:net.tcp.service[ssh].nodata(60s)}=1</expression>
+            <expression>{TemplateVMaaS:net.tcp.service[ssh].nodata(5m)}=1</expression>
             <name>SSHAvailableNoData</name>
             <url/>
             <status>0</status>
@@ -5313,7 +5313,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateTomcat:net.tcp.listen[{$TOMCATPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveTomcat:net.tcp.listen[{$TOMCATPORT}].nodata(5m)}=1</expression>
             <name>TomcatPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5323,7 +5323,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveTomcat:net.tcp.listen[{$TOMCATPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateTomcat:net.tcp.listen[{$TOMCATPORT}].nodata(5m)}=1</expression>
             <name>TomcatPortListeningNoData</name>
             <url/>
             <status>0</status>
@@ -5333,7 +5333,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateTomcat:proc.num[,,,tomcat].last()}=0</expression>
+            <expression>{TemplateActiveTomcat:proc.num[,,,tomcat].last()}=0</expression>
             <name>TomcatProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5343,7 +5343,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveTomcat:proc.num[,,,tomcat].last()}=0</expression>
+            <expression>{TemplateTomcat:proc.num[,,,tomcat].last()}=0</expression>
             <name>TomcatProcessRunningLastValue</name>
             <url/>
             <status>0</status>
@@ -5353,7 +5353,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateTomcat:proc.num[,,,tomcat].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveTomcat:proc.num[,,,tomcat].nodata(5m)}=1</expression>
             <name>TomcatProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5363,7 +5363,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveTomcat:proc.num[,,,tomcat].nodata(1m)}=1</expression>
+            <expression>{TemplateTomcat:proc.num[,,,tomcat].nodata(5m)}=1</expression>
             <name>TomcatProcessRunningNoData</name>
             <url/>
             <status>0</status>
@@ -5373,7 +5373,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateX2go:net.tcp.listen[{$X2GOPORT}].last()}=0</expression>
+            <expression>{TemplateActiveX2go:net.tcp.listen[{$X2GOPORT}].last()}=0</expression>
             <name>x2goSSHAvailableLastValue</name>
             <url/>
             <status>0</status>
@@ -5383,7 +5383,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveX2go:net.tcp.listen[{$X2GOPORT}].last()}=0</expression>
+            <expression>{TemplateX2go:net.tcp.listen[{$X2GOPORT}].last()}=0</expression>
             <name>x2goSSHAvailableLastValue</name>
             <url/>
             <status>0</status>
@@ -5393,7 +5393,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateActiveX2go:net.tcp.listen[{$X2GOPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateActiveX2go:net.tcp.listen[{$X2GOPORT}].nodata(5m)}=1</expression>
             <name>x2goSSHAvailableNoData</name>
             <url/>
             <status>0</status>
@@ -5403,7 +5403,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{TemplateX2go:net.tcp.listen[{$X2GOPORT}].nodata(1m)}=1</expression>
+            <expression>{TemplateX2go:net.tcp.listen[{$X2GOPORT}].nodata(5m)}=1</expression>
             <name>x2goSSHAvailableNoData</name>
             <url/>
             <status>0</status>
diff --git a/template/templates-watcher/TemplateWatcher_v1.7.xml b/templates/templates-watcher/TemplateWatcher_v1.7.xml
similarity index 100%
rename from template/templates-watcher/TemplateWatcher_v1.7.xml
rename to templates/templates-watcher/TemplateWatcher_v1.7.xml
-- 
GitLab