Merge branch 'patch-29' into 'master'

Fix prometheus arg in prometheus.yml

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

doc/user/project/integrations/samples/prometheus.yml

@@ -94,7 +94,7 @@ spec:
       - name: prometheus
         image: prom/prometheus:latest
         args:
-          - '-config.file=/prometheus-data/prometheus.yml'
+          - '--config.file=/prometheus-data/prometheus.yml'
         ports:
         - name: prometheus
           containerPort: 9090