opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-18 19:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed capital G in Graphite in docs, reviewed annotation docs, Closes #2275

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-07-07 17:14:57 +02:00
parent 24e527ae02
commit f6ad386ba7
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/sources/datasources/graphite.md
View File

@ -6,7 +6,7 @@ page_keywords: grafana, graphite, metrics, query, documentation
# Graphite # Graphite
Grafana has an advanced graphite query editor that lets you quickly navigate the metric space, add functions, Grafana has an advanced Graphite query editor that lets you quickly navigate the metric space, add functions,
change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested change function parameters and much more. The editor can handle all types of graphite queries. It can even handle complex nested
queries through the use of query references. queries through the use of query references.
@ -52,8 +52,8 @@ Some functions like aliasByNode support an optional second argument. To add this
## Point consolidation ## Point consolidation
All graphite metrics are consolidated so that graphite doesn't return more data points than there are pixels in the graph. By default All Graphite metrics are consolidated so that Graphite doesn't return more data points than there are pixels in the graph. By default
this consolidation is done using `avg` function. You can how graphite consolidates metrics by adding the Graphite consolidateBy function. this consolidation is done using `avg` function. You can how Graphite consolidates metrics by adding the Graphite consolidateBy function.
> *Notice* This means that legend summary values (max, min, total) cannot be all correct at the same time. They are calculated > *Notice* This means that legend summary values (max, min, total) cannot be all correct at the same time. They are calculated
> client side by Grafana. And depending on your consolidation function only one or two can be correct at the same time. > client side by Grafana. And depending on your consolidation function only one or two can be correct at the same time.

3
docs/sources/reference/annotations.md
View File

@ -13,7 +13,7 @@ you can get title, tags, and text information for the event.
To add an annotation query click dashboard settings icon in top menu and select `Annotations` from the To add an annotation query click dashboard settings icon in top menu and select `Annotations` from the
dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add a new annotation query. dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add a new annotation query.
### Graphite annotations ## Graphite annotations
Graphite supports two ways to query annotations. Graphite supports two ways to query annotations.
@ -36,5 +36,4 @@ 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. 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. If you only select one column you will not need to enter anything in the column mapping fields.
If you have multiple columns you need to specify which column should be treated as title, tags and text column.