Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
容器镜像库
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
93f3c1d9
提交
93f3c1d9
编辑于
2 years ago
作者:
Matthias Kaeppler
浏览文件
操作
下载
补丁
差异文件
Configure gitlab-metrics-exporter logs
This is not in use yet, but we should already pass in the correct settings.
上级
f8564eb7
No related branches found
No related tags found
无相关合并请求
变更
2
隐藏空白变更内容
行内
左右并排
显示
2 个更改的文件
metrics_server/metrics_server.rb
+15
-9
15 个添加, 9 个删除
metrics_server/metrics_server.rb
spec/metrics_server/metrics_server_spec.rb
+39
-1
39 个添加, 1 个删除
spec/metrics_server/metrics_server_spec.rb
有
54 个添加
和
10 个删除
metrics_server/metrics_server.rb
+
15
−
9
浏览文件 @
93f3c1d9
...
@@ -40,7 +40,8 @@ def start_for_sidekiq(**options)
...
@@ -40,7 +40,8 @@ def start_for_sidekiq(**options)
def
spawn
(
target
,
metrics_dir
:,
**
options
)
def
spawn
(
target
,
metrics_dir
:,
**
options
)
return
spawn_ruby_server
(
target
,
metrics_dir:
metrics_dir
,
**
options
)
unless
new_metrics_server?
return
spawn_ruby_server
(
target
,
metrics_dir:
metrics_dir
,
**
options
)
unless
new_metrics_server?
settings
=
settings_for
(
target
)
name
=
settings_key
(
target
)
settings
=
::
Settings
.
monitoring
[
name
]
path
=
options
[
:path
]
&
.
then
{
|
p
|
Pathname
.
new
(
p
)
}
||
Pathname
.
new
(
''
)
path
=
options
[
:path
]
&
.
then
{
|
p
|
Pathname
.
new
(
p
)
}
||
Pathname
.
new
(
''
)
cmd
=
path
.
join
(
'gitlab-metrics-exporter'
).
to_path
cmd
=
path
.
join
(
'gitlab-metrics-exporter'
).
to_path
env
=
{
env
=
{
...
@@ -50,6 +51,13 @@ def spawn(target, metrics_dir:, **options)
...
@@ -50,6 +51,13 @@ def spawn(target, metrics_dir:, **options)
'GME_SERVER_PORT'
=>
settings
[
'port'
].
to_s
'GME_SERVER_PORT'
=>
settings
[
'port'
].
to_s
}
}
if
settings
[
'log_enabled'
]
env
[
'GME_LOG_FILE'
]
=
File
.
join
(
Rails
.
root
,
'log'
,
"
#{
name
}
.log"
)
env
[
'GME_LOG_LEVEL'
]
=
'info'
else
env
[
'GME_LOG_LEVEL'
]
=
'quiet'
end
Process
.
spawn
(
env
,
cmd
,
err:
$stderr
,
out:
$stdout
,
pgroup:
true
).
tap
do
|
pid
|
Process
.
spawn
(
env
,
cmd
,
err:
$stderr
,
out:
$stdout
,
pgroup:
true
).
tap
do
|
pid
|
Process
.
detach
(
pid
)
Process
.
detach
(
pid
)
end
end
...
@@ -104,14 +112,12 @@ def ensure_valid_target!(target)
...
@@ -104,14 +112,12 @@ def ensure_valid_target!(target)
raise
"Target must be one of [puma,sidekiq]"
unless
%w(puma sidekiq)
.
include?
(
target
)
raise
"Target must be one of [puma,sidekiq]"
unless
%w(puma sidekiq)
.
include?
(
target
)
end
end
def
settings_for
(
target
)
def
settings_key
(
target
)
settings_key
=
case
target
case
target
when
'puma'
then
'web_exporter'
when
'puma'
then
'web_exporter'
when
'sidekiq'
then
'sidekiq_exporter'
when
'sidekiq'
then
'sidekiq_exporter'
else
ensure_valid_target!
(
target
)
else
ensure_valid_target!
(
target
)
end
end
::
Settings
.
monitoring
[
settings_key
]
end
end
end
end
...
...
此差异已折叠。
点击以展开。
spec/metrics_server/metrics_server_spec.rb
+
39
−
1
浏览文件 @
93f3c1d9
...
@@ -97,18 +97,38 @@
...
@@ -97,18 +97,38 @@
end
end
context
'for Golang server'
do
context
'for Golang server'
do
let
(
:log_enabled
)
{
false
}
let
(
:settings
)
do
{
'web_exporter'
=>
{
'enabled'
=>
true
,
'address'
=>
'localhost'
,
'port'
=>
'8083'
,
'log_enabled'
=>
log_enabled
},
'sidekiq_exporter'
=>
{
'enabled'
=>
true
,
'address'
=>
'localhost'
,
'port'
=>
'8082'
,
'log_enabled'
=>
log_enabled
}
}
end
let
(
:expected_port
)
{
target
==
'puma'
?
'8083'
:
'8082'
}
let
(
:expected_port
)
{
target
==
'puma'
?
'8083'
:
'8082'
}
let
(
:expected_env
)
do
let
(
:expected_env
)
do
{
{
'GME_MMAP_METRICS_DIR'
=>
metrics_dir
,
'GME_MMAP_METRICS_DIR'
=>
metrics_dir
,
'GME_PROBES'
=>
'self,mmap'
,
'GME_PROBES'
=>
'self,mmap'
,
'GME_SERVER_HOST'
=>
'localhost'
,
'GME_SERVER_HOST'
=>
'localhost'
,
'GME_SERVER_PORT'
=>
expected_port
'GME_SERVER_PORT'
=>
expected_port
,
'GME_LOG_LEVEL'
=>
'quiet'
}
}
end
end
before
do
before
do
stub_env
(
'GITLAB_GOLANG_METRICS_SERVER'
,
'1'
)
stub_env
(
'GITLAB_GOLANG_METRICS_SERVER'
,
'1'
)
allow
(
::
Settings
).
to
receive
(
:monitoring
).
and_return
(
settings
)
end
end
it
'spawns a new server process and returns its PID'
do
it
'spawns a new server process and returns its PID'
do
...
@@ -133,6 +153,24 @@
...
@@ -133,6 +153,24 @@
described_class
.
spawn
(
target
,
metrics_dir:
metrics_dir
,
path:
'/path/to/gme/'
)
described_class
.
spawn
(
target
,
metrics_dir:
metrics_dir
,
path:
'/path/to/gme/'
)
end
end
context
'when logs are enabled'
do
let
(
:log_enabled
)
{
true
}
let
(
:expected_log_file
)
{
target
==
'puma'
?
'web_exporter.log'
:
'sidekiq_exporter.log'
}
it
'sets log related environment variables'
do
expect
(
Process
).
to
receive
(
:spawn
).
with
(
expected_env
.
merge
(
'GME_LOG_LEVEL'
=>
'info'
,
'GME_LOG_FILE'
=>
File
.
join
(
Rails
.
root
,
'log'
,
expected_log_file
)
),
'gitlab-metrics-exporter'
,
hash_including
(
pgroup:
true
)
).
and_return
(
99
)
described_class
.
spawn
(
target
,
metrics_dir:
metrics_dir
)
end
end
end
end
end
end
end
end
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录