[Hyperic-hq-discuss] xen_plugin r27 - trunk/etc

[<do...@hy...>]

Author: dougm
Date: 2007-12-31 14:07:59 -0800 (Mon, 31 Dec 2007)
New Revision: 27

Modified:
   trunk/etc/hq-plugin.xml
Log:
fixup config schemas

Modified: trunk/etc/hq-plugin.xml
===================================================================
--- trunk/etc/hq-plugin.xml	2007-12-31 21:04:11 UTC (rev 26)
+++ trunk/etc/hq-plugin.xml	2007-12-31 22:07:59 UTC (rev 27)
@@ -38,15 +38,30 @@
             default=""/>
   </config>
 
-  <config name="host.uuid">
+  <config name="platform.uuid">
     <option name="platform.uuid"
             description="Server name or UUID"
             default="xenserver-4.0"/>
   </config>
+  <filter name="platform.config" value="${xconn.config},${platform.uuid.config}"/>
 
+  <config name="server.uuid">
+    <option name="server.uuid"
+            description="UUID"
+            default=""/>
+  </config>
+  <filter name="server.config" value="${xconn.config},${server.uuid.config}"/>
+
+  <config name="service.uuid">
+    <option name="service.uuid"
+            description="UUID"
+            default=""/>
+  </config>
+  <filter name="service.config" value="${xconn.config},${service.uuid.config}"/>
+
   <platform name="Xen Host">
 
-    <config include="xconn,host.uuid" type="measurement"/>
+    <config include="xconn,platform.uuid"/>
 
     <properties>
        <property name="version" description="Product Version"/>
@@ -68,7 +83,7 @@
             class="org.hyperic.hq.plugin.xen.XenHostCollector"/>
 
     <filter name="template"
-            value="xenhost:${xconn.config},${host.uuid.config}:${alias}"/>
+            value="xenhost:${platform.config}:${alias}"/>
 
     <metric name="Availability"
             indicator="true"/>
@@ -91,11 +106,7 @@
               class="org.hyperic.hq.plugin.xen.XenHostServiceDetector"/>
 
       <service name="Storage">
-        <config name="uuid">
-          <option name="service.uuid"
-                  description="UUID"
-                  default=""/>
-        </config>
+        <config include="service.uuid"/>
 
         <properties>
           <property name="type" description="Type"/>
@@ -108,7 +119,7 @@
                 class="org.hyperic.hq.plugin.xen.XenStorageCollector"/>
 
         <filter name="template"
-                value="xenstor:${xconn.config},${uuid.config}:${alias}"/>
+                value="xenstor:${service.config}:${alias}"/>
 
         <metric name="Availability"
                 indicator="true"/>
@@ -126,11 +137,7 @@
       </service>
 
       <service name="NIC">
-        <config>
-          <option name="service.uuid"
-                  description="UUID"
-                  default=""/>
-        </config>
+        <config include="service.uuid"/>
 
         <properties>
           <property name="mtu" description="MTU"/>
@@ -147,7 +154,7 @@
                 class="org.hyperic.hq.plugin.xen.XenNicCollector"/>
 
         <filter name="template"
-                value="xennic:${xconn.config},${uuid.config}:${alias}"/>
+                value="xennic:${service.config}:${alias}"/>
 
         <metric name="Availability"
                 indicator="true"/>
@@ -166,11 +173,7 @@
       </service>
 
       <service name="CPU">
-        <config name="uuid">
-          <option name="service.uuid"
-                  description="UUID"
-                  default=""/>
-        </config>
+        <config include="service.uuid"/>
 
         <properties>
           <property name="vendor" description="Vendor"/>
@@ -185,7 +188,7 @@
                 class="org.hyperic.hq.plugin.xen.XenCpuCollector"/>
 
         <filter name="template"
-                value="xencpu:${xconn.config},${uuid.config}:${alias}"/>
+                value="xencpu:${service.config}:${alias}"/>
 
         <metric name="Availability"
                 indicator="true"/>
@@ -197,11 +200,7 @@
     </server>
 
     <server name="Xen VM">
-      <config name="uuid">
-        <option name="server.uuid"
-                description="UUID"
-                default=""/>
-      </config>
+      <config include="server.uuid"/>
 
       <properties>
         <property name="os" description="OS"/>
@@ -222,7 +221,7 @@
       <actions include="start,shutdown,forceShutdown,suspend,resume,reboot,forceReboot"/>
 
       <filter name="template"
-              value="xenvm:${xconn.config},${uuid.config}:${alias}"/>
+              value="xenvm:${server.config}:${alias}"/>
 
       <metric name="Availability"
               indicator="true"/>
@@ -236,11 +235,7 @@
               units="percentage"/>
 
       <service name="Storage">
-        <config name="uuid">
-          <option name="service.uuid"
-                  description="UUID"
-                  default=""/>
-        </config>
+        <config include="service.uuid"/>
 
         <plugin type="measurement"
                 class="org.hyperic.hq.product.MeasurementPlugin"/>
@@ -249,7 +244,7 @@
                 class="org.hyperic.hq.plugin.xen.XenVmStorageCollector"/>
 
         <filter name="template"
-                value="xenvmstor:${xconn.config},${uuid.config}:${alias}"/>
+                value="xenvmstor:${service.config}:${alias}"/>
 
         <metric name="Availability"
                 indicator="true"/>
@@ -266,11 +261,7 @@
       </service>
 
       <service name="NIC">
-        <config name="uuid">
-          <option name="service.uuid"
-                  description="UUID"
-                  default=""/>
-        </config>
+        <config include="service.uuid"/>
 
         <properties>
           <property name="mac" description="MAC"/>
@@ -284,7 +275,7 @@
                 class="org.hyperic.hq.plugin.xen.XenVmNicCollector"/>
 
         <filter name="template"
-                value="xenvmnic:${xconn.config},${uuid.config}:${alias}"/>
+                value="xenvmnic:${service.config}:${alias}"/>
 
         <metric name="Availability"
                 indicator="true"/>