Commit ee9432a7 authored by Yorick Peterse's avatar Yorick Peterse

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

See merge request !2319
parents d47b3e63 8fdc00bd
...@@ -70,8 +70,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -70,8 +70,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:metrics_enabled, :metrics_enabled,
:metrics_host, :metrics_host,
:metrics_port, :metrics_port,
:metrics_username,
:metrics_password,
:metrics_pool_size, :metrics_pool_size,
:metrics_timeout, :metrics_timeout,
:metrics_method_call_threshold, :metrics_method_call_threshold,
......
...@@ -179,14 +179,6 @@ ...@@ -179,14 +179,6 @@
your server configuration specifies a database to store data in when your server configuration specifies a database to store data in when
sending messages to this port, without it metrics data will not be sending messages to this port, without it metrics data will not be
saved. saved.
.form-group
= f.label :metrics_username, 'InfluxDB username', class: 'control-label col-sm-2'
.col-sm-10
= f.text_field :metrics_username, class: 'form-control'
.form-group
= f.label :metrics_password, 'InfluxDB password', class: 'control-label col-sm-2'
.col-sm-10
= f.text_field :metrics_password, class: 'form-control'
.form-group .form-group
= f.label :metrics_pool_size, 'Connection pool size', class: 'control-label col-sm-2' = f.label :metrics_pool_size, 'Connection pool size', class: 'control-label col-sm-2'
.col-sm-10 .col-sm-10
......
class RemoveInfluxdbCredentials < ActiveRecord::Migration
def change
remove_column :application_settings, :metrics_username, :string
remove_column :application_settings, :metrics_password, :string
end
end
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20151229112614) do ActiveRecord::Schema.define(version: 20160106164438) do
# These are extensions that must be enabled in order to support this database # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
...@@ -54,8 +54,6 @@ ActiveRecord::Schema.define(version: 20151229112614) do ...@@ -54,8 +54,6 @@ ActiveRecord::Schema.define(version: 20151229112614) do
t.integer "two_factor_grace_period", default: 48 t.integer "two_factor_grace_period", default: 48
t.boolean "metrics_enabled", default: false t.boolean "metrics_enabled", default: false
t.string "metrics_host", default: "localhost" t.string "metrics_host", default: "localhost"
t.string "metrics_username"
t.string "metrics_password"
t.integer "metrics_pool_size", default: 16 t.integer "metrics_pool_size", default: 16
t.integer "metrics_timeout", default: 10 t.integer "metrics_timeout", default: 10
t.integer "metrics_method_call_threshold", default: 10 t.integer "metrics_method_call_threshold", default: 10
......
...@@ -13,8 +13,6 @@ module Gitlab ...@@ -13,8 +13,6 @@ module Gitlab
timeout: current_application_settings[:metrics_timeout], timeout: current_application_settings[:metrics_timeout],
method_call_threshold: current_application_settings[:metrics_method_call_threshold], method_call_threshold: current_application_settings[:metrics_method_call_threshold],
host: current_application_settings[:metrics_host], host: current_application_settings[:metrics_host],
username: current_application_settings[:metrics_username],
password: current_application_settings[:metrics_password],
port: current_application_settings[:metrics_port] port: current_application_settings[:metrics_port]
} }
end end
...@@ -90,12 +88,10 @@ module Gitlab ...@@ -90,12 +88,10 @@ module Gitlab
if enabled? if enabled?
@pool = ConnectionPool.new(size: settings[:pool_size], timeout: settings[:timeout]) do @pool = ConnectionPool.new(size: settings[:pool_size], timeout: settings[:timeout]) do
host = settings[:host] host = settings[:host]
user = settings[:username]
pw = settings[:password]
port = settings[:port] port = settings[:port]
InfluxDB::Client. InfluxDB::Client.
new(udp: { host: host, port: port }, username: user, password: pw) new(udp: { host: host, port: port })
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment