Merge branch 'master' of github.com:grafana/grafana

Author: torkelo

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 # 3.0.3 Patch release (unreleased)
 * **Time picker**: Fixed issue timepicker and UTC when reading time from URL, fixes [#5078](https://github.com/grafana/grafana/issues/5078)
+* **CloudWatch**: Support for Multiple Account by AssumeRole, closes [#3522](https://github.com/grafana/grafana/issues/3522)
 
 # 3.0.2 Patch release (2016-05-16)
 

docker/blocks/graphite/fig

@@ -8,7 +8,7 @@ graphite:
     - /etc/localtime:/etc/localtime:ro
     - /etc/timezone:/etc/timezone:ro
 
-fake-data-gen:
+fake-graphite-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:

docker/blocks/influxdb/fig

@@ -5,7 +5,7 @@ influxdb:
     - "8083:8083"
     - "8086:8086"
 
-fake-data-gen:
+fake-influxdb-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:

docker/blocks/opentsdb/fig

@@ -3,7 +3,7 @@ opentsdb:
   ports:
     - "4242:4242"
 
-fake-data-gen:
+fake-opentsdb-data:
   image: grafana/fake-data-gen
   net: bridge
   environment:

docker/blocks/prometheus/fig

@@ -6,7 +6,7 @@ prometheus:
   volumes:
     - /var/docker/prometheus:/prometheus-data
 
-fake-data-gen:
+fake-prometheus-data:
   image: grafana/fake-data-gen
   net: bridge
   ports:

docs/sources/datasources/cloudwatch.md

@@ -26,6 +26,8 @@ Name | The data source name, important that this is the same as in Grafana v1.x
 Default | Default data source means that it will be pre-selected for new panels.
 Credentials profile name | Specify the name of the profile to use (if you use `~/aws/credentials` file), leave blank for default. This option was introduced in Grafana 2.5.1
 Default Region | Used in query editor to set region (can be changed on per query basis)
+Custom Metrics namespace | Specify the CloudWatch namespace of Custom metrics
+Assume Role Arn | Specify the ARN of the role to assume
 
 ## Authentication