kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove InfluxDB username/password

Browse source 
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
This commit is contained in:
Yorick Peterse 2016-01-06 17:49:02 +01:00
parent bcd2a09da7
commit 8fdc00bd4c
5 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/application_settings_controller.rb
View file

@ -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,

8
app/views/admin/application_settings/_form.html.haml
View file

@ -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

6
db/migrate/20160106164438_remove_influxdb_credentials.rb Normal file
View file

@ -0,0 +1,6 @@
class RemoveInfluxdbCredentials < ActiveRecord::Migration
def change
remove_column :application_settings, :metrics_username, :string
remove_column :application_settings, :metrics_password, :string
end
end

20
db/schema.rb
View file

@ -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"
@ -50,16 +50,14 @@ ActiveRecord::Schema.define(version: 20151229112614) do
t.boolean "shared_runners_enabled", default: true, null: false t.boolean "shared_runners_enabled", default: true, null: false
t.integer "max_artifacts_size", default: 100, null: false t.integer "max_artifacts_size", default: 100, null: false
t.string "runners_registration_token" t.string "runners_registration_token"
t.boolean "require_two_factor_authentication", default: false t.boolean "require_two_factor_authentication", default: false
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.integer "metrics_pool_size", default: 16
t.string "metrics_password" t.integer "metrics_timeout", default: 10
t.integer "metrics_pool_size", default: 16 t.integer "metrics_method_call_threshold", default: 10
t.integer "metrics_timeout", default: 10 t.boolean "recaptcha_enabled", default: false
t.integer "metrics_method_call_threshold", default: 10
t.boolean "recaptcha_enabled", default: false
t.string "recaptcha_site_key" t.string "recaptcha_site_key"
t.string "recaptcha_private_key" t.string "recaptcha_private_key"
t.integer "metrics_port", default: 8089 t.integer "metrics_port", default: 8089

6
lib/gitlab/metrics.rb
View file

@ -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
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