collectd: Refinements. Wording.

Author: amotl

docs/integrate/collectd/collectd-telegraf.conf

@@ -1,6 +1,8 @@
 # collectd configuration for sending metrics to Telegraf.
 # https://collectd.org/documentation/manpages/collectd.conf.html#plugin-network
 
+LoadPlugin network
+
 <Plugin "network">
   Server "telegraf"
   # Optional: ServerPort 25826

docs/integrate/collectd/telegraf.conf

@@ -38,17 +38,3 @@
 
   ## The character(s) to replace any '.' in an object key with
   # key_separator = "_"
-
-# Read metrics about cpu usage
-[[inputs.cpu]]
-  ## Whether to report per-cpu stats or not
-  percpu = true
-  ## Whether to report total system cpu stats or not
-  totalcpu = true
-  ## If true, collect raw CPU time metrics
-  collect_cpu_time = false
-  ## If true, compute and report the sum of all non-idle CPU states
-  ## NOTE: The resulting 'time_active' field INCLUDES 'iowait'!
-  report_active = false
-  ## If true and the info is available then add core_id and physical_id tags
-  core_tags = false

docs/integrate/collectd/tutorial-collectd.md

@@ -10,7 +10,7 @@ CrateDB.
 Docker is used for running all components. This approach works consistently
 across Linux, macOS, and Windows. Alternatively, you can use Podman.
 
-### CLI
+### Commands
 
 Prepare shortcut for the psql command.
 
@@ -76,7 +76,7 @@ CREATE TABLE doc.collectd_data (
 SQL
 ```
 
-### Build collectd OCI
+### Build collectd
 
 collectd is not available per OCI image, so either install standalone,
 or use these instructions for building an OCI to invoke on Docker or Podman.
@@ -98,11 +98,8 @@ the name `collectd-cratedb.conf`.
 :::{literalinclude} collectd-cratedb.conf
 :::
 
-## Start services
+## Start collectd
 
-### collectd
-
-Start collectd.
 ::::{tab-set}
 :sync-group: os
 
@@ -134,8 +131,8 @@ docker run --name=collectd --rm -it --network=cratedb-demo ^
 
 ## Explore data
 
-After starting the daemon, the first metrics will appear in the designated table in
-CrateDB, ready to be inspected.
+After the first scraping interval, metrics will show up in the
+designated table in CrateDB, ready to be inspected.
 ```shell
 psql "postgresql://crate:crate@cratedb:5432/" -c "SELECT * FROM doc.collectd_data LIMIT 5;"
 ```

docs/integrate/collectd/tutorial-telegraf.md

@@ -10,7 +10,7 @@ system metrics into CrateDB.
 Docker is used for running all components. This approach works consistently
 across Linux, macOS, and Windows. Alternatively, you can use Podman.
 
-### CLI
+### Commands
 
 Prepare shortcut for the psql command.
 
@@ -40,7 +40,7 @@ doskey psql=docker run --rm -i --network=cratedb-demo docker.io/postgres psql $*
 
 ::::
 
-### CrateDB
+### Start CrateDB
 
 Create a shared network.
 ```shell
@@ -54,7 +54,7 @@ docker run --name=cratedb --rm -it --network=cratedb-demo \
   --env=CRATE_HEAP_SIZE=2g docker.io/crate -Cdiscovery.type=single-node
 ```
 
-### collectd
+### Build collectd
 
 collectd is not available per OCI image, so either install standalone,
 or use these instructions for building an OCI to invoke on Docker or Podman.
@@ -69,7 +69,7 @@ docker build -t local/collectd -f Dockerfile .
 
 ## Configure
 
-### Telegraf
+### Configure Telegraf
 
 Configure Telegraf to receive metrics from collectd agents and to store them
 in CrateDB, by using the configuration blueprint outlined below, possibly
@@ -79,7 +79,7 @@ adjusting it to match your environment. Store this file under the name
 :::{literalinclude} telegraf.conf
 :::
 
-### collectd
+### Configure collectd
 
 To send the collected data to Telegraf, configure collectd by loading its
 [`network` plugin] and supplying settings. Store this file under
@@ -91,9 +91,8 @@ the name `collectd-telegraf.conf`.
 
 ## Start services
 
-### Telegraf
+### Start Telegraf
 
-Start Telegraf.
 ::::{tab-set}
 :sync-group: os
 
@@ -123,9 +122,8 @@ docker run --name=telegraf --rm -it --network=cratedb-demo ^
 :::
 ::::
 
-### collectd
+### Start collectd
 
-Start collectd.
 ::::{tab-set}
 :sync-group: os
 
@@ -157,8 +155,8 @@ docker run --name=collectd --rm -it --network=cratedb-demo ^
 
 ## Explore data
 
-After starting the daemon, the first metrics will appear in the designated table in
-CrateDB, ready to be inspected.
+After the first scraping interval, metrics will show up in the
+designated table in CrateDB, ready to be inspected.
 ```shell
 psql "postgresql://crate:crate@cratedb:5432/" -c "SELECT * FROM doc.metrics LIMIT 5;"
 ```