Merge pull request #2729 from cekstam/add-scale-and-shift-to-modbus

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 6ec61f3..662b483 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -90,6 +90,7 @@
 
 #@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
 #@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
 
 #@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
 #@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp

+#@BUILD_PLUGIN_AMQP1_TRUE@LoadPlugin amqp1

 #@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
 #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
 #@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
 #@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
 #@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors


@@ -269,6 +270,29 @@
 #  </Publish>
 #</Plugin>
 
 #  </Publish>
 #</Plugin>
 

+#<Plugin amqp1>
+#  <Transport "name">
+#    Host "localhost"
+#    Port "5672"
+#    User "guest"
+#    Password "guest"
+#    Address "collectd"
+#    RetryDelay 1
+#    <Instance "log">
+#        Format JSON
+#        PreSettle false
+#    </Instance>
+#    <Instance "notify">
+#        Format JSON
+#        PreSettle true
+#    </Instance>
+#    <Instance "telemetry">
+#        Format JSON
+#        PreSettle false
+#    </Instance>
+#  </Transport>
+#</Plugin>
+

 #<Plugin apache>
 #  <Instance "local">
 #    URL "http://localhost/status?auto"
 #<Plugin apache>
 #  <Instance "local">
 #    URL "http://localhost/status?auto"


@@ -666,6 +690,7 @@
 #    ReportSoftwareEvents true
 #    EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
 #    HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
 #    ReportSoftwareEvents true
 #    EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
 #    HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"

+#    Cores "[0-3]"

 #</Plugin>
 
 #<Plugin "intel_rdt">
 #</Plugin>
 
 #<Plugin "intel_rdt">


@@ -809,6 +834,8 @@
 #              RegisterType float
 #              Type gauge
 #              Instance "..."
 #              RegisterType float
 #              Type gauge
 #              Instance "..."

+#              #Scale 1.0
+#              #Shift 0.0

 #      </Data>
 #
 #      <Host "name">
 #      </Data>
 #
 #      <Host "name">


@@ -1126,6 +1153,7 @@
 #      Timeout 0.9
 #      TTL 255
 #      SourceAddress "1.2.3.4"
 #      Timeout 0.9
 #      TTL 255
 #      SourceAddress "1.2.3.4"

+#      AddressFamily "any"

 #      Device "eth0"
 #      MaxMissed -1
 #</Plugin>
 #      Device "eth0"
 #      MaxMissed -1
 #</Plugin>


@@ -1607,6 +1635,7 @@
 #      PluginInstanceFormat name
 #      Instances 1
 #      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 #      PluginInstanceFormat name
 #      Instances 1
 #      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"

+#      PersistentNotification false

 #</Plugin>
 
 #<Plugin vmem>
 #</Plugin>
 
 #<Plugin vmem>