X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=collection.conf;h=ede145891281217db96d48dbb004d6ed86fb121a;hb=7a6beaf075a32bfd93d314c00179f258c8e43ee5;hp=5375a2673784c50bbbf983a14bbce6fadb751ed3;hpb=8b5b9238a2efbc722b7c147707dc453aefe69f04;p=collection4.git

diff --git a/collection.conf b/collection.conf
index 5375a26..ede1458 100644
--- a/collection.conf
+++ b/collection.conf
@@ -15,7 +15,7 @@
     Color "e8e8e8"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "nice"
@@ -24,7 +24,7 @@
     Color "00e000"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "user"
@@ -33,7 +33,7 @@
     Color "0000ff"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "wait"
@@ -42,7 +42,7 @@
     Color "ffb000"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "system"
@@ -51,7 +51,7 @@
     Color "ff0000"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "softirq"
@@ -60,7 +60,7 @@
     Color "ff00ff"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "interrupt"
@@ -69,7 +69,7 @@
     Color "a000a0"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
   </DEF>
   <DEF>
     TypeInstance "steal"
@@ -78,7 +78,127 @@
     Color "000000"
     Area true
     Stack true
-    #Format "%lf"
+    Format "%6.2lf"
+  </DEF>
+</Graph>
+
+<Graph>
+  Host "/any/"
+  Plugin "df"
+  PluginInstance "/any/"
+  Type "df_complex"
+  TypeInstance "/all/"
+
+  Title "Diskspace"
+  VerticalLabel "Bytes"
+
+  <DEF>
+    TypeInstance "used"
+    DSName "value"
+    Legend "Used    "
+    Color "ff0000"
+    Area true
+    #Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "reserved"
+    DSName "value"
+    Legend "Reserved"
+    Color "ffb000"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "free"
+    DSName "value"
+    Legend "Free    "
+    Color "00bf00"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+</Graph>
+
+<Graph>
+  Host "/any/"
+  Plugin "df"
+  PluginInstance "/any/"
+  Type "df_inodes"
+  TypeInstance "/all/"
+
+  Title "Diskspace (Inodes)"
+
+  <DEF>
+    TypeInstance "used"
+    DSName "value"
+    Legend "Used    "
+    Color "ff0000"
+    Area true
+    #Stack true
+  </DEF>
+  <DEF>
+    TypeInstance "reserved"
+    DSName "value"
+    Legend "Reserved"
+    Color "ffb000"
+    Area true
+    Stack true
+  </DEF>
+  <DEF>
+    TypeInstance "free"
+    DSName "value"
+    Legend "Free    "
+    Color "00bf00"
+    Area true
+    Stack true
+  </DEF>
+</Graph>
+
+<Graph>
+  Host "/any/"
+  Plugin "df"
+  PluginInstance ""
+  Type "df"
+  TypeInstance "/any/"
+
+  Title "Diskspace (legacy)"
+
+  <DEF>
+    DSName "used"
+    Legend "Used "
+    Color "ff0000"
+    Area true
+    #Stack true
+  </DEF>
+  <DEF>
+    DSName "free"
+    Legend "Free"
+    Color "00bf00"
+    Area true
+    Stack true
+  </DEF>
+</Graph>
+
+<Graph>
+  Host "/any/"
+  Plugin "disk"
+  PluginInstance "/any/"
+  Type "disk_merged"
+  TypeInstance ""
+
+  Title "Disk merged operations"
+
+  <DEF>
+    DSName "read"
+    Legend "Read "
+    Color "0000ff"
+  </DEF>
+  <DEF>
+    DSName "write"
+    Legend "Write"
+    Color "00bf00"
   </DEF>
 </Graph>
 
@@ -105,24 +225,101 @@
 
 <Graph>
   Host "/any/"
-  Plugin "memory"
-  PluginInstance ""
-  Type "memory"
-  TypeInstance "/all/"
+  Plugin "disk"
+  PluginInstance "/any/"
+  Type "disk_ops"
+  TypeInstance ""
 
-  Title "Memory utilization"
-  VerticalLabel "Bytes"
+  Title "Disk operations"
+
+  <DEF>
+    DSName "read"
+    Legend "Read "
+    Color "0000ff"
+  </DEF>
+  <DEF>
+    DSName "write"
+    Legend "Write"
+    Color "00bf00"
+  </DEF>
 </Graph>
 
 <Graph>
   Host "/any/"
-  Plugin "swap"
+  Plugin "disk"
+  PluginInstance "/any/"
+  Type "disk_time"
+  TypeInstance ""
+
+  Title "Disk time per op"
+
+  <DEF>
+    DSName "read"
+    Legend "Read "
+    Color "0000ff"
+  </DEF>
+  <DEF>
+    DSName "write"
+    Legend "Write"
+    Color "00bf00"
+  </DEF>
+</Graph>
+
+<Graph>
+  Host "/any/"
+  Plugin "memory"
   PluginInstance ""
-  Type "swap"
+  Type "memory"
   TypeInstance "/all/"
 
-  Title "Swap utilization"
+  Title "Memory utilization"
   VerticalLabel "Bytes"
+
+  <DEF>
+    TypeInstance "free"
+    DSName "value"
+    Legend "Free    "
+    Color "00e000"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "cached"
+    DSName "value"
+    Legend "Cached  "
+    Color "0000ff"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "buffered"
+    DSName "value"
+    Legend "Buffered"
+    Color "ffb000"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "locked"
+    DSName "value"
+    Legend "Locked  "
+    Color "ff00ff"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
+  <DEF>
+    TypeInstance "used"
+    DSName "value"
+    Legend "Used    "
+    Color "ff0000"
+    Area true
+    Stack true
+    Format "%5.1lf%s"
+  </DEF>
 </Graph>
 
 <Graph>
@@ -173,4 +370,14 @@
   </DEF>
 </Graph>
 
+<Graph>
+  Host "/any/"
+  Plugin "swap"
+  PluginInstance ""
+  Type "swap"
+  TypeInstance "/all/"
+
+  Title "Swap utilization"
+  VerticalLabel "Bytes"
+</Graph>