From 902ecc9a0688cc43273d8a19c15591136cc860fc Mon Sep 17 00:00:00 2001
From: Marcus Olsson <marcus.olsson@hey.com>
Date: Wed, 30 Sep 2020 15:07:44 +0200
Subject: [PATCH] Docs: Add trace and exemplar to glossary (#27854)

* Format glossary table

* Add trace and examplar to glossary

* Fix typo

* Fix review comments

* Fix review comment

* Update docs/sources/getting-started/glossary.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
---
 docs/sources/getting-started/glossary.md | 93 ++++++++++++++++--------
 1 file changed, 62 insertions(+), 31 deletions(-)

diff --git a/docs/sources/getting-started/glossary.md b/docs/sources/getting-started/glossary.md
index f649fc99c24..a4aa6b705c5 100644
--- a/docs/sources/getting-started/glossary.md
+++ b/docs/sources/getting-started/glossary.md
@@ -17,41 +17,72 @@ This topic lists words and abbreviations that are commonly used in the Grafana d
 
 <table>
   <tr>
-    <td style = "vertical-align: top;">Dashboard</td>
-    <td>A set of one or more panels, organized and arranged into one or more rows, that provide an at-a-glance view of related information.</td>
-  </tr>
-  <tr>
-    <td style = "vertical-align: top;">Data source</td>
-    <td>A file, database, or service providing the data. Grafana supports a several data sources by default, and can be extended to support additional ones through plugins.</td>
-  </tr>
-    <tr>
-    <td style = "vertical-align: top;">Graph</td>
-    <td>A commonly-used visualization that displays data as points, lines, or bars.</td>
-  </tr>
-    <tr>
-    <td style = "vertical-align: top;">Panel</td>
-    <td>Basic building block in Grafana, composed by a query and a visualization. Can be moved and resized within a dashboard.</td>
-  </tr>
-  <tr>
-    <td style = "vertical-align: top;">Plugin</td>
-    <td>An extension of Grafana that allows users to provide additional functionality to enhance their experience. The types of plugins currently supported are:
-    <ul>
-      <li><b>App plugin:</b> Extends Grafana with a customized experience. It includes a set of panel and data source plugins, as well as custom pages.</li>
-      <li><b>Data source plugin:</b> Extends Grafana with support for additional data sources.</li>
-      <li><b>Panel plugin:</b> Extends Grafana with additional visualization options.</li>
-    </ul>
+    <td style="vertical-align: top">Dashboard</td>
+    <td>
+      A set of one or more panels, organized and arranged into one or more rows, that provide an at-a-glance view of related information.
     </td>
   </tr>
-    <tr>
-    <td style = "vertical-align: top;">Query</td>
-    <td>Used to request data from a data source. The structure and format of the query depend on the specific data source.</td>
-  </tr>
-    <tr>
-    <td style = "vertical-align: top;">Time series</td>
-    <td>A series of measurements, ordered by time. Time series are stored in data sources and returned as the result of a query.</td>
+  <tr>
+    <td style="vertical-align: top">Data source</td>
+    <td>
+      A file, database, or service providing the data. Grafana supports a several data sources by default, and can be extended to support additional data sources through plugins.
+    </td>
   </tr>
   <tr>
-    <td style = "vertical-align: top;">Visualization</td>
+    <td style="vertical-align: top">Exemplar</td>
+    <td>
+      An exemplar is any data that serves as a detailed example of one of the observations aggregated into a metric. An exemplar contains the observed value together with an optional timestamp and arbitrary labels, which are typically used to reference a trace.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Graph</td>
+    <td>
+      A commonly-used visualization that displays data as points, lines, or bars.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Panel</td>
+    <td>
+      Basic building block in Grafana, composed by a query and a visualization. Can be moved and resized within a dashboard.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Plugin</td>
+    <td>
+      An extension of Grafana that allows users to provide additional functionality to enhance their experience. The types of plugins currently supported are:
+      <ul>
+        <li>
+          <b>App plugin:</b> Extends Grafana with a customized experience. It includes a set of panel and data source plugins, as well as custom pages.
+        </li>
+        <li>
+          <b>Data source plugin:</b> Extends Grafana with support for additional data sources.
+        </li>
+        <li>
+          <b>Panel plugin:</b> Extends Grafana with additional visualization options.
+        </li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Query</td>
+    <td>
+      Used to request data from a data source. The structure and format of the query depend on the specific data source.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Time series</td>
+    <td>
+      A series of measurements, ordered by time. Time series are stored in data sources and returned as the result of a query.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Trace</td>
+    <td>
+      An observed execution path of a request through a distributed system. For more information, refer to [What is Distributed Tracing?](https://opentracing.io/docs/overview/what-is-tracing/).
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Visualization</td>
     <td>A graphical representation of query results.</td>
   </tr>
 </table>