diff --git a/website/source/docs/agent/config.html.md b/website/source/docs/agent/config.html.md
index c28fe1b89..dacc727b6 100644
--- a/website/source/docs/agent/config.html.md
+++ b/website/source/docs/agent/config.html.md
@@ -193,6 +193,10 @@ nodes, unless otherwise specified:
     server to forward metrics to.
   * `disable_hostname`: A boolean indicating if gauge values should not be
     prefixed with the local hostname.
+  * `publish_allocation_metrics`: Enables publishing runtime metrics of
+    allocations. Default is `false`.
+  * `publish_node_metrics`: Enables publishing runtime metrics of nodes. Default
+    is `false`.
   * `circonus_api_token`
     A valid [Circonus](http://circonus.com/) API Token used to create/manage check. If provided, metric management is enabled.
   * `circonus_api_app`
diff --git a/website/source/docs/agent/telemetry.html.md b/website/source/docs/agent/telemetry.html.md
index 9a65c9129..46f096cbf 100644
--- a/website/source/docs/agent/telemetry.html.md
+++ b/website/source/docs/agent/telemetry.html.md
@@ -216,9 +216,18 @@ when retrieving metrics using the above described signals.
 # Client Metrics
 
 The Nomad client emits metrics related to the resource usage of the allocations
-and tasks running on it and the node itself. By default the collection interval
-is 1 second but it can be changed by the changing the value of the
-`collection_interval` key in the `telemetry` configuration block.
+and tasks running on it and the node itself.  Operators have to explicity turn
+on publishing host and allocation metrics. Publishing allocation and host
+metrics can be turned on by setting the value of `publish_allocation_metrics`
+`publish_node_metrics` to `true`.
+
+
+By default the collection interval is 1 second but it can be changed by the
+changing the value of the `collection_interval` key in the `telemetry`
+configuration block.  
+
+Please see the [agent configuration](/docs/agent/config.html#telemetry_config)
+page for more details.
 
 ## Host Metrics