[BZ 1127481] Add mount options as traits to the filesystem monitoring

rhq-project · Nov 10, 2014 · 1dd2959 · 1dd2959
1 parent cc48e0f
commit 1dd2959
Showing 1 changed file with 47 additions and 45 deletions.
diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml
@@ -505,51 +505,53 @@
 
     </service>
 
-    <service name="File System" discovery="FileSystemDiscoveryComponent" class="FileSystemComponent">
-
-        <runs-inside>
-            <parent-resource-type name="Windows" plugin="Platforms"/>
-            <parent-resource-type name="Linux" plugin="Platforms"/>
-            <parent-resource-type name="Solaris" plugin="Platforms"/>
-            <parent-resource-type name="HP-UX" plugin="Platforms"/>
-            <parent-resource-type name="AIX" plugin="Platforms"/>
-            <parent-resource-type name="FreeBSD" plugin="Platforms"/>
-            <parent-resource-type name="Mac OS X" plugin="Platforms"/>
-        </runs-inside>
-
-        <metric property="fileSystemUsage.free" displayName="Free Space" units="kilobytes" displayType="summary"
-                description="The total free bytes on filesystem"/>
-        <metric property="fileSystemUsage.usePercent" displayName="Used Percentage" units="percentage"
-                displayType="summary"
-                description="The percentage of disk used"/>
-        <metric property="fileSystemUsage.total" displayName="Capacity" units="kilobytes" dataType="trait"
-                description="The total size of the filesystem"/>
-        <metric property="fileSystem.typeName" displayName="Volume Type" dataType="trait" displayType="summary"
-                description="The filesystem's generic type name"/>
-        <metric property="fileSystem.sysTypeName" displayName="Drive Type" dataType="trait" displayType="summary"
-                description="The filesystem's operating system-specific type name"/>
-        <metric property="fileSystem.devName" displayName="name" dataType="trait"
-                description="The name of this device"/>
-        <metric property="fileSystemUsage.freeFiles" displayName="Free Files"
-                description="The number of free file nodes on the filesystem"/>
-        <metric property="fileSystem.flags" displayName="Flags" dataType="trait"
-                description="The filesystem's flags"/>
-        <metric property="fileSystemUsage.used" displayName="Used" units="kilobytes"
-                description="The total bytes used on the filesystem"/>
-        <metric property="fileSystemUsage.diskReads" displayName="Disk Reads" measurementType="trendsup"
-                description="The number of physical disk reads"/>
-        <metric property="fileSystemUsage.diskWrites" displayName="Disk Writes" measurementType="trendsup"
-                description="The number of physical disk writes"/>
-        <metric property="fileSystemUsage.diskReadBytes" displayName="Disk Read Bytes" measurementType="trendsup"
-                units="bytes"
-                description="The number of physical disk bytes read"/>
-        <metric property="fileSystemUsage.diskWriteBytes" displayName="Disk Write Bytes" measurementType="trendsup"
-                units="bytes"
-                description="The number of physical disk bytes written"/>
-        <metric property="fileSystemUsage.diskQueue" displayName="Disk Queue"
-                description="The number of I/Os currently in progress"/>
-
-    </service>
+  <service name="File System" discovery="FileSystemDiscoveryComponent" class="FileSystemComponent">
+
+    <runs-inside>
+      <parent-resource-type name="Windows" plugin="Platforms"/>
+      <parent-resource-type name="Linux" plugin="Platforms"/>
+      <parent-resource-type name="Solaris" plugin="Platforms"/>
+      <parent-resource-type name="HP-UX" plugin="Platforms"/>
+      <parent-resource-type name="AIX" plugin="Platforms"/>
+      <parent-resource-type name="FreeBSD" plugin="Platforms"/>
+      <parent-resource-type name="Mac OS X" plugin="Platforms"/>
+    </runs-inside>
+
+    <metric property="fileSystemUsage.free" displayName="Free Space" units="kilobytes" displayType="summary"
+            description="The total free bytes on filesystem"/>
+    <metric property="fileSystemUsage.usePercent" displayName="Used Percentage" units="percentage"
+            displayType="summary"
+            description="The percentage of disk used"/>
+    <metric property="fileSystemUsage.total" displayName="Capacity" units="kilobytes" dataType="trait"
+            description="The total size of the filesystem"/>
+    <metric property="fileSystem.typeName" displayName="Volume Type" dataType="trait" displayType="summary"
+            description="The filesystem's generic type name"/>
+    <metric property="fileSystem.sysTypeName" displayName="Drive Type" dataType="trait" displayType="summary"
+            description="The filesystem's operating system-specific type name"/>
+    <metric property="fileSystem.devName" displayName="name" dataType="trait"
+            description="The name of this device"/>
+    <metric property="fileSystemUsage.freeFiles" displayName="Free Files"
+            description="The number of free file nodes on the filesystem"/>
+    <metric property="fileSystem.flags" displayName="Flags" dataType="trait"
+            description="The filesystem's flags"/>
+    <metric property="fileSystem.options" displayName="Options" dataType="trait"
+            description="The filesystem's mount options"/>
+    <metric property="fileSystemUsage.used" displayName="Used" units="kilobytes"
+            description="The total bytes used on the filesystem"/>
+    <metric property="fileSystemUsage.diskReads" displayName="Disk Reads" measurementType="trendsup"
+            description="The number of physical disk reads"/>
+    <metric property="fileSystemUsage.diskWrites" displayName="Disk Writes" measurementType="trendsup"
+            description="The number of physical disk writes"/>
+    <metric property="fileSystemUsage.diskReadBytes" displayName="Disk Read Bytes" measurementType="trendsup"
+            units="bytes"
+            description="The number of physical disk bytes read"/>
+    <metric property="fileSystemUsage.diskWriteBytes" displayName="Disk Write Bytes" measurementType="trendsup"
+            units="bytes"
+            description="The number of physical disk bytes written"/>
+    <metric property="fileSystemUsage.diskQueue" displayName="Disk Queue"
+            description="The number of I/Os currently in progress"/>
+
+  </service>
 
     <service name="CPU" discovery="CpuDiscoveryComponent" class="CpuComponent">