diff --git a/docs/sources/guides/screencasts.md b/docs/sources/guides/screencasts.md index 206214e48c1..6c08e55b4b9 100644 --- a/docs/sources/guides/screencasts.md +++ b/docs/sources/guides/screencasts.md @@ -7,16 +7,16 @@ no_toc: true
-

Episode 1 - Building Graphite Queries

- This tutorial discusses how the Graphite query editor works, how to use different graphing functions and when use when to use certain graph display settings -
+

Episode 1 - Building Graphite Queries

+ Learn how the Graphite query editor works, how to use different graphing functions and when use when to use certain graph display settings. +
-

Episode 2 - Templated Graphite Queries

+

Episode 2 - Templated Graphite Queries

The screencast focuses on templating in Graphite and how to make reusable and adaptable dashboards for various data sources and metrics. -
+
@@ -24,16 +24,16 @@ no_toc: true
-

Episode 3 - Whats New In Grafana 2.0

+

Episode 3 - Whats New In Grafana 2.0

This screencast highlights many of the great new features that were included in the Grafana 2.0 release. -
+
-

Episode 4 - Installation & Configuration on Ubuntu / Debian

+

Episode 4 - Installation & Configuration on Ubuntu / Debian

Shows how to easily install the dependcies and packages to get Grafana 2.0 up and running on Ubuntu or Debian in just a few mintues. -
+
@@ -41,16 +41,16 @@ no_toc: true
-

Episode 5 - Installation & Configuration on Redhat / Centos

+

Episode 5 - Installation & Configuration on Redhat / Centos

This screencasts shows how to get Grafana 2.0 installed and configured quickly on RPM based Linux operating systems. -
+
-

Episode 6 - Adding data sources, users & organizations

+

Episode 6 - Adding data sources, users & organizations

Now that Grafana has been installed, learn about adding data sources and get a closer look at adding and managing users and organizations. -
+
@@ -58,9 +58,9 @@ no_toc: true
-

Episode 7 - Beginners guide to building dashboards

+

Episode 7 - Beginners guide to building dashboards

For newer users of Grafana, this screencast will familiarize you with the general UI and teach you how to build your first dashboard. -
+
diff --git a/docs/sources/reference/annotations.md b/docs/sources/reference/annotations.md index b0e84ef762b..51852abcdf2 100644 --- a/docs/sources/reference/annotations.md +++ b/docs/sources/reference/annotations.md @@ -5,14 +5,17 @@ page_keywords: grafana, annotations, guide, documentation --- # Annotations -![](/img/v1/annotated_graph1.png) 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. +![](/img/v1/annotated_graph1.png) + 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. +> Note: Annotations apply to all graphs in a given dashboard, not on a per-panel basis. + ## Graphite annotations Graphite supports two ways to query annotations. diff --git a/docs/sources/reference/templating.md b/docs/sources/reference/templating.md index 7e004a9c6e5..838b8ced717 100644 --- a/docs/sources/reference/templating.md +++ b/docs/sources/reference/templating.md @@ -29,23 +29,24 @@ They can all be used to create dynamic variables that you can use throughout the > Note: The Query type is Data Source specific. Please consult the appropriate documentation for your particular Data Source. -This is the most common type of Template variable. Use the `Query` template type to generate a dynamic list of variables, simply by allowing Grafana to explore your Data Source metric namespace when the Dashboard loads. +Query is the most common type of Template variable. Use the `Query` template type to generate a dynamic list of variables, simply by allowing Grafana to explore your Data Source metric namespace when the Dashboard loads. -For example a query like prod.servers.* will fill the variable with all possible values that exists in that wildcard position (in the case of the Graphite Data Source). +For example a query like `prod.servers.*` will fill the variable with all possible values that exists in that wildcard position (in the case of the Graphite Data Source). -You can even create nested variables that use other variables in their definition. For example apps.$app.servers.* uses the variable $app in its own query definition. +You can even create nested variables that use other variables in their definition. For example `apps.$app.servers.*` uses the variable $app in its own query definition. -You can utilize the special "All" value to allow the Dashboard user to query for every single Query variable returned. Grafana will automatically translate All into the appropriate format for your Data Source. +You can utilize the special ** All ** value to allow the Dashboard user to query for every single Query variable returned. Grafana will automatically translate ** All ** into the appropriate format for your Data Source. +#### Multi-select As of Grafana 2.1, it is now possible to select a subset of Query Template variables (previously it was possible to select an individual value or 'All', not multiple values that were less than All). This is accomplished via the Multi-Select option. If enabled, the Dashboard user will be able to enable and disable individual variables. The Multi-Select functionality is taken a step further with the introduction of Multi-Select Tagging. This functionality allows you to group individual Template variables together under a Tag or Group name. For example, if you were using Templating to list all 20 of your applications, you could use Multi-Select Tagging to group your applications by function or region or criticality, etc. -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. + > 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. -[[screenshot of just the tag/group part, enabled, with the 2 queries shown]] +![](/img/v2/tag_groups.jpg) Grafana gets the list of tags and the list of values in each tag by performing two queries on your metric namespace. @@ -59,6 +60,7 @@ Once configured, Multi-Select Tagging provides a convenient way to group and you ![](/img/v2/multi-select.gif) + ### Interval Use the `Interval` type to create Template variables aroundr 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.