Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
ee9432a7
Commit
ee9432a7
authored
Jan 07, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-influxdb-credentials' into 'master'
See merge request !2319
parents
d47b3e63
8fdc00bd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
26 deletions
+16
-26
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+0
-2
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+0
-8
db/migrate/20160106164438_remove_influxdb_credentials.rb
db/migrate/20160106164438_remove_influxdb_credentials.rb
+6
-0
db/schema.rb
db/schema.rb
+9
-11
lib/gitlab/metrics.rb
lib/gitlab/metrics.rb
+1
-5
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
ee9432a7
...
@@ -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
,
...
...
app/views/admin/application_settings/_form.html.haml
View file @
ee9432a7
...
@@ -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
...
...
db/migrate/20160106164438_remove_influxdb_credentials.rb
0 → 100644
View file @
ee9432a7
class
RemoveInfluxdbCredentials
<
ActiveRecord
::
Migration
def
change
remove_column
:application_settings
,
:metrics_username
,
:string
remove_column
:application_settings
,
:metrics_password
,
:string
end
end
db/schema.rb
View file @
ee9432a7
...
@@ -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:
201
51229112614
)
do
ActiveRecord
::
Schema
.
define
(
version:
201
60106164438
)
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
...
...
lib/gitlab/metrics.rb
View file @
ee9432a7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment