Merge branch 'remove-influxdb-credentials' into 'master'

See merge request !2319

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb
index ee88ab34d6c..44356a0e42c 100644
--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -13,8 +13,6 @@ module Gitlab
         timeout:               current_application_settings[:metrics_timeout],
         method_call_threshold: current_application_settings[:metrics_method_call_threshold],
         host:                  current_application_settings[:metrics_host],
-        username:              current_application_settings[:metrics_username],
-        password:              current_application_settings[:metrics_password],
         port:                  current_application_settings[:metrics_port]
       }
     end
@@ -90,12 +88,10 @@ module Gitlab
     if enabled?
       @pool = ConnectionPool.new(size: settings[:pool_size], timeout: settings[:timeout]) do
         host = settings[:host]
-        user = settings[:username]
-        pw   = settings[:password]
         port = settings[:port]
 
         InfluxDB::Client.
-          new(udp: { host: host, port: port }, username: user, password: pw)
+          new(udp: { host: host, port: port })
       end
     end
   end