Merge branch 'docs/external-prometheus-updates' into 'master'

Update external prometheus config

See merge request gitlab-org/gitlab-ce!27439

doc/administration/monitoring/prometheus/index.md

@@ -96,13 +96,15 @@ To use an external Prometheus server:
 
 1. Set each bundled service's [exporter](#bundled-software-metrics) to listen on a network address, for example:
 
-     ```ruby
+    ```ruby
      gitlab_monitor['listen_address'] = '0.0.0.0'
+     sidekiq['listen_address'] = '0.0.0.0'
      gitlab_monitor['listen_port'] = '9168'
-     gitaly['prometheus_listen_addr'] = "0.0.0.0:9236"
      node_exporter['listen_address'] = '0.0.0.0:9100'
      redis_exporter['listen_address'] = '0.0.0.0:9121'
      postgres_exporter['listen_address'] = '0.0.0.0:9187'
+     gitaly['prometheus_listen_addr'] = "0.0.0.0:9236"
+     gitlab_workhorse['prometheus_listen_addr'] = "0.0.0.0:9229"
      ```
 
 1. Install and set up a dedicated Prometheus instance, if necessary, using the [official installation instructions](https://prometheus.io/docs/prometheus/latest/installation/).
@@ -112,6 +114,18 @@ To use an external Prometheus server:
     gitlab_rails['monitoring_whitelist'] = ['127.0.0.0/8', '192.168.0.1']
     ```
 
+1. To scrape nginx metrics, you'll also need to configure nginx to allow the Prometheus server
+   IP. For example:
+
+    ```ruby
+    nginx['status']['options'] = {
+          "server_tokens" => "off",
+          "access_log" => "off",
+          "allow" => "192.168.0.1",
+          "deny" => "all",
+    }
+    ```
+
 1. [Reconfigure GitLab][reconfigure] to apply the changes
 1. Edit the Prometheus server's configuration file.
 1. Add each node's exporters to the Prometheus server's