docs(): updated downloads for 2.6 and whats new in 2.6 article

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 2.6.0 (2015-12-04)
+# 2.6.0 (2015-12-14)
 
 ### New Features
 * **Elasticsearch**: Support for pipeline aggregations Moving average and derivative, closes [#2715](https://github.com/grafana/grafana/issues/2715)

docs/sources/guides/whats-new-in-v2-6.md

@@ -10,24 +10,24 @@ page_keywords: grafana, new, changes, features, documentation, table
 The release includes a new Table panel, a new InfluxDB query editor, support for Elasticsearch Pipeline Metrics and
 support for multiple Cloudwatch credentials.
 
-### Table Panel
+## Table Panel
 <img src="/img/v2/table-panel.png">
 
 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.
 
-#### Time series to rows
+### 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.
 
 <img src="/img/v2.6/table_ts_to_rows.png">
 
-#### Table Transform
+### Table Transform
 Above you see the options tab for the **Table Panel**. The most important option is the `To Table Transform`.
 This option controls how the result of the metric/data query is turned into a table.
 
-#### Column Styles
+### Column Styles
 The column styles allow you control how dates and numbers are formatted.
 
 ### Time series to columns
@@ -49,7 +49,7 @@ You have to think about how accurate the aggregations will be. It depends on wha
 how many data points are fetched, etc. The time series aggregations are calculated by Grafana after aggregation is performed
 by the time series database.
 
-#### Raw logs queries
+### Raw logs queries
 
 If you want to show documents from Elasticsearch pick `Raw Document` as the first metric.
 
@@ -60,20 +60,20 @@ you want to show in the table.
 
 <img src="/img/v2.6/table_json_data.png">
 
-#### Elasticsearch aggregations
+### 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.
 
 <img src="/img/v2.6/elastic_aggregations.png">
 
-#### Annotations
+### Annotations
 
 The table can also show any annotations you have enabled in the dashboard.
 
 <img src="/img/v2.6/table_annotations.png">
 
-### The New InfluxDB Editor
+## 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.
@@ -92,27 +92,33 @@ The above will generate the following InfluxDB `SELECT` clause:
 SELECT derivative(mean("value"), 10s) /10 AS "REQ/s" FROM ....
 ```
 
-#### Select multiple fields
+### Select multiple fields
 Use the plus button and select Field > field to add another SELECT clause. You can also
-specify a `asterix` to select all fields.
+specify an asterix `*` to select all fields.
 
 ### Group By
 To group by a tag click the plus icon at the end of the GROUP BY row. Pick a tag from the dropdown that appears.
 You can remove the group by by clicking on the `tag` and then click on the x icon.
 
-
 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.
 
-<img src="/assets/img/blog/v2.6/table_influxdb_logs.png">
+<img src="/img/v2.6/table_influxdb_logs.png">
+
+## Pipeline metrics
+
+If you have Elasticsearch 2.x and Grafana 2.6 or above then you can use pipeline metric aggregations like
+**Moving Average** and **Derivative**. Elasticsearch pipeline metrics require another metric to be based on. Use the eye icon next to the metric
+to hide metrics from appearing in the graph. This is useful for metrics you only have in the query to be used
+in a pipeline metric.
 
-####
+![](/img/elasticsearch/pipeline_metrics_editor.png)
 
-### Changelog
-For a detailed list and link to github issues for everything included in the 2.5 release please
+## Changelog
+For a detailed list and link to github issues for everything included in the 2.6 release please
 view the [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md) file.
 
 - - -
 
-### <a href="http://grafana.org/download">Download Grafana 2.5 now</a>
+<a href="http://grafana.org/download">Download Grafana 2.6 now</a>
 

docs/sources/installation/debian.md

@@ -10,13 +10,13 @@ page_keywords: grafana, installation, debian, ubuntu, guide
 
 Description | Download
 ------------ | -------------
-.deb for Debian-based Linux | [grafana_2.5.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.5.0_amd64.deb)
+.deb for Debian-based Linux | [grafana_2.6.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb)
 
 ## Install
 
-    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.5.0_amd64.deb
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.6.0_amd64.deb
     $ sudo apt-get install -y adduser libfontconfig
-    $ sudo dpkg -i grafana_2.5.0_amd64.deb
+    $ sudo dpkg -i grafana_2.6.0_amd64.deb
 
 ## APT Repository
 

docs/sources/installation/rpm.md

@@ -10,24 +10,24 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide
 
 Description | Download
 ------------ | -------------
-.RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.5.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.5.0-1.x86_64.rpm)
+.RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-2.6.0-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm)
 
 ## Install from package file
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.5.0-1.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0-1.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-2.5.0-1.x86_64.rpm
+    $ sudo rpm -Uvh grafana-2.6.0-1.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-2.5.0-1.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-2.6.0-1.x86_64.rpm
 
 ## Install via YUM Repository
 

packaging/publish/publish.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-version=2.5.0
+version=2.6.0
 
 wget https://grafanarel.s3.amazonaws.com/builds/grafana_${version}_amd64.deb