Merge branch 'prometheus' into 'master'

Set prometheus GlobalSetting in order to allow trusted ips for monitoring

See merge request !21

config/discourse.conf

@@ -250,4 +250,9 @@ compress_anon_cache = false
 #
 # This ensures there are no pathological cases where we keep storing data in anonymous cache
 # never to use it, set to 1 to store
-anon_cache_store_threshold = 2
\ No newline at end of file
+anon_cache_store_threshold = 2
+
+# Set trusted ip's for prometheus.
+# Check discourse-monitoring.web.cern.ch for ips.
+# Go for openshift ones (nslookup openshift.cern.ch)
+prometheus_trusted_ip_whitelist_regex = '(::ffff:188\.18[4-5])'
\ No newline at end of file