Merge remote-tracking branch 'grafana/master' into influx-db-query2

CHANGELOG.md

@@ -8,6 +8,8 @@
 * **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur)
 * **Graph**: Support for histograms [#600](https://github.com/grafana/grafana/issues/600)
 * **Prometheus**: Support table response formats (column per label) [#6140](https://github.com/grafana/grafana/issues/6140), thx [@mtanda](https://github.com/mtanda)
+* **Single Stat Panel**: support for non time series data [#6564](https://github.com/grafana/grafana/issues/6564)
+
 
 ## Minor Enchancements
 

docs/sources/features/datasources/elasticsearch.md

@@ -89,7 +89,21 @@ The Elasticsearch datasource supports two types of queries you can use to fill t
 {"find": "fields", "type": "string", "query": <lucene query>}
 ```
 
-### Multi format / All format
+<br>
-Use lucene format.
+## Annotations
+
+[Annotations]({{< relref "reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+queries via the Dashboard menu / Annotations view. Grafana can query any Elasticsearch index
+for annotation events.
+
+Name | Description
+------------ | -------------
+Query | You can leave the search query blank or specify a lucene query
+Time | The name of the time field, needs to be date field.
+Title | The name of field to use for the event title.
+Tags | Optional field name to use for event tags (can be array or csv string).
+Text | Optional field name to use event text body.
+
+
 
 

docs/sources/features/datasources/graphite.md

@@ -63,6 +63,10 @@ Some functions like aliasByNode support an optional second argument. To add this
 
 ![](/img/docs/animated_gifs/func_editor_optional_params.gif)
 
+### Nested Queries
+
+You can reference queries by the row “letter” that they’re on (similar to  Microsoft Excel). If you add a second query to graph, you can reference the first query simply by typing in #A. This provides an easy and convenient way to build compounded queries.
+
 ## 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
@@ -83,6 +87,12 @@ You can also create nested variables that use other variables in their definitio
 
 ![](/img/docs/v2/templated_variable_parameter.png)
 
+## Annotations
+
+[Annotations]({{< relref "reference/annotations.md" >}}) allows 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,
+specify an tag or wildcard (leave empty should also work)
+
 
-## Query Reference
-You can reference queries by the row “letter” that they’re on (similar to  Microsoft Excel). If you add a second query to graph, you can reference the first query simply by typing in #A. This provides an easy and convenient way to build compounded queries.

docs/sources/features/datasources/influxdb.md

@@ -121,7 +121,9 @@ SHOW TAG VALUES WITH KEY = "hostname"  WHERE region =~ /$region/
 ![](/img/docs/influxdb/templating_simple_ex1.png)
 
 ## Annotations
-Annotations allows you to overlay rich event information on top of graphs.
+
+[Annotations]({{< relref "reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+queries via the Dashboard menu / Annotations view.
 
 An example query:
 
@@ -129,4 +131,8 @@ An example query:
 SELECT title, description from events WHERE $timeFilter order asc
 ```
 
+For InfluxDB you need to enter a query like in the above example. 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. The
+Tags field can be a comma seperated string.
+
 

docs/sources/features/datasources/prometheus.md

@@ -81,3 +81,15 @@ When the `Include All` option or `Multi-Value` option is enabled, Grafana conver
 Which means you have to use `=~` instead of `=` in your Prometheus queries. For example `ALERTS{instance=~$instance}` instead of `ALERTS{instance=$instance}`.
 
 ![](/img/docs/v2/prometheus_templating.png)
+
+## Annotations
+
+[Annotations]({{< relref "reference/annotations.md" >}}) allows you to overlay rich event information on top of graphs. You add annotation
+queries via the Dashboard menu / Annotations view.
+
+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))
+
+The step option is useful to limit the number of events returned from your query.

docs/sources/installation/configuration.md

@@ -229,6 +229,10 @@ Used for signing keep me logged in / remember me cookies.
 Set to `true` to disable the use of Gravatar for user profile images.
 Default is `false`.
 
+### data_source_proxy_whitelist
+
+Define a white list of allowed ips/domains to use in data sources. Format: `ip_or_domain:port` separated by spaces
+
 <hr />
 
 ## [users]

docs/sources/installation/debian.md

@@ -17,6 +17,9 @@ Description | Download
 ------------ | -------------
 Stable for Debian-based Linux | [4.2.0 (x86-64 deb)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.2.0_amd64.deb)
 
+Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
+installation.
+
 ## Install Stable
 
 ```

docs/sources/installation/migrating_to2.md

@@ -3,9 +3,6 @@ title = "Migrating from older versions"
 description = "Upgrading & Migrating Grafana from older versions"
 keywords = ["grafana", "configuration", "documentation", "migration"]
 type = "docs"
-[menu.docs]
-parent = "installation"
-weight = 10
 +++
 
 # Migrating from older versions

docs/sources/installation/provisioning.md

@@ -1,34 +0,0 @@
-+++
-title = "Installing via provisioning tools"
-description = "Guide to install Grafana via provisioning tools like puppet & chef"
-keywords = ["grafana", "provisioning", "documentation", "puppet", "chef", "ansible"]
-type = "docs"
-aliases = ["docs/provisioning"]
-[menu.docs]
-parent = "installation"
-weight = 8
-+++
-
-
-# Installing via provisioning tools
-
-Here are links for how to install Grafana (and some include Graphite or
-InfluxDB as well) via a provisioning system. These are not maintained by
-any core Grafana team member and might be out of date.
-
-### Puppet
-
-* [forge.puppetlabs.com/bfraser/grafana](https://forge.puppetlabs.com/bfraser/grafana)
-
-### Ansible
-
-* [github.com/picotrading/ansible-grafana](https://github.com/picotrading/ansible-grafana)
-
-### Docker
-* [github.com/grafana/grafana-docker](https://github.com/grafana/grafana-docker)
-
-### Chef
-
-* [github.com/JonathanTron/chef-grafana](https://github.com/JonathanTron/chef-grafana)
-* [github.com/Nordstrom/grafana2-cookbook](https://github.com/Nordstrom/grafana2-cookbook)
-

docs/sources/installation/rpm.md

@@ -17,6 +17,9 @@ Description | Download
 ------------ | -------------
 Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.2.0 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0-1.x86_64.rpm)
 
+Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
+installation.
+
 ## Install Stable
 
 You can install Grafana using Yum directly.

docs/sources/installation/troubleshooting.md

@@ -11,48 +11,24 @@ weight = 8
 
 # Troubleshooting
 
-This page is dedicated to helping you solve any problem you have getting
+## visualization & query issues
-Grafana to work. Please review it before opening a new [GitHub
-issue](https://github.com/grafana/grafana/issues/new) or asking a
-question in the `#grafana` IRC channel on freenode.
 
-## General connection issues
+The most common problems are related to the query & response from you data source. Even if it looks
+like a bug or visualization issue in Grafana it is 99% of time a problem with the data source query or
+the data source response.
 
-When setting up Grafana for the first time you might experience issues
+So make sure to check the query sent and the raw response, learn how in this guide: [How to troubleshoot metric query issues](https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50)
-with Grafana being unable to query Graphite, OpenTSDB or InfluxDB.  You
-might not be able to get metric name completion or the graph might show
-an error like this:
 
-![](/img/docs/v1/graph_timestore_error.png)
+## Logging
 
-For some types of errors, the `View details` link will show you error
+If you encounter an error or problem it is a good idea to check the grafana server log. Usually
-details. For many types of HTTP connection errors, however, there is very
+located at `/var/log/grafana/grafana.log` on unix systems or in `<grafana_install_dir>/data/log` on
-little information. The best way to troubleshoot these issues is use
+other platforms & manual installs.
-the [Chrome developer tools](https://developer.chrome.com/devtools/index).
-By pressing `F12` you can bring up the chrome dev tools.
 
-![](/img/docs/v1/toubleshooting_chrome_dev_tools.png)
+You can enable more logging by changing log level in you grafana configuration file.
 
-There are two important tabs in the Chrome developer tools: `Network`
+## FAQ
-and `Console`. The `Console` tab will show you Javascript errors and
-HTTP request errors. In the Network tab you will be able to identify the
-request that failed and review request and response parameters. This
-information will be of great help in finding the cause of the error.
 
-If you are unable to solve the issue, even after reading the remainder
+Checkout the [FAQ](https://community.grafana.com/c/howto/faq) section on our community page for frequently
-of this troubleshooting guide, you should open a [GitHub support
+asked questions.
-issue](https://github.com/grafana/grafana/issues).  Before you do that
-please search the existing closed or open issues. Also if you need to
-create a support issue, screen shots and or text information about the
-chrome console error, request and response information from the
-`Network` tab in Chrome developer tools are of great help.
-
-### Inspecting Grafana metric requests
-
-![](/img/docs/v1/toubleshooting_chrome_dev_tools_network.png)
-
-After opening the Chrome developer tools for the first time the
-`Network` tab is empty. You will need to refresh the page to get
-requests to show.  For some type of errors, especially CORS-related,
-there might not be a response at all.
 

docs/sources/installation/upgrading.md

@@ -0,0 +1,103 @@
++++
+title = "Upgrading"
+description = "Upgrading Grafana guide"
+keywords = ["grafana", "configuration", "documentation", "upgrade"]
+type = "docs"
+[menu.docs]
+name = "Upgrading"
+identifier = "upgrading"
+parent = "installation"
+weight = 10
++++
+
+# Upgrading Grafana
+
+We recommend everyone to upgrade Grafana often to stay up to date with the latest fixes and enhancements.
+In order make this a reality Grafana upgrades are backward compatible and the upgrade process is simple & quick.
+
+Upgrading is generally always safe (between many minor and one major version) and dashboards and graphs will look the same. There can be minor breaking changes in some edge cases which are usually outlined in the [Release Notes](https://community.grafana.com/c/releases) and [Changelog](https://github.com/grafana/grafana/blob/master/CHANGELOG.md)
+
+## Database Backup
+
+Before upgrading it can be a good idea to backup your Grafana database. This will ensure that you can always rollback to your previous version. During startup, Grafana will automatically migrate the database schema (if there are changes or new tables). Sometimes this can cause issues if you later want to downgrade.
+
+#### sqlite
+
+If you use sqlite you only need to make a backup of you `grafana.db` file. This is usually located at `/var/lib/grafana/grafana.db` on unix system.
+If you are unsure what database you use and where it is stored check you grafana configuration file. If you
+installed grafana to custom location using a binary tar/zip it is usally in `<grafana_install_dir>/data`.
+
+#### mysql
+
+```
+backup:
+> mysqldump -u root -p[root_password] [grafana] > grafana_backup.sql
+
+restore:
+> mysql -u root -p grafana < grafana_backup.sql
+```
+
+#### postgres
+
+```
+backup:
+> pg_dump grafana > grafana_backup
+
+restore:
+> psql grafana < grafana_backup
+```
+
+### Ubuntu / Debian
+
+If you installed grafana by downloading a debian package (`.deb`) you can just follow the same installation guide
+and execute the same `dpkg -i` command but with the new package. It will upgrade your Grafana install.
+
+If you used our APT repository:
+
+```
+sudo apt-get update
+sudo apt-get install grafana
+```
+
+#### Upgrading from binary tar file
+
+If you downloaded the binary tar package you can just download and extract a new package
+and overwrite all your existing files. But this might overwrite your config changes. We
+recommend you place your config changes in a file named  `<grafana_install_dir>/conf/custom.ini`
+as this will make upgrades easier without risking losing your config changes.
+
+### Centos / RHEL
+
+If you installed grafana by downloading a rpm package you can just follow the same installation guide
+and execute the same `yum install` or `rpm -i` command but with the new package. It will upgrade your Grafana install.
+
+If you used our YUM repository:
+
+```
+sudo yum update grafana
+```
+
+### Docker
+
+This just an example, details depend on how you configured your grafana container.
+```
+docker pull grafana
+docker stop my-grafana-container
+docker rm my-grafana-container
+docker run --name=my-grafana-container --restart=always -v /var/lib/grafana:/var/lib/grafana
+```
+
+### Windows
+
+If you downloaded the windows binary package you can just download a newer package and extract
+to the same location (and overwrite the existing files). This might overwrite your config changes. We
+recommend you place your config changes in a file named  `<grafana_install_dir>/conf/custom.ini`
+as this will make upgrades easier without risking losing your config changes.
+
+## Upgrading form 1.x
+
+[Migrating from 1.x to 2.x]({{< relref "installation/migrating_to2.md" >}})
+
+## Upgrading form 2.x
+
+We are not aware of any issues upgrading directly from 2.x to 4.x but to on the safe side go via 3.x.

docs/sources/installation/windows.md

@@ -15,6 +15,9 @@ Description | Download
 ------------ | -------------
 Latest stable package for Windows | [grafana.4.2.0.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-4.2.0.windows-x64.zip)
 
+Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
+installation.
+
 ## Configure
 
 The zip file contains a folder with the current Grafana version. Extract

docs/sources/reference/annotations.md

@@ -13,42 +13,28 @@ 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.
 
-![](/img/docs/v1/annotated_graph1.png)
+![](/img/docs/annotations/toggles.png)
 
-To add an annotation query click dashboard settings icon in top menu and select `Annotations` from the
+## Queries
-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.
+Annotatation events are fetched via annotation queries. To add a new annotation query to a dashboard
+open the dashboard settings menu, then select `Annotations`. This will open the dashboard annotations
+settings view. To create a new annotation query hit the `New` button.
 
-## Graphite annotations
+![](/img/docs/annotations/new_query.png)
 
-Graphite supports two ways to query annotations.
+Specify a name for the annotation query. This name is given to the toggle (checkbox) that will allow
+you to enable/disable showing annotation events from this query. For example you might have two
+annotation queries named `Deploys` and `Outages`. The toggles will allow you to decide what annotations
+to show.
 
-- A regular metric query, use the `Graphite target expression` text input for this
+### Annotation query details
-- Graphite events query, use the `Graphite event tags` text input, specify an tag or wildcard (leave empty should also work)
 
-## Elasticsearch annotations
+The annotation query options are different for each data source.
-![](/img/docs/v2/annotations_es.png)
 
-Grafana can query any Elasticsearch index for annotation events. The index name can be the name of an alias or an index wildcard pattern.
+- [Graphite annotation queries]({{< relref "features/datasources/graphite.md#annotations" >}})
-You can leave the search query blank or specify a lucene query.
+- [Elasticsearch annotation queries]({{< relref "features/datasources/elasticsearch.md#annotations" >}})
+- [InfluxDB annotation queries]({{< relref "features/datasources/influxdb.md#annotations" >}})
+- [Prometheus annotation queries]({{< relref "features/datasources/prometheus.md#annotations" >}})
 
-If your elasticsearch document has a timestamp field other than `@timestamp` you will need to specify that. As well
-as the name for the fields that should be used for the annotation title, tags and text. Tags and text are optional.
 
-> **Note** The annotation timestamp field in elasticsearch need to be in UTC format.
-
-## InfluxDB Annotations
-![](/img/docs/v2/annotations_influxdb.png)
-
-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/docs/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))

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.
 
-![](/img/docs/v2/dashboard_snapshot_dialog.png)
+![](/img/docs/v4/share_panel_modal.png)
 
 ### 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
@@ -42,8 +42,8 @@ You can embed a panel using an iframe on another web site. This tab will show yo
 Example:
 
 ```html
-<iframe src="http://snapshot.raintank.io/dashboard/solo/snapshot/UtvRYDv650fHOV2jV5QlAQhLnNOhB5ZN?panelId=4&fullscreen&from=1427385145990&to=1427388745990" width="650" height="300" frameborder="0"></iframe>
+<iframe src="https://snapshot.raintank.io/dashboard-solo/snapshot/y7zwi2bZ7FcoTlB93WN7yWO4aMiz3pZb?from=1493369923321&to=1493377123321&panelId=4" width="650" height="300" frameborder="0"></iframe>
 ```
 
 Below there should be an interactive Grafana graph embedded in an iframe:
-<iframe src="https://snapshot.raintank.io/dashboard-solo/snapshot/4IKyWYNEQll1B9FXcN3RIgx4M2VGgU8d?panelId=4&fullscreen" width="650" height="300" frameborder="0"></iframe>
+<iframe src="https://snapshot.raintank.io/dashboard-solo/snapshot/y7zwi2bZ7FcoTlB93WN7yWO4aMiz3pZb?from=1493369923321&to=1493377123321&panelId=4" width="650" height="300" frameborder="0"></iframe>

docs/sources/tutorials/screencasts.md

@@ -9,58 +9,116 @@ weight = 10
 
 # Screencasts
 
-
+<div class="video-card-container">
-{{< screencast src="https://www.youtube.com/embed/sKNZMtoSHN4?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+  <figure class="video-card">
-
+    <a href="https://youtu.be/iUj6DwfBh88?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-### Episode 7 - Beginners guide to building dashboards
+      <img src="/img/docs/v4/screencast_generic.png">
-
+      <i class="fa fa-play"></i>
-For newer users of Grafana, this screencast will familiarize you with the general UI and teach you how to build your first Dashboard.
+    </a>
-
+    <figcaption>
-<div class="clearfix"></div>
+       <a href="https://youtu.be/iUj6DwfBh88?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-
+        #10 Dashboard Discovery & Sharing
-{{< screencast src="https://www.youtube.com/embed/9ZCMVNxUf6s?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+       </a>
-
+    </figcaption>
-### Episode 6 - Adding data sources, users & organizations
+  </figure>
-
+  <figure class="video-card">
-Now that Grafana has been installed, learn about adding data sources and get a closer look at adding and managing Users and Organizations.
+    <a href="https://youtu.be/d6KicssNzxM?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-
+      <img src="/img/docs/v4/screencast_generic.png">
-<div class="clearfix"></div>
+      <i class="fa fa-play"></i>
-
+    </a>
-{{< screencast src="https://www.youtube.com/embed/E-gMFv85FE8?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+    <figcaption>
-
+       <a href="https://youtu.be/d6KicssNzxM?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-### Episode 5 - Installation & Configuration on Red Hat / CentOS
+        #9 Using Elasticsearch in Grafana
-
+       </a>
-This screencasts shows how to get Grafana 2.0 installed and configured quickly on RPM-based Linux operating systems.
+    </figcaption>
-
+  </figure>
-<div class="clearfix"></div>
+  <figure class="video-card">
-{{< screencast src="https://www.youtube.com/embed/JY22EBOR9hQ?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+    <a href="https://youtu.be/1kJyQKgk_oY?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-
+      <img src="/img/docs/v4/screencast_generic.png">
-### Episode 4 - Installation & Configuration on Ubuntu / Debian
+      <i class="fa fa-play"></i>
-
+    </a>
-Learn how to easily install the dependencies and packages to get Grafana 2.0 up and running on Ubuntu or Debian in just a few minutes.
+    <figcaption>
-
+       <a href="https://youtu.be/1kJyQKgk_oY?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-<div class="clearfix"></div>
+        #8 What's new in Grafana 3.0
-
+       </a>
-{{< screencast src="https://www.youtube.com/embed/FC13uhFRsVw?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+    </figcaption>
-
+  </figure>
-### Episode 3 - Whats New In Grafana 2.0
+  <figure class="video-card">
-
+    <a href="https://youtu.be/sKNZMtoSHN4?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-This screencast highlights many of the great new features that were included in the Grafana 2.0 release.
+      <img src="/img/docs/v4/screencast_generic.png">
-
+      <i class="fa fa-play"></i>
-<div class="clearfix"></div>
+    </a>
-
+    <figcaption>
-{{< screencast src="//www.youtube.com/embed/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+       <a href="https://youtu.be/sKNZMtoSHN4?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-### Episode 2 - Templated Graphite Queries
+        #7 Beginners guide to building dashboards
-
+       </a>
-The screencast focuses on Templating with the Graphite Data Source. Learn how to make dynamic and adaptable Dashboards for your Graphite metrics.
+    </figcaption>
-
+  </figure>
-<div class="clearfix"></div>
+  <figure class="video-card">
-
+    <a href="https://youtu.be/9ZCMVNxUf6s?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-{{< screencast src="//www.youtube.com/embed/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" >}}
+      <img src="/img/docs/v4/screencast_generic.png">
-### Episode 1 - Building Graphite Queries
+      <i class="fa fa-play"></i>
-
+    </a>
-Learn how the Graphite Query Editor works, and how to use different graphing functions. There's also an introduction to graph display settings.
+    <figcaption>
-
+       <a href="https://youtu.be/9ZCMVNxUf6s?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
-<div class="clearfix"></div>
+        #6 Adding data sources, users & orgs.
-
+       </a>
+    </figcaption>
+  </figure>
+  <figure class="video-card">
+    <a href="https://youtu.be/E-gMFv84FE8?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+      <img src="/img/docs/v4/screencast_generic.png">
+      <i class="fa fa-play"></i>
+    </a>
+    <figcaption>
+       <a href="https://youtu.be/E-gMFv84FE8?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+       #5 Install & Setup on Redhat / Centos
+       </a>
+    </figcaption>
+  </figure>
+  <figure class="video-card">
+    <a href="https://youtu.be/JY22EBOR9hQ?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+      <img src="/img/docs/v4/screencast_generic.png">
+      <i class="fa fa-play"></i>
+    </a>
+    <figcaption>
+       <a href="https://youtu.be/JY22EBOR9hQ?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+       #4 Install & Setup on Ubuntu / Debian
+       </a>
+    </figcaption>
+  </figure>
+  <figure class="video-card">
+    <a href="https://youtu.be/FC13uhFRsVw?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+      <img src="/img/docs/v4/screencast_generic.png">
+      <i class="fa fa-play"></i>
+    </a>
+    <figcaption>
+       <a href="https://youtu.be/FC13uhFRsVw?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+       #3 Whats New In Grafana 2.0
+       </a>
+    </figcaption>
+  </figure>
+  <figure class="video-card">
+    <a href="https://youtu.be/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+      <img src="/img/docs/v4/screencast_generic.png">
+      <i class="fa fa-play"></i>
+    </a>
+    <figcaption>
+       <a href="https://youtu.be/FhNUrueWwOk?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+       #2 Templated Graphite Queries
+       </a>
+    </figcaption>
+  </figure>
+  <figure class="video-card">
+    <a href="https://youtu.be/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+      <img src="/img/docs/v4/screencast_generic.png">
+      <i class="fa fa-play"></i>
+    </a>
+    <figcaption>
+       <a href="https://youtu.be/mgcJPREl3CU?list=PLDGkOdUX1Ujo3wHw9-z5Vo12YLqXRjzg2" target="_blank" rel="noopener noreferrer">
+       #1 Building Graphite Queries
+       </a>
+    </figcaption>
+  </figure>
+</div>
 

pkg/components/imguploader/s3uploader.go

@@ -78,5 +78,5 @@ func (u *S3Uploader) Upload(imageDiskPath string) (string, error) {
 		return "", err
 	}
 
-	return "https://" + u.bucket + ".s3.amazonaws.com/" + key, nil
+	return "https://" + u.bucket + ".s3-" + u.region + ".amazonaws.com/" + key, nil
 }

public/app/features/annotations/partials/editor.html

@@ -28,7 +28,7 @@
 	<div class="tabbed-view-body">
 		<div class="editor-row row" ng-if="ctrl.mode === 'list'">
 			<div ng-if="ctrl.annotations.length === 0">
-				<em>No annotations defined</em>
+				<em>No annotation queries defined</em>
 			</div>
 			<table class="grafana-options-table">
 				<tr ng-repeat="annotation in ctrl.annotations">