From 58b5e428bd9fdd410adad8d403f5e81967e4bf6a Mon Sep 17 00:00:00 2001
From: Preetha Appan <preetha@hashicorp.com>
Date: Thu, 21 Jun 2018 10:29:42 -0500
Subject: [PATCH 1/2] add docs for new labels

---
 website/source/docs/agent/telemetry.html.md | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/website/source/docs/agent/telemetry.html.md b/website/source/docs/agent/telemetry.html.md
index f45d562ec..36ff684f9 100644
--- a/website/source/docs/agent/telemetry.html.md
+++ b/website/source/docs/agent/telemetry.html.md
@@ -236,6 +236,32 @@ configuration block.
 Please see the [agent configuration](/docs/agent/configuration/telemetry.html)
 page for more details.
 
+As of Nomad 0.9, Nomad will emit additional labels for [parameterized](/docs/job-specification/parameterized.html) and
+[periodic](/docs/job-specification/parameterized.html) jobs. Nomad
+emits the parent job id as a new label `parent_id`. Also, the labels `dispatch_id`
+and `periodic_id` are emitted, containing the ID of the specific invocation of the
+parameterized or periodic job respectively. For example, a dispatch job with the id
+`myjob/dispatch-1312323423423`, will have the following labels.
+
+<table class="table table-bordered table-striped">
+<tr>
+    <th>Label</th>
+    <th>Value</th>
+</tr>
+<tr>
+<td>job</td>
+<td>`myjob/dispatch-1312323423423`</td>
+</tr>
+<tr>
+<td>parent_id</td>
+<td>myjob</td>
+</tr>
+<tr>
+<td>dispatch_id</td>
+<td>1312323423423</td>
+</tr>
+</table>
+
 ## Host Metrics (post Nomad version 0.7)
 
 Starting in version 0.7, Nomad will emit tagged metrics, in the below format:

From 8f9647cb115041b8079f03fe939400390cae20a9 Mon Sep 17 00:00:00 2001
From: Preetha Appan <preetha@hashicorp.com>
Date: Thu, 21 Jun 2018 11:17:39 -0500
Subject: [PATCH 2/2] Docs about node_class label

---
 website/source/docs/agent/telemetry.html.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/source/docs/agent/telemetry.html.md b/website/source/docs/agent/telemetry.html.md
index 36ff684f9..43643a282 100644
--- a/website/source/docs/agent/telemetry.html.md
+++ b/website/source/docs/agent/telemetry.html.md
@@ -489,6 +489,9 @@ Starting in version 0.7, Nomad will emit tagged metrics, in the below format:
   </tr>
 </table>
 
+Nomad 0.9 adds an additional "node_class" label from the client's
+`NodeClass` attribute. This label is set to the string "none" if empty.
+
 ## Host Metrics (deprecated post Nomad 0.7)
 
 The below are metrics emitted by Nomad in versions prior to 0.7. These metrics