+ 
+
The image above shows you the top header for a Dashboard.
@@ -39,7 +39,7 @@ Dashboards are at the core of what Grafana is all about. Dashboards are composed
## Adding & Editing Graphs and Panels
-
+
1. You add panels via row menu. The row menu is the green icon to the left of each row.
2. To edit the graph you click on the graph title to open the panel menu, then `Edit`.
@@ -48,7 +48,7 @@ Dashboards are at the core of what Grafana is all about. Dashboards are composed
When you click the `Metrics` tab, you are presented with a Query Editor that is specific to the Panel Data Source. Use the Query Editor to build your queries and Grafana will visualize them in real time.
-
+
1. Zoom out time range
2. Time picker dropdown. Here you can access relative time range options, auto refresh options and set custom absolute time ranges.
@@ -61,7 +61,7 @@ When you click the `Metrics` tab, you are presented with a Query Editor that is
You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel title, and drag it to its new location. You can also easily resize panels by clicking the (-) and (+) icons.
-
+
## Tips and shortcuts
@@ -79,15 +79,3 @@ You can Drag-and-Drop Panels within and between Rows. Click and hold the Panel t
* Ctrl+H Hides all controls (good for tv displays)
* Hit Escape to exit graph when in fullscreen or edit mode
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/sources/guides/whats-new-in-v2-1.md b/docs/sources/guides/whats-new-in-v2-1.md
index efe35fd387a..68da4f60226 100644
--- a/docs/sources/guides/whats-new-in-v2-1.md
+++ b/docs/sources/guides/whats-new-in-v2-1.md
@@ -23,7 +23,7 @@ A template variable with Multi-Value enabled allows for the selection of multipl
These variables can then be used in any Panel to make them more dynamic, and to give you the perfect view of your data.
Multi-Value variables is also enabling the new `row repeat` and `panel repeat` feature described below.
-
+
+
A new timepicker with room for more quick ranges as well as new types of relative ranges, like `Today`,
`The day so far` and `This day last week`. Also an improved time & calendar picker that now works
@@ -26,7 +26,7 @@ correctly in UTC mode.
### Elasticsearch
-
+
+
Grafana 2.5 ships with a new CloudWatch datasource that will allow you to query and visualize CloudWatch
metrics directly from Grafana.
@@ -57,14 +57,14 @@ metrics directly from Grafana.
### Prometheus
-
+
Grafana 2.5 ships with a new Prometheus datasource that will allow you to query and visualize data
stored in Prometheus.
### Mix different data sources
-
+
In previous releases you have been able to mix different data sources on the same dashboard. In v2.5 you
will be able to mix then on the same graph! You can enable this by selecting the built in `-- Mixed --` data source.
@@ -73,12 +73,12 @@ to plot metrics from different Graphite servers on the same Graph or plot data f
data from Prometheus. Mixing different data sources on the same graph works for any data source, even custom ones.
### Panel Resize handles
-
+
This release adds resize handles to the the bottom right corners of panels making is easy to resize both width and height.
### User invites
-
+
This version also brings some new features for user management.
diff --git a/docs/sources/guides/whats-new-in-v2-6.md b/docs/sources/guides/whats-new-in-v2-6.md
index 281c2b5e4be..0b1e6688e60 100644
--- a/docs/sources/guides/whats-new-in-v2-6.md
+++ b/docs/sources/guides/whats-new-in-v2-6.md
@@ -17,7 +17,7 @@ The release includes a new Table panel, a new InfluxDB query editor, support for
support for multiple Cloudwatch credentials.
## Table Panel
-
+
The new table panel is very flexible, supporting both multiple modes for time series as well as for
table, annotation and raw JSON data. It also provides date formating and value formating and coloring options.
@@ -27,7 +27,7 @@ table, annotation and raw JSON data. It also provides date formating and value f
In the most simple mode you can turn time series to rows. This means you get a `Time`, `Metric` and a `Value` column.
Where `Metric` is the name of the time series.
-
+
### Table Transform
Above you see the options tab for the **Table Panel**. The most important option is the `To Table Transform`.
@@ -40,7 +40,7 @@ The column styles allow you control how dates and numbers are formatted.
This transform allows you to take multiple time series and group them by time. Which will result in a `Time` column
and a column for each time series.
-
+
In the screenshot above you can see how the same time series query as in the previous example can be transformed into
a different table by changing the `To Table Transform` to `Time series to columns`.
@@ -49,7 +49,7 @@ a different table by changing the `To Table Transform` to `Time series to colum
This transform works very similar to the legend values in the Graph panel. Each series gets its own row. In the Options
tab you can select which aggregations you want using the plus button the Columns section.
-
+
You have to think about how accurate the aggregations will be. It depends on what aggregation is used in the time series query,
how many data points are fetched, etc. The time series aggregations are calculated by Grafana after aggregation is performed
@@ -59,39 +59,39 @@ by the time series database.
If you want to show documents from Elasticsearch pick `Raw Document` as the first metric.
-
+
This in combination with the `JSON Data` table transform will allow you to pick which fields in the document
you want to show in the table.
-
+
### Elasticsearch aggregations
You can also make Elasticsearch aggregation queries without a `Date Histogram`. This allows you to
use Elasticsearch metric aggregations to get accurate aggregations for the selected time range.
-
+
### Annotations
The table can also show any annotations you have enabled in the dashboard.
-
+
## The New InfluxDB Editor
The new InfluxDB editor is a lot more flexible and powerful. It supports nested functions, like `derivative`.
It also uses the same technique as the Graphite query editor in that it presents nested functions as chain of function
transformations. It tries to simplify and unify the complicated nature of InfluxDB's query language.
-
+
In the `SELECT` row you can specify what fields and functions you want to use. If you have a
group by time you need an aggregation function. Some functions like derivative require an aggregation function.
The editor tries simplify and unify this part of the query. For example:
-
+
The above will generate the following InfluxDB `SELECT` clause:
@@ -110,7 +110,7 @@ You can remove the group by by clicking on the `tag` and then click on the x ico
The new editor also allows you to remove group by time and select `raw` table data. Which is very useful
in combination with the new Table panel to show raw log data stored in InfluxDB.
-
+
## Pipeline metrics
diff --git a/docs/sources/guides/whats-new-in-v2.md b/docs/sources/guides/whats-new-in-v2.md
index 8ad24e70fd1..bd92128a12e 100644
--- a/docs/sources/guides/whats-new-in-v2.md
+++ b/docs/sources/guides/whats-new-in-v2.md
@@ -55,7 +55,7 @@ even zoom in). Also they are fast to load as they aren't actually connected to a
They're a great way to communicate about a particular incident with specific people who aren't Users of your Grafana instance. You can also use them to show off your dashboards over the Internet.
-
+
### Publish snapshots
@@ -67,11 +67,11 @@ Either way, anyone with the link (and access to your Grafana instance for local
In Grafana v2.x you can now override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. You can also add a time shift to individual panels. This allows you to show metrics from different time periods or days at the same time.
-
+
You control these overrides in panel editor mode and the new tab `Time Range`.
-
+
When you zoom or change the Dashboard time to a custom absolute time range, all panel overrides will be disabled. The panel relative time override is only active when the dashboard time is also relative. The panel timeshift override however is always active, even when the dashboard time is absolute.
@@ -96,7 +96,7 @@ This feature makes it easy to include interactive visualizations from your Grafa
The top header has gotten a major streamlining in Grafana V2.0.
-
+
1. `Side menubar toggle` Toggle the side menubar on or off. This allows you to focus on the data presented on the Dashboard. The side menubar provides access to features unrelated to a Dashboard such as Users, Organizations, and Data Sources.
2. `Dashboard dropdown` The main dropdown shows you which Dashboard you are currently viewing, and allows you to easily switch to a new Dashboard. From here you can also create a new Dashboard, Import existing Dashboards, and manage the Playlist.
@@ -121,7 +121,7 @@ You can easily collapse or re-open the side menubar at any time by clicking the
## New search view & starring dashboards
-
+
The dashboard search view has gotten a big overhaul. You can now see and filter by which dashboard you have personally starred.
@@ -130,11 +130,11 @@ The dashboard search view has gotten a big overhaul. You can now see and filter
The Graph panel now supports 3 logarithmic scales, `log base 10`, `log base 32`, `log base 1024`. Logarithmic y-axis scales are very useful when rendering many series of different order of magnitude on the same scale (eg.
latency, network traffic, and storage)
-
+
## Dashlist panel
-
+
The dashlist is a new panel in Grafana v2.0. It allows you to show your personal starred dashboards, as well as do custom searches based on search strings or tags.
@@ -153,7 +153,7 @@ In addition, connections to Data Sources can be better controlled and secured, a
A commonly reported problem has been graphs dipping to zero at the the end, because metric data for the last interval has yet to be written to the Data Source. These graphs then "self correct" once the data comes in, but can look deceiving or alarming at times.
You can avoid this problem by adding a `now delay` in `Dashboard Settings` > `Time Picker` tab. This new feature will cause Grafana to ignore the most recent data up to the set delay.
-
+
The delay that may be necessary depends on how much latency you have in your collection pipeline.
@@ -161,7 +161,7 @@ The delay that may be necessary depends on how much latency you have in your col
Grafana v2.0 protects Users from accidentally overwriting each others Dashboard changes. Similar protections are in place if you try to create a new Dashboard with the same name as an existing one.
-
+
These protections are only the first step; we will be building out additional capabilities around dashboard versioning and management in future versions of Grafana.
@@ -177,6 +177,6 @@ Grafana now supports server-side PNG rendering. From the Panel share dialog you
> **Note** This requires that your Data Source is accessible from your Grafana instance.
-
+
diff --git a/docs/sources/guides/whats-new-in-v3-1.md b/docs/sources/guides/whats-new-in-v3-1.md
index 65b5f8e4882..5dd23dff156 100644
--- a/docs/sources/guides/whats-new-in-v3-1.md
+++ b/docs/sources/guides/whats-new-in-v3-1.md
@@ -16,21 +16,21 @@ weight = 1
The export feature is now accessed from the share menu.
-
+
Dashboards exported from Grafana 3.1 are now more portable and easier for others to import than before.
The export process extracts information data source types used by panels and adds these to a new `inputs`
section in the dashboard json. So when you or another person tries to import the dashboard they will be asked to
select data source and optional metrix prefix options.
-
+
The above screenshot shows the new import modal that gives you 3 options for how to import a dashboard.
One notable new addition here is the ability to import directly from Dashboards shared on [Grafana.net](https://grafana.net).
The next step in the import process:
-
+
Here you can change the name of the dashboard and also pick what data sources you want the dashboard to use. The above screenshot
shows a CollectD dashboard for Graphite that requires a metric prefix be specified.
@@ -41,7 +41,7 @@ On [Grafana.net](https://grafana.net) you can now browse & search for dashboards
more are being uploaded every day. To import a dashboard just copy the dashboard url and head back to Grafana,
then Dashboard Search -> Import -> Paste Grafana.net Dashboard URL.
-
+
## Constant template variables
diff --git a/docs/sources/guides/whats-new-in-v3.md b/docs/sources/guides/whats-new-in-v3.md
index f86c7133676..32912754fe9 100644
--- a/docs/sources/guides/whats-new-in-v3.md
+++ b/docs/sources/guides/whats-new-in-v3.md
@@ -43,7 +43,7 @@ entire experience right within Grafana.
## Grafana.net
-
+
[Grafana.net](https://grafana.net) offers a central repository where the community can come together to discover, create and
share plugins (data sources, panels, apps) and dashboards.
@@ -102,7 +102,7 @@ periodically and remotely.
You can also make Playlists dynamic by using Dashboard **tags** to
define the Playlist.
-
+
## Improved UI
@@ -122,11 +122,11 @@ are literally hundreds of UI improvements and refinements.
Here’s the new side menu in action:
-
+
And here's the new look for Dashboard settings:
-
+
Check out the Play
Site to get a feel for some of the UI changes.
@@ -138,7 +138,7 @@ over the link and click the annotation text. This feature is very
useful for linking to particular commits or tickets where more
detailed information can be presented to the user.
-
+
## Data source variables
@@ -146,11 +146,11 @@ This has been a top requested feature for very long we are exited to finally pro
this feature. You can now add a new `Data source` type variable. That will
automatically be filled with instance names of your data sources.
-
+
You can then use this variable as the panel data source:
-
+
This will allow you to quickly change data source server and reuse the
same dashboard for different instances of your metrics backend. For example
@@ -168,7 +168,7 @@ The Prometheus Data Source now supports annotations.
### InfluxDB
You can now select the InfluxDB policy from the query editor.
-
+
Grafana 3.0 also comes with support for InfluxDB 0.11 and InfluxDB 0.12.
@@ -201,23 +201,23 @@ are a couple that I incurage you try!
#### [Clock Panel](https://grafana.net/plugins/grafana-clock-panel)
Support's both current time and count down mode.
-
+
#### [Pie Chart Panel](https://grafana.net/plugins/grafana-piechart-panel)
A simple pie chart panel is now available as an external plugin.
-
+
#### [WorldPing App](https://grafana.net/plugins/raintank-worldping-app)
This is full blown Grafana App that adds new panels, data sources and pages to give
feature rich global performance monitoring directly from your on-prem Grafana.
-
+
#### [Zabbix App](https://grafana.net/plugins/alexanderzobnin-zabbix-app)
This app contains the already very pouplar Zabbix data source plugin, 2 dashboards and a triggers panel. It is
created and maintained by [Alexander Zobnin](https://github.com/alexanderzobnin/grafana-zabbix).
-
+
Checkout the full list of plugins on [Grafana.net](https://grafana.net/plugins)
diff --git a/docs/sources/guides/whats-new-in-v4.md b/docs/sources/guides/whats-new-in-v4.md
new file mode 100644
index 00000000000..39b2437d054
--- /dev/null
+++ b/docs/sources/guides/whats-new-in-v4.md
@@ -0,0 +1,180 @@
++++
+title = "What's New in Grafana v4.0"
+description = "Feature & improvement highlights for Grafana v4.0"
+keywords = ["grafana", "new", "documentation", "4.0"]
+type = "docs"
+[menu.docs]
+name = "Version 4.0"
+identifier = "v4.0"
+parent = "whatsnew"
+weight = -1
++++
+
+# What's New in Grafana v4.0
+
+As usual this release contains a ton of minor new features, fixes and improved UX. But on top of the usual new goodies
+is a core new feature: Alerting! Read on below for a detailed description of what's new in v4.0.
+
+## Alerting
+
+{{< imgbox max-width="40%" img="/img/docs/v4/drag_handles_gif.gif" caption="Alerting overview" >}}
+
+Alerting is a really revolutionary feature for Grafana. It transforms Grafana from a
+visualization tool into a truly mission critical monitoring tool. The alert rules are very easy to
+configure using your existing graph panels and threshold levels can be set simply by dragging handles to
+the right side of the graph. The rules will continually be evaluated by grafana-server and
+notifications will be sent out when the rule conditions are met.
+
+This feature has been worked on for over a year with many iterations and rewrites
+just to make sure the foundations are really solid. We are really proud to finally release it!
+Since the alerting execution is processed in the backend all data source plugins are not supported.
+Right now Graphite, Prometheus, InfluxDB and OpenTSDB are supported. Elasticsearch is being worked
+on but will be not ready for v4 release.
+
+
+
+### Rules
+
+{{< imgbox max-width="40%" img="/img/docs/v4/alerting_conditions.png" caption="Alerting Conditions" >}}
+
+The rule config allows you to specify a name, how often the rule should be evaluated and a series
+of conditions that all need to be true for the alert to fire.
+
+Currently the only condition type that exists is a `Query` condition that allows you to
+specify a query letter, time range and an aggregation function. The letter refers to
+a query you already have added in the **Metrics** tab. The result from the
+query and the aggregation function is a single value that is then used in the threshold check.
+
+We plan to add other condition types in the future, like `Other Alert`, where you can include the state
+of another alert in your conditions, and `Time Of Day`.
+
+### Notifications
+
+{{< imgbox max-width="40%" img="/img/docs/v4/slack_notification.png" caption="Alerting Slack Notification" >}}
+
+Alerting would not be very useful if there was no way to send notifications when rules trigger and change state. You
+can setup notifications of different types. We currently have `Slack`, `PagerDuty`, `Email` and `Webhook` with more in the
+pipe that will be added during beta period. The notifications can then be added to your alert rules.
+If you have configured an external image store in the grafana.ini config file (s3 and webdav options available)
+you can get very rich notifications with an image of the graph and the metric
+values all included in the notification.
+
+### Annotations
+
+Alert state changes are recorded in a new annotation store that is built into Grafana. This store
+currently only supports storing annotations in Grafana's own internal database (mysql, postgres or sqlite).
+The Grafana annotation storage is currently only used for alert state changes but we hope to add the ability for users
+to add graph comments in the form of annotations directly from within Grafana in a future release.
+
+### Alert List Panel
+
+{{< imgbox max-width="30%" img="/img/docs/v4/alert_list_panel.png" caption="Alert List Panel" >}}
+
+This new panel allows you to show alert rules or a history of alert rule state changes. You can filter based on states your
+interested in. Very useful panel for overview style dashboards.
+
+
+
+## Ad-hoc filter variable
+
+{{< imgbox max-width="30%" img="/img/docs/v4/adhoc_filters.gif" caption="Ad-hoc filters variable" >}}
+
+This is a new and very different type of template variable. It will allow you to create new key/value filters on the fly.
+With autocomplete for both key and values. The filter condition will be automatically applied to all
+queries that use that data source. This feature opens up more exploratory dashboards. In the gif animation to the right
+you have a dashboard for Elasticsearch log data. It uses one query variable that allow you to quickly change how the data
+is grouped, and an interval variable for controlling the granularity of the time buckets. What was missing
+was a way to dynamically apply filters to the log query. With the `Ad-Hoc Filters` variable you can
+dynamically add filters to any log property!
+
+## UX Improvements
+
+We always try to bring some UX/UI refinements & polish in every release.
+
+### TV-mode & Kiosk mode
+
+
++ Grafana is so often used on wall mounted TVs that we figured a clean TV mode would be + really nice. In TV mode the top navbar, row & panel controls will all fade to transparent. +
+ +
+ This happens automatically after one minute of user inactivity but can also be toggled manually
+ with the d v sequence shortcut. Any mouse movement or keyboard action will
+ restore navbar & controls.
+
+ Another feature is the kiosk mode. This can be enabled with d k
+ shortcut or by adding &kiosk to the URL when you load a dashboard.
+ In kiosk mode the navbar is completely hidden/removed from view.
+
+
## Enabling app plugins
After installing an app it have to be enabled before it show up as an datasource or panel. You can do that on the app page in the config tab.
diff --git a/docs/sources/reference/annotations.md b/docs/sources/reference/annotations.md
index 26cb037fdfa..8f2170ba145 100644
--- a/docs/sources/reference/annotations.md
+++ b/docs/sources/reference/annotations.md
@@ -13,7 +13,7 @@ weight = 2
Annotations provide a way to mark points on the graph with rich events. When you hover over an annotation
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
dropdown. This will open the `Annotations` edit view. Click the `Add` tab to add a new annotation query.
@@ -28,7 +28,7 @@ Graphite supports two ways to query annotations.
- Graphite events query, use the `Graphite event tags` text input, specify an tag or wildcard (leave empty should also work)
## Elasticsearch annotations
-
+
Grafana can query any Elasticsearch index for annotation events. The index name can be the name of an alias or an index wildcard pattern.
You can leave the search query blank or specify a lucene query.
@@ -39,14 +39,14 @@ as the name for the fields that should be used for the annotation title, tags an
> **Note** The annotation timestamp field in elasticsearch need to be in UTC format.
## InfluxDB Annotations
-
+
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
-
+
Prometheus supports two ways to query annotations.
diff --git a/docs/sources/reference/dashlist.md b/docs/sources/reference/dashlist.md
index 9c5baa55b34..5377c7c1941 100644
--- a/docs/sources/reference/dashlist.md
+++ b/docs/sources/reference/dashlist.md
@@ -13,7 +13,7 @@ weight = 4
The dashboard list panel allows you to display dynamic links to other dashboards. The list can be configured to use starred dashboards, a search query and/or dashboard tags.
-
+
> On each dashboard load, the dashlist panel will re-query the dashboard list, always providing the most up to date results.
@@ -21,7 +21,7 @@ The dashboard list panel allows you to display dynamic links to other dashboards
The `starred` dashboard selection displays starred dashboards, up to the number specified in the `Limit Number to` field, in alphabetical order. On dashboard load, the dashlist panel will re-query the favorites to appear in dashboard list panel, always providing the most up to date results.
-
+
## Mode: Search Dashboards
@@ -42,11 +42,11 @@ Limit number to | Specify the maximum number of dashboards
### Search by string
To search by a string, enter a search query in the `Search Options: Query` field. Queries are case-insensitive, and partial values are accepted.
-
+
### Search by tag
To search by one or more tags, enter your selection in the `Search Options: Tags:` field. Note that existing tags will not appear as you type, and *are* case sensitive. To see a list of existing tags, you can always return to the dashboard, open the Dashboard Picker at the top and click `tags` link in the search bar.
-
+
> When multiple tags and strings appear, the dashboard list will display those matching ALL conditions.
diff --git a/docs/sources/reference/export_import.md b/docs/sources/reference/export_import.md
index a05ce2f0c6b..7430f4891a6 100644
--- a/docs/sources/reference/export_import.md
+++ b/docs/sources/reference/export_import.md
@@ -17,7 +17,7 @@ Dashboards are exported in Grafana JSON format, and contain everything you need
The export feature is accessed from the share menu.
-
+
### Making a dashboard portable
@@ -31,12 +31,12 @@ the dashboard, and will also be added as an required input when the dashboard is
To import a dashboard open dashboard search and then hit the import button.
-
+
From here you can upload a dashboard json file, paste a [Grafana.net](https://grafana.net) dashboard
url or paste dashboard json text directly into the text area.
-
+
In step 2 of the import process Grafana will let you change the name of the dashboard, pick what
data source you want the dashboard to use and specify any metric prefixes (if the dashboard use any).
@@ -45,7 +45,7 @@ data source you want the dashboard to use and specify any metric prefixes (if th
Find dashboads for common server applications at [Grafana.net/dashboards](https://grafana.net/dashboards).
-
+
## Import & Sharing with Grafana 2.x or 3.0
diff --git a/docs/sources/reference/graph.md b/docs/sources/reference/graph.md
index 62c42f78b92..bb4138b6a42 100644
--- a/docs/sources/reference/graph.md
+++ b/docs/sources/reference/graph.md
@@ -12,13 +12,13 @@ weight = 1
The main panel in Grafana is simply named Graph. It provides a very rich set of graphing options.
-
+
Clicking the title for a panel exposes a menu. The `edit` option opens additional configuration
options for the panel.
## General
-
+
The general tab allows customization of a panel's appearance and menu options.
@@ -56,7 +56,7 @@ options.
## Axes & Grid
-
+
The Axes & Grid tab controls the display of axes, grids and legend.
@@ -99,7 +99,7 @@ It is just the sum of all data points received by Grafana.
## Display styles
-
+
Display styles controls properties of the graph.
@@ -144,4 +144,4 @@ a thicker line width to make it standout.
## Time range
-
+
diff --git a/docs/sources/reference/keyboard_shortcuts.md b/docs/sources/reference/keyboard_shortcuts.md
index 96709dfb725..edd2e85f43b 100644
--- a/docs/sources/reference/keyboard_shortcuts.md
+++ b/docs/sources/reference/keyboard_shortcuts.md
@@ -15,7 +15,7 @@ No mouse? No problem. Grafana has extensive keyboard shortcuts to allow you to n
Press `Shift`+`?` to open the keyboard shortcut dialog from anywhere within the dashboard views.
-
+
|Shortcut|Action|
diff --git a/docs/sources/reference/search.md b/docs/sources/reference/search.md
index 04d317d38e0..9fc4d47893c 100644
--- a/docs/sources/reference/search.md
+++ b/docs/sources/reference/search.md
@@ -12,7 +12,7 @@ weight = 5
Dashboards can be searched by the dashboard name, filtered by one (or many) tags or filtered by starred status. The dashboard search is accessed through the dashboard picker, available in the dashboard top nav area.
-
+
1. `Dashboard Picker`: The Dashboard Picker is your primary navigation tool to move between dashboards. It is present on all dashboards, and open the Dashboard Search. The dashboard picker also doubles as the title of the current dashboard.
2. `Search Bar`: The search bar allows you to enter any string and search both database and file based dashboards in real-time.
@@ -23,7 +23,7 @@ When using only a keyboard, you can use your keyboard arrow keys to navigate the
## Find by dashboard name
-
+
To search and load dashboards click the open folder icon in the header or use the shortcut `CTRL`+`F`. Begin typing any part of the desired dashboard names. Search will return results for for any partial string match in real-time, as you type.
@@ -38,11 +38,11 @@ Tags are a great way to organize your dashboards, especially as the number of da
To filter the dashboard list by tag, click on any tag appearing in the right column. The list may be further filtered by clicking on additional tags:
-
+
Alternately, to see a list of all available tags, click the tags link in the search bar. All tags will be shown, and when a tag is selected, the dashboard search will be instantly filtered:
-
+
When using only a keyboard: `tab` to focus on the *tags* link, `▼` down arrow key to find a tag and select with the `Enter` key.
@@ -53,6 +53,6 @@ When using only a keyboard: `tab` to focus on the *tags* link, `▼` down arrow
Starring is a great way to organize and find commonly used dashboards. To show only starred dashboards in the list, click the *starred* link in the search bar:
-
+
When using only a keyboard: `tab` to focus on the *stars* link, `▼` down arrow key to find a tag and select with the `Enter` key.
diff --git a/docs/sources/reference/sharing.md b/docs/sources/reference/sharing.md
index 08bfcf4c9d1..5210b2811df 100644
--- a/docs/sources/reference/sharing.md
+++ b/docs/sources/reference/sharing.md
@@ -22,7 +22,7 @@ A dashboard snapshot is an instant way to share an interactive dashboard publicl
(metric, template and annotation) and panel links, leaving only the visible metric data and series names embedded into your dashboard. Dashboard
snapshots can be accessed by anyone who has the link and can reach the URL.
-
+
### Publish snapshots
You can publish snapshots to you local instance or to [snapshot.raintank.io](http://snapshot.raintank.io). The later is a free service
diff --git a/docs/sources/reference/singlestat.md b/docs/sources/reference/singlestat.md
index 8c6cdc6c727..3e84ee84aff 100644
--- a/docs/sources/reference/singlestat.md
+++ b/docs/sources/reference/singlestat.md
@@ -11,7 +11,7 @@ weight = 2
# Singlestat Panel
-
+
The Singlestat Panel allows you to show the one main summary stat of a SINGLE series. It reduces the series into a single number (by looking at the max, min, average, or sum of values in the series). Singlestat also provides thresholds to color the stat or the Panel background. It can also translate the single number into a text value, and show a sparkline summary of the series.
@@ -19,7 +19,7 @@ The Singlestat Panel allows you to show the one main summary stat of a SINGLE se
The singlestat panel has a normal query editor to allow you define your exact metric queries like many other Panels. Through the Options tab, you can access the Singlestat-specific functionality.
-
+
1. `Big Value`: Big Value refers to how we display the main stat for the Singlestat Panel. This is always a single value that is displayed in the Panel in between two strings, `Prefix` and `Suffix`. The single number is calculated by choosing a function (min,max,average,current,total) of your metric query. This functions reduces your query into a single numeric value.
2. `Font Size`: You can use this section to select the font size of the different texts in the Singlestat Panel, i.e. prefix, value and postfix.
@@ -32,19 +32,19 @@ The singlestat panel has a normal query editor to allow you define your exact me
The coloring options of the Singlestat Panel config allow you to dynamically change the colors based on the Singlestat value.
-
+
1. `Background`: This checkbox applies the configured thresholds and colors to the entirety of the Singlestat Panel background.
2. `Value`: This checkbox applies the configured thresholds and colors to the summary stat.
3. `Thresholds`: Change the background and value colors dynamically within the panel, depending on the Singlestat value. The threshold field accepts **2 comma-separated** values which represent 3 ranges that correspond to the three colors directly to the right. For example: if the thresholds are 70, 90 then the first color represents < 70, the second color represents between 70 and 90 and the third color represents > 90.
4. `Colors`: Select a color and opacity
-5. `Invert order`: This link toggles the threshold color order.For example: Green, Orange, Red (
) will become Red, Orange, Green (
).
+5. `Invert order`: This link toggles the threshold color order.For example: Green, Orange, Red (
) will become Red, Orange, Green (
).
### Spark Lines
Sparklines are a great way of seeing the historical data related to the summary stat, providing valuable context at a glance. Sparklines act differently than traditional Graph Panels and do not include x or y axis, coordinates, a legend, or ability to interact with the graph.
-
+
1. `Show`: The show checkbox will toggle whether the spark line is shown in the Panel. When unselected, only the Singlestat value will appear.
2. `Background`: Check if you want the sparklines to take up the full panel width, or uncheck if they should be below the main Singlestat value.
@@ -57,13 +57,13 @@ Sparklines are a great way of seeing the historical data related to the summary
Value to text mapping allows you to translate the value of the summary stat into explicit text. The text will respect all styling, thresholds and customization defined for the value. This can be useful to translate the number of the main Singlestat value into a context-specific human-readable word or message.
-
+
## Troubleshooting
### Multiple Series Error
-
+
Grafana 2.5 introduced stricter checking for multiple-series on singlestat panels. In previous versions, the panel logic did not verify that only a single series was used, and instead, displayed the first series encountered. Depending on your data source, this could have lead to inconsistent data being shown and/or a general confusion about which metric was being displayed.
diff --git a/docs/sources/reference/table_panel.md b/docs/sources/reference/table_panel.md
index 616909c86e2..249886e1f57 100644
--- a/docs/sources/reference/table_panel.md
+++ b/docs/sources/reference/table_panel.md
@@ -11,7 +11,7 @@ weight = 2
# Table Panel
-
+
The new table panel is very flexible, supporting both multiple modes for time series as well as for
table, annotation and raw JSON data. It also provides date formatting and value formatting and coloring options.
@@ -22,7 +22,7 @@ To view table panels in action and test different configurations with sample dat
The table panel has many ways to manipulate your data for optimal presentation.
-
+
1. `Data`: Control how your query is transformed into a table.
2. `Table Display`: Table display options.
@@ -30,7 +30,7 @@ The table panel has many ways to manipulate your data for optimal presentation.
## Data to Table
-
+
The data section contains the **To Table Transform (1)**. This is the primary option for how your data/metric
query should be transformed into a table format. The **Columns (2)** option allows you to select what columns
@@ -38,38 +38,38 @@ you want in the table. Only applicable for some transforms.
### Time series to rows
-
+
In the most simple mode you can turn time series to rows. This means you get a `Time`, `Metric` and a `Value` column. Where `Metric` is the name of the time series.
### Time series to columns
-
+
This transform allows you to take multiple time series and group them by time. Which will result in the primary column being `Time` and a column for each time series.
### Time series aggregations
-
+
This table transformation will lay out your table into rows by metric, allowing columns of `Avg`, `Min`, `Max`, `Total`, `Current` and `Count`. More than one column can be added.
### Annotations
-
+
If you have annotations enabled in the dashboard you can have the table show them. If you configure this
mode then any queries you have in the metrics tab will be ignored.
### JSON Data
-
+
If you have an Elasticsearch **Raw Document** query or an Elasticsearch query without a `date histogram` use this
transform mode and pick the columns using the **Columns** section.
-
+
## Table Display
-
+
1. `Pagination (Page Size)`: The table display fields allow you to control The `Pagination` (page size) is the threshold at which the table rows will be broken into pages. For example, if your table had 95 records with a pagination value of 10, your table would be split across 9 pages.
2. `Scroll`: The `scroll bar` checkbox toggles the ability to scroll within the panel, when unchecked, the panel height will grow to display all rows.
@@ -80,7 +80,7 @@ transform mode and pick the columns using the **Columns** section.
The column styles allow you control how dates and numbers are formatted.
-
+
1. `Name or regex`: The Name or Regex field controls what columns the rule should be applied to. The regex or name filter will be matched against the column name not against column values.
2. `Type`: The three supported types of types are `Number`, `String` and `Date`.
diff --git a/docs/sources/reference/templating.md b/docs/sources/reference/templating.md
index 2ca8b47b9f9..636cc62a0c8 100644
--- a/docs/sources/reference/templating.md
+++ b/docs/sources/reference/templating.md
@@ -10,7 +10,7 @@ weight = 1
# Templating
-
+
Dashboard Templating allows you to make your Dashboards more interactive and dynamic.
@@ -49,7 +49,7 @@ For example, if you were using Templating to list all 20 of your applications, y
> Note: Multi-Select Tagging functionality is currently experimental but is part of Grafana 2.1. To enable this feature click the enable icon when editing Template options for a particular variable.
-
+
Grafana gets the list of tags and the list of values in each tag by performing two queries on your metric namespace.
@@ -61,13 +61,13 @@ Note: a proof of concept shim that translates the metric query into a SQL call i
Once configured, Multi-Select Tagging provides a convenient way to group and your template variables, and slice your data in the exact way you want. The Tags can be seen on the right side of the template pull-down.
-
+
### Interval
Use the `Interval` type to create Template variables around time ranges (eg. `1m`,`1h`, `1d`). There is also a special `auto` option that will change depending on the current time range, you can specify how many times the current time range should be divided to calculate the current `auto` range.
-
+
### Custom
diff --git a/docs/sources/reference/timerange.md b/docs/sources/reference/timerange.md
index 0063a0ee361..a4d6fc62336 100644
--- a/docs/sources/reference/timerange.md
+++ b/docs/sources/reference/timerange.md
@@ -13,7 +13,7 @@ weight = 7
Grafana provides numerous ways to manage the time ranges of the data being visualized, both at the Dashboard-level and the Panel-level.
-
+
In the top right, you have the master Dashboard time picker (it's in between the 'Zoom out' and the 'Refresh' links).
@@ -43,7 +43,7 @@ Previous Month | `now-1M/M` | `now-1M/M`
There are two settings available from the Dashboard Settings area, allowing customization of the auto-refresh intervals and the definition of `now`.
-
+
### Auto-Refresh Options
@@ -59,11 +59,11 @@ Users often ask, [when will then be now](https://www.youtube.com/watch?v=VeZ9HhH
You can override the relative time range for individual panels, causing them to be different than what is selected in the Dashboard time picker in the upper right. This allows you to show metrics from different time periods or days at the same time.
-
+
You control these overrides in panel editor mode and the tab `Time Range`.
-
+
When you zoom or change the Dashboard time to a custom absolute time range, all panel overrides will be disabled. The panel relative time override is only active when the dashboard time is also relative. The panel timeshift override is always active, even when the dashboard time is absolute.
diff --git a/docs/sources/tutorials/hubot_howto.md b/docs/sources/tutorials/hubot_howto.md
index 2478e0569f0..17658fbaecd 100644
--- a/docs/sources/tutorials/hubot_howto.md
+++ b/docs/sources/tutorials/hubot_howto.md
@@ -22,7 +22,7 @@ take you to the graph.
> is so Hipchat and Slack can show them reliably (they require the image to be publicly available).
+
+
You need to set the environment variable `HUBOT_GRAFANA_API_KEY` to a Grafana API Key.
You can add these from the API Keys page which you find in the Organization dropdown.
@@ -115,7 +115,7 @@ Now you can add an alias like this:
+ 