Skip to content

Commit

Permalink
Merge pull request grafana#5391 from wkruse/prometheus-annotations-doc
Browse files Browse the repository at this point in the history
Add Prometheus annotations doc
  • Loading branch information
bergquist committed Jun 20, 2016
2 parents 12706fd + 3b47b1e commit 87ab97b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions docs/sources/reference/annotations.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ as the name for the fields that should be used for the annotation title, tags an
For InfluxDB you need to enter a query like in the above screenshot. You need to have the ```where $timeFilter``` part.
If you only select one column you will not need to enter anything in the column mapping fields.

## Prometheus Annotations
![](/img/v3/annotations_prom.png)

Prometheus supports two ways to query annotations.

- A regular metric query
- A Prometheus query for pending and firing alerts (for details see [Inspecting alerts during runtime](https://prometheus.io/docs/alerting/rules/#inspecting-alerts-during-runtime))

0 comments on commit 87ab97b

Please sign in to comment.