Obsoleted the SibusQL and the keyword pkey (still allowed as a placeholder in the templates)

SVN:trunk[372]

setup/data/60.group.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
 <bizInfraGroup id="326">
-<name>Monitroing Nagios server1</name>
+<name>Monitoring Nagios server1</name>
 <status>production</status>
 <org_id>2</org_id>
 <severity>low</severity>
@@ -9,4 +9,4 @@
 <description>regroupe les CI monitorer par nagios</description>
 <parent_group_id>0</parent_group_id>
 </bizInfraGroup>
-</Set>
+</Set>

setup/data/structure/21.auditcategories.xml

@@ -3,6 +3,6 @@
 <AuditCategory id="1">
 <name>Devices in production</name>
 <description>Checking all devices in production</description>
-<definition_set>bizDevice: status = &apos;production&apos;</definition_set>
+<definition_set>SELECT bizDevice AS d WHERE d.status = &apos;production&apos;</definition_set>
 </AuditCategory>
-</Set>
+</Set>

setup/data/structure/22.auditrules.xml

@@ -3,15 +3,15 @@
 <AuditRule id="1">
 <name>Devices in production on a Location not in production</name>
 <description></description>
-<query>bizDevice: location_id IN (bizLocation: status != &apos;production&apos;)</query>
+<query>SELECT bizDevice AS d JOIN bizLocation AS l ON d.location_id = l.id WHERE l.status != &apos;production&apos;</query>
 <valid_flag>false</valid_flag>
 <category_id>1</category_id>
 </AuditRule>
 <AuditRule id="2">
 <name>Devices not attached to a monitoring group</name>
 <description></description>
-<query>bizDevice: PKEY IS infra_id IN (lnkInfraGrouping: infra_group_id IN (bizInfraGroup: type = &apos;Monitoring&apos;))</query>
+<query>SELECT bizDevice AS d JOIN lnkInfraGrouping AS l ON l.infra_id = d.id JOIN bizInfraGroup AS g ON l.infra_group_id = g.id WHERE g.type = &apos;Monitoring&apos;</query>
 <valid_flag>true</valid_flag>
 <category_id>1</category_id>
 </AuditRule>
-</Set>
+</Set>