collection3: Added some more metrics.

diff --git a/contrib/collection3/etc/collection.conf b/contrib/collection3/etc/collection.conf
index 698d8f5..f6f1bee 100644 (file)
--- a/contrib/collection3/etc/collection.conf
+++ b/contrib/collection3/etc/collection.conf
@@ -47,6 +47,13 @@ GraphWidth 400
   Color starting     ff00ff
   Color waiting      ffb000
 </Type>
+<Type cache_ratio>
+  DataSources value
+  DSName value Percent
+  RRDTitle "Cache hit ratio for {plugin_instance} {type_instance}"
+  RRDVerticalLabel "Percent"
+  RRDFormat "%5.1lf %%"
+</Type>
 <Type cpu>
   Module GenericStacked
   DataSources value
@@ -83,6 +90,35 @@ GraphWidth 400
   Module Df
   DataSources free used
 </Type>
+<Type df_complex>
+  Module GenericStacked
+  DataSources value
+  RRDTitle "disk usage on {plugin_instance}"
+  RRDVerticalLabel "Byte"
+  RRDFormat "%6.2lf%s"
+  DSName "snap_used    used for snapshots"
+  DSName "snap_reserved snapshot reserve "
+  DSName "used         in use            "
+  DSName "free         free              "
+  DSName "sis_saved    sis_saved         "
+  Order free snap_used snap_reserved sis_saved used
+  Color snap_reverse   ff8000
+  Color used  ff0000
+  Color snap_used   000080
+  Color snap_reserved   ff8000
+  Color free  00ff00
+  Color sis_saved 00e0e0
+</Type>
+<Type disk_latency>
+  Module GenericIO
+  DataSources read write
+  DSName "read Read "
+  DSName write Write
+  RRDTitle "Disk Latency for {plugin_instance}"
+  RRDVerticalLabel "microseconds"
+  Scale 0.000001
+  RRDFormat "%5.1lf %ss"
+</Type>
 <Type disk_octets>
   Module GenericIO
   DataSources read write
@@ -103,6 +139,26 @@ GraphWidth 400
 # RRDOptions ...
   RRDFormat "%5.1lf"
 </Type>
+<Type disk_ops_complex>
+  Module GenericStacked
+  DataSources value
+  RRDTitle "Netapp disc ops on {plugin_instance}"
+  RRDVerticalLabel "Ops"
+  RRDFormat "%6.2lf"
+  DSName fcp_ops   FCP-Ops
+  DSName nfs_ops   NFS-Ops
+  DSName http_ops  HTTP-Ops
+  DSName cifs_ops  CIFS-Ops
+  DSName dafs_ops  DAFS-Ops
+  DSName iscsi_ops iSCSI-Ops
+  Order fcp_ops nfs_ops http_ops cifs_ops dafs_ops iscsi_ops
+  Color fcp_ops    000080
+  Color nfs_ops    ff0000
+  Color http_ops   ffb000
+  Color cifs_ops   00e0a0
+  Color dafs_ops   00e000
+  Color iscsi_ops  00e0ff
+</Type>
 <Type disk_merged>
   Module GenericIO
   DataSources read write