Merge branch 'collectd-4.7' into collectd-4.8
[collectd.git] / contrib / collection3 / etc / collection.conf
index f15ea56..1322d0d 100644 (file)
@@ -161,7 +161,7 @@ GraphWidth 400
   DSName "read Read "
   DSName write Write
   RRDTitle "Disk Latency for {plugin_instance}"
-  RRDVerticalLabel "microseconds"
+  RRDVerticalLabel "seconds"
   Scale 0.000001
   RRDFormat "%5.1lf %ss"
 </Type>
@@ -327,6 +327,13 @@ GraphWidth 400
 # RRDOptions ...
   RRDFormat "%5.1lf%s"
 </Type>
+<Type invocations>
+  DataSources value
+  DSName "value Invocations/s"
+  RRDTitle "Invocations ({instance})"
+  RRDVerticalLabel "Invocations/s"
+  RRDFormat "%5.1lf"
+</Type>
 <Type io_octets>
   Module GenericIO
   DataSources rx tx
@@ -614,6 +621,20 @@ GraphWidth 400
   RRDVerticalLabel "°Celsius"
   RRDFormat "%4.1lf°C"
 </Type>
+<Type threads>
+  DataSources value
+  DSName "value Threads"
+  RRDTitle "Threads ({instance})"
+  RRDVerticalLabel "Threads"
+  RRDFormat "%5.2lf"
+</Type>
+<Type total_requests>
+  DataSources value
+  DSName "value Requests/s"
+  RRDTitle "Requests ({instance})"
+  RRDVerticalLabel "Requests/s"
+  RRDFormat "%6.2lf"
+</Type>
 <Type total_time_in_ms>
   DataSources value
   DSName "value Time"