resolves merge conflicts (#55764)

This commit is contained in:
Christopher Moyer
2022-09-27 09:25:33 -05:00
committed by GitHub
parent 3ff24b2731
commit 595344a3d0
33 changed files with 301 additions and 297 deletions
+1 -1
View File
@@ -380,7 +380,7 @@ Read more about variable formatting options in the [Variables]({{< relref "../da
## Annotations
[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
**Example query using time column with epoch values:**