Merge branch 'master' into alerting

Conflicts:
	conf/sample.ini

conf/defaults.ini

@@ -373,12 +373,13 @@ enabled = false
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
 enabled           = true
-interval_seconds  = 60
+interval_seconds  = 10
 
 # Send internal Grafana metrics to graphite
-; [metrics.graphite]
-; address = localhost:2003
-; prefix = service.grafana.%(instance_name)s.
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+address =
+prefix = prod.grafana.%(instance_name)s.
 
 [grafana_net]
 url = https://grafana.net

conf/sample.ini

@@ -298,33 +298,34 @@ check_for_updates = true
 # Metrics available at HTTP API Url /api/metrics
 [metrics]
 # Disable / Enable internal metrics
-enabled           = true
+;enabled           = true
 
 # Publish interval
 ;interval_seconds  = 10
 
 # Send internal metrics to Graphite
-; [metrics.graphite]
-; address = localhost:2003
-; prefix = service.grafana.%(instance_name)s.
+[metrics.graphite]
+# Enable by setting the address setting (ex localhost:2003)
+;address =
+;prefix = prod.grafana.%(instance_name)s.
 
 #################################### Internal Grafana Metrics ##########################
 # Url used to to import dashboards directly from Grafana.net
 [grafana_net]
-url = https://grafana.net
+;url = https://grafana.net
 
 #################################### External image storage ##########################
 [external_image_storage]
 # Used for uploading images to public servers so they can be included in slack/email messages.
 # you can choose between (s3, webdav or internal)
-provider = s3
+;provider = s3
 
 [external_image_storage.s3]
-bucket_url =
-access_key =
-secret_key =
+;bucket_url =
+;access_key =
+;secret_key =
 
 [external_image_storage.webdav]
-url =
-username =
-password =
+;url =
+;username =
+;password =