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
@@ -216,7 +216,7 @@ For more information, refer to [Advanced variable format options]({{< relref "..
## Annotations
[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation
[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.
Graphite supports two ways to query annotations. A regular metric query, for this you use the `Graphite query` textbox. A Graphite events query, use the `Graphite event tags` textbox,