Merge pull request #2618 from ajssmith/amqp1_dev1_branch

[collectd.git] / README

diff --git a/README b/README
index b0b5921..2210b2b 100644 (file)
--- a/README
+++ b/README
@@ -100,6 +100,9 @@ Features
       Collect DPDK interface statistics.
       See docs/BUILD.dpdkstat.md for detailed build instructions.
 
       Collect DPDK interface statistics.
       See docs/BUILD.dpdkstat.md for detailed build instructions.
 

+      This plugin should be compiled with compiler defenses enabled, for
+      example -fstack-protector.
+

     - drbd
       Collect individual drbd resource statistics.
 
     - drbd
       Collect individual drbd resource statistics.
 


@@ -140,6 +143,14 @@ Features
       hugepages can be found here:
       https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt.
 
       hugepages can be found here:
       https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt.
 

+      This plugin should be compiled with compiler defenses enabled, for
+      example -fstack-protector.
+
+    - intel_pmu
+      The intel_pmu plugin reads performance counters provided by the Linux
+      kernel perf interface. The plugin uses jevents library to resolve named
+      events to perf events and access perf interface.
+

     - intel_rdt
       The intel_rdt plugin collects information provided by monitoring features
       of Intel Resource Director Technology (Intel(R) RDT) like Cache Monitoring
     - intel_rdt
       The intel_rdt plugin collects information provided by monitoring features
       of Intel Resource Director Technology (Intel(R) RDT) like Cache Monitoring


@@ -240,7 +251,7 @@ Features
 
     - netapp
       Plugin to query performance values from a NetApp storage system using the
 
     - netapp
       Plugin to query performance values from a NetApp storage system using the

-      “Manage ONTAP” SDK provided by NetApp.
+      “Manage ONTAP” SDK provided by NetApp.

 
     - netlink
       Very detailed Linux network interface and routing statistics. You can get
 
     - netlink
       Very detailed Linux network interface and routing statistics. You can get


@@ -253,8 +264,7 @@ Features
       plugin of choice for that.
 
     - nfs
       plugin of choice for that.
 
     - nfs

-      NFS Procedures: Which NFS command were called how often. Only NFSv2 and
-      NFSv3 right now.
+      NFS Procedures: Which NFS command were called how often.

 
     - nginx
       Collects statistics from `nginx' (speak: engine X), a HTTP and mail
 
     - nginx
       Collects statistics from `nginx' (speak: engine X), a HTTP and mail


@@ -455,7 +465,11 @@ Features
 
     - amqp
       Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)
 
     - amqp
       Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)

-      server, such as RabbitMQ.
+      0.9.1 server, such as RabbitMQ.
+
+    - amqp1
+      Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP)
+      1.0 server, such as Qpid Dispatch Router or Apache Artemis Broker.

 
     - csv
       Write to comma separated values (CSV) files. This needs lots of
 
     - csv
       Write to comma separated values (CSV) files. This needs lots of


@@ -786,6 +800,13 @@ Prerequisites
     For querying iptables counters.
     <http://netfilter.org/>
 
     For querying iptables counters.
     <http://netfilter.org/>
 

+  * libjevents (optional)
+    The jevents library is used by the `intel_pmu' plugin to access the Linux
+    kernel perf interface.
+    Note: the library should be build with -fPIC flag to be linked with
+    intel_pmu shared object correctly.
+    <https://github.com/andikleen/pmu-tools>
+

   * libjvm (optional)
     Library that encapsulates the `Java Virtual Machine' (JVM). This library is
     used by the `java' plugin to execute Java bytecode.
   * libjvm (optional)
     Library that encapsulates the `Java Virtual Machine' (JVM). This library is
     used by the `java' plugin to execute Java bytecode.


@@ -891,8 +912,14 @@ Prerequisites
     are supported.
     <http://www.python.org/>
 
     are supported.
     <http://www.python.org/>
 

+  * libqpid-proton (optional)
+    Used by the `amqp1' plugin for AMQP 1.0 connections, for example to
+    Qdrouterd.
+    <http://qpid.apache.org/>
+

   * librabbitmq (optional; also called “rabbitmq-c”)
   * librabbitmq (optional; also called “rabbitmq-c”)

-    Used by the `amqp' plugin for AMQP connections, for example to RabbitMQ.
+    Used by the `amqp' plugin for AMQP 0.9.1 connections, for example to
+    RabbitMQ.

     <http://hg.rabbitmq.com/rabbitmq-c/>
 
   * librdkafka (optional; also called “rdkafka”)
     <http://hg.rabbitmq.com/rabbitmq-c/>
 
   * librdkafka (optional; also called “rdkafka”)


@@ -970,9 +997,8 @@ Configuring / Compiling / Installing
 ------------------------------------
 
   To configure, build and install collectd with the default settings, run
 ------------------------------------
 
   To configure, build and install collectd with the default settings, run

-  `./configure && make && make install'.  For detailed, generic instructions
-  see INSTALL. For a complete list of configure options and their description,
-  run `./configure --help'.
+  `./configure && make && make install'.  For a complete list of configure
+  options and their description, run `./configure --help'.

 
   By default, the configure script will check for all build dependencies and
   disable all plugins whose requirements cannot be fulfilled (any other plugin
 
   By default, the configure script will check for all build dependencies and
   disable all plugins whose requirements cannot be fulfilled (any other plugin