summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-06 17:49:02 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-06 17:49:56 +0100
commit8fdc00bd4c59183a20a60a6b93228268230bbd2e (patch)
tree0c5c81a3799c66acf6250393ee43f9fb9b2f1b24 /lib
parentbcd2a09da72d430773b4b4bbc700132aade641d7 (diff)
downloadgitlab-ce-8fdc00bd4c59183a20a60a6b93228268230bbd2e.tar.gz
Remove InfluxDB username/passwordremove-influxdb-credentials
InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/metrics.rb6
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