Merge pull request #95 from james-laing/prometheus.yml_timeout_update

Corrected minor typo in scrape_timeout in prometheus.yml

Author: sdodsley

extra/prometheus/prometheus.yml

@@ -1,6 +1,6 @@
 global:
   scrape_interval:     30s # Set the scrape interval to every 30 seconds. Default is every 1 minute.
-  scrape_timeout:      15m # Set the scrape timeout to shorter than or equal to scrape_interval. Default is every 1 minute.
+  scrape_timeout:      30s # Set the scrape timeout to shorter than or equal to scrape_interval. Default is every 1 minute.
   # evaluation_interval: 60s # is set to the default every 1 minute.
 
 # A scrape configuration containing exactly one endpoint to scrape: