Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a9d0deeb
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a9d0deeb
编写于
5月 07, 2018
作者:
F
Felipe Artur
提交者:
Douwe Maan
5月 07, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enable prometheus metrics by default
上级
1492cf8f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
6 deletion
+29
-6
changelogs/unreleased/issue_43660.yml
changelogs/unreleased/issue_43660.yml
+5
-0
config/initializers/8_metrics.rb
config/initializers/8_metrics.rb
+8
-1
db/migrate/20180503200320_enable_prometheus_metrics_by_default.rb
...te/20180503200320_enable_prometheus_metrics_by_default.rb
+11
-0
db/schema.rb
db/schema.rb
+2
-2
spec/db/production/settings_spec.rb
spec/db/production/settings_spec.rb
+3
-3
未找到文件。
changelogs/unreleased/issue_43660.yml
0 → 100644
浏览文件 @
a9d0deeb
---
title
:
Enable prometheus monitoring by default
merge_request
:
author
:
type
:
other
config/initializers/8_metrics.rb
浏览文件 @
a9d0deeb
...
...
@@ -119,7 +119,14 @@ def instrument_classes(instrumentation)
end
# rubocop:enable Metrics/AbcSize
if
Gitlab
::
Metrics
.
enabled?
# With prometheus enabled by default this breaks all specs
# that stubs methods using `any_instance_of` for the models reloaded here.
#
# We should deprecate the usage of `any_instance_of` in the future
# check: https://github.com/rspec/rspec-mocks#settings-mocks-or-stubs-on-any-instance-of-a-class
#
# Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/33587
if
Gitlab
::
Metrics
.
enabled?
&&
!
Rails
.
env
.
test?
require
'pathname'
require
'influxdb'
require
'connection_pool'
...
...
db/migrate/20180503200320_enable_prometheus_metrics_by_default.rb
0 → 100644
浏览文件 @
a9d0deeb
class
EnablePrometheusMetricsByDefault
<
ActiveRecord
::
Migration
DOWNTIME
=
false
def
up
change_column_default
:application_settings
,
:prometheus_metrics_enabled
,
true
end
def
down
change_column_default
:application_settings
,
:prometheus_metrics_enabled
,
false
end
end
db/schema.rb
浏览文件 @
a9d0deeb
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
20180503
175054
)
do
ActiveRecord
::
Schema
.
define
(
version:
20180503
200320
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -134,7 +134,7 @@ ActiveRecord::Schema.define(version: 20180503175054) do
t
.
integer
"cached_markdown_version"
t
.
boolean
"clientside_sentry_enabled"
,
default:
false
,
null:
false
t
.
string
"clientside_sentry_dsn"
t
.
boolean
"prometheus_metrics_enabled"
,
default:
fals
e
,
null:
false
t
.
boolean
"prometheus_metrics_enabled"
,
default:
tru
e
,
null:
false
t
.
boolean
"help_page_hide_commercial_content"
,
default:
false
t
.
string
"help_page_support_url"
t
.
integer
"performance_bar_allowed_group_id"
...
...
spec/db/production/settings_spec.rb
浏览文件 @
a9d0deeb
...
...
@@ -48,15 +48,15 @@ describe 'seed production settings' do
end
end
context
'GITLAB_PROMETHEUS_METRICS_ENABLED is
false
'
do
context
'GITLAB_PROMETHEUS_METRICS_ENABLED is
default
'
do
before
do
stub_env
(
'GITLAB_PROMETHEUS_METRICS_ENABLED'
,
''
)
end
it
'prometheus_metrics_enabled is set to
fals
e'
do
it
'prometheus_metrics_enabled is set to
tru
e'
do
load
(
settings_file
)
expect
(
settings
.
prometheus_metrics_enabled
).
to
eq
(
fals
e
)
expect
(
settings
.
prometheus_metrics_enabled
).
to
eq
(
tru
e
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录