docs(): update to install docs and whats new in 2.5

README.md

@@ -133,7 +133,7 @@ And if you have time clone this repo and submit a pull request and help me make
 the kickass metrics & devops dashboard we all dream about!
 
 Before creating a pull request be sure that "grunt test" runs without any style or unit test errors, also
-please [sign the CLA](http://grafana.org/docs/contributing/cla.html)
+please [sign the CLA](http://docs.grafana.org/project/cla/)
 
 ## License
 

docs/mkdocs.yml

@@ -45,8 +45,9 @@ pages:
 
 - ['guides/basic_concepts.md', 'User Guides', 'Basic Concepts']
 - ['guides/gettingstarted.md', 'User Guides', 'Getting Started']
-- ['guides/whats-new-in-v2.md', 'User Guides', "What's New in Grafana v2.0"]
+- ['guides/whats-new-in-v2-5.md', 'User Guides', "What's New in Grafana v2.5"]
 - ['guides/whats-new-in-v2-1.md', 'User Guides', "What's New in Grafana v2.1"]
+- ['guides/whats-new-in-v2.md', 'User Guides', "What's New in Grafana v2.0"]
 - ['guides/screencasts.md', 'User Guides', 'Screencasts']
 
 - ['reference/graph.md', 'Reference', 'Graph Panel']

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

@@ -6,4 +6,100 @@ page_keywords: grafana, new, changes, features, documentation
 
 # What's new in Grafana v2.5
 
+## Release highlights
+This is an exciting release, and we want to share some of the highlights. The release includes many
+fixes and enhancements to all areas of Grafana, like new Data Sources, a new and improved timepicker, user invites, panel
+resize handles and improved InfluxDB and OpenTSDB support.
+
+### New time range controls
+<img src="/img/whatsnew_2_5/timepicker.png" alt="New Time picker">
+
+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
+correctly in UTC mode.
+
+### Elasticsearch
+
+<img src="/img/whatsnew_2_5/elasticsearch_metrics_ex1.png" alt="Elasticsearch example">
+<br>
+
+This release brings a fully featured query editor for Elasticsearch. You will now be able to visualize
+logs or any kind of data stored in Elasticserarch. The query editor allows you to build both simple
+and complex queries for logs or metrics.
+
+- Compute metrics from your documents, supported Elasticsearch aggregations:
+  - Count, Avg, Min, Max, Sum
+  - Percentiles, Std Dev, etc.
+- Group by multiple terms or filters
+  - Specify group by options like Top 5 based on Avg @value
+- Auto completion for field names
+- Query only relevant indicies based on time pattern
+- Alias patterns for short readable series names
+
+Try the new Elasticsearch query editor on the [play.grafana.org](http://play.grafana.org/dashboard/db/elasticsearch-metrics) site.
+
+### CloudWatch
+
+<img src="/img/whatsnew_2_5/cloudwatch.png" alt="Cloudwatch editor">
+
+Grafana 2.5 ships with a new CloudWatch datasource that will allow you to query and visualize CloudWatch
+metrics directly from Grafana.
+
+- Rich editor with auto completion for metric names, namespaces and dimensions
+- Templating queries for generic dashboards
+- Alias patterns for short readable series names
+
+### Prometheus
+
+<img src="/img/whatsnew_2_5/prometheus_editor.png" alt="Prometheus editor">
+
+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
+<img src="/img/whatsnew_2_5/mixed_data.png" alt="Mix data sources in the same dashboard or in the same graph!">
+
+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.
+When selected this will allow you to specify data source on a per query basis. This will, for example, allow you
+to plot metrics from different Graphite servers on the same Graph or plot data from Elasticsearch alongside
+data from Prometheus. Mixing different data sources on the same graph works for any data source, even custom ones.
+
+### Panel Resize handles
+<img src="/img/whatsnew_2_5/panel_resize.gif" alt="">
+
+This release adds resize handles to the the bottom right corners of panels making is easy to resize both width and height.
+
+### User invites
+<img src="/img/whatsnew_2_5/org_invite.png" alt="">
+
+This version also brings some new features for user management.
+
+- Organization admins can now invite new users (via email or manually via invite link)
+- Users can signup using invite link and get automatically added to invited organization
+- User signup workflow can (if enabled) contain an email verification step.
+- Check out [#2353](https://github.com/grafana/grafana/issues/2353) for more info.
+
+### Miscellaneous improvements
+
+- InfluxDB query editor now supports math and AS expressions
+- InfluxDB query editor now supports custom group by interval
+- Panel drilldown link is easier to reach
+- LDAP improvements (can now search for group membership if your LDAP server does not support memberOf attribute)
+- More units for graph and singlestat panel (Length, Volume, Temperature, Pressure, Currency)
+- Admin page for all organizations (remove / edit)
+
+### Breaking changes
+There have been some changes to the data source plugin API. If you are using a custom plugin check that there is an update for it before you upgrade. Also
+the new time picker does not currenty support custom quick ranges like the last one did. This will likey be added in a
+future release.
+
+### Changelog
+For a detailed list and link to github issues for everything included in the 2.5 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>
 

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.1.3_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.1.3_amd64.deb)
+.deb for Debian-based Linux | [grafana_2.5.0_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_2.5.0_amd64.deb)
 
 ## Install
 
-    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.1.3_amd64.deb
+    $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_2.5.0_amd64.deb
     $ sudo apt-get install -y adduser libfontconfig
-    $ sudo dpkg -i grafana_2.1.3_amd64.deb
+    $ sudo dpkg -i grafana_2.5.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.1.3-1.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-2.1.3-1.x86_64.rpm)
+.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)
 
 ## Install from package file
 
 You can install Grafana using Yum directly.
 
-    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.1.3-1.x86_64.rpm
+    $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-2.5.0-1.x86_64.rpm
 
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:
 
     $ sudo yum install initscripts fontconfig
-    $ sudo rpm -Uvh grafana-2.1.3-1.x86_64.rpm
+    $ sudo rpm -Uvh grafana-2.5.0-1.x86_64.rpm
 
 #### On OpenSuse:
 
-    $ sudo rpm -i --nodeps grafana-2.1.3-1.x86_64.rpm
+    $ sudo rpm -i --nodeps grafana-2.5.0-1.x86_64.rpm
 
 ## Install via YUM Repository
 

docs/sources/installation/windows.md

@@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide
 
 Description | Download
 ------------ | -------------
-Zip package for Windows | [grafana.2.1.3.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-2.1.3.windows-x64.zip)
+Zip package for Windows | [grafana.2.5.0.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-2.5.0.windows-x64.zip)
 
 ## Configure
 

packaging/publish/publish.sh

+#! /usr/bin/env bash
+
+version=2.5.0
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana_${version}_amd64.deb
+
+package_cloud push grafana/stable/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/stable/debian/wheezy grafana_${version}_amd64.deb
+package_cloud push grafana/testing/debian/jessie grafana_${version}_amd64.deb
+package_cloud push grafana/testing/debian/wheezy grafana_${version}_amd64.deb
+
+wget https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-1.x86_64.rpm
+
+package_cloud push grafana/testing/el/6 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/testing/el/7 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
+package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm