Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doodoocoder
prometheus
提交
1bf3b91a
P
prometheus
项目概览
doodoocoder
/
prometheus
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
prometheus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1bf3b91a
编写于
8月 07, 2017
作者:
Y
Yuki Ito
提交者:
Brian Brazil
8月 07, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure that url for remote_read/write is not nil (#3024)
上级
62047e5c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
2 deletion
+18
-2
config/config.go
config/config.go
+8
-2
config/config_test.go
config/config_test.go
+6
-0
config/testdata/remote_read_url_missing.bad.yml
config/testdata/remote_read_url_missing.bad.yml
+2
-0
config/testdata/remote_write_url_missing.bad.yml
config/testdata/remote_write_url_missing.bad.yml
+2
-0
未找到文件。
config/config.go
浏览文件 @
1bf3b91a
...
...
@@ -1404,7 +1404,7 @@ func (re Regexp) MarshalYAML() (interface{}, error) {
// RemoteWriteConfig is the configuration for writing to remote storage.
type
RemoteWriteConfig
struct
{
URL
*
URL
`yaml:"url
,omitempty
"`
URL
*
URL
`yaml:"url"`
RemoteTimeout
model
.
Duration
`yaml:"remote_timeout,omitempty"`
WriteRelabelConfigs
[]
*
RelabelConfig
`yaml:"write_relabel_configs,omitempty"`
...
...
@@ -1424,6 +1424,9 @@ func (c *RemoteWriteConfig) UnmarshalYAML(unmarshal func(interface{}) error) err
if
err
:=
unmarshal
((
*
plain
)(
c
));
err
!=
nil
{
return
err
}
if
c
.
URL
==
nil
{
return
fmt
.
Errorf
(
"url for remote_write is empty"
)
}
// The UnmarshalYAML method of HTTPClientConfig is not being called because it's not a pointer.
// We cannot make it a pointer as the parser panics for inlined pointer structs.
...
...
@@ -1463,7 +1466,7 @@ type QueueConfig struct {
// RemoteReadConfig is the configuration for reading from remote storage.
type
RemoteReadConfig
struct
{
URL
*
URL
`yaml:"url
,omitempty
"`
URL
*
URL
`yaml:"url"`
RemoteTimeout
model
.
Duration
`yaml:"remote_timeout,omitempty"`
// We cannot do proper Go type embedding below as the parser will then parse
...
...
@@ -1481,6 +1484,9 @@ func (c *RemoteReadConfig) UnmarshalYAML(unmarshal func(interface{}) error) erro
if
err
:=
unmarshal
((
*
plain
)(
c
));
err
!=
nil
{
return
err
}
if
c
.
URL
==
nil
{
return
fmt
.
Errorf
(
"url for remote_read is empty"
)
}
// The UnmarshalYAML method of HTTPClientConfig is not being called because it's not a pointer.
// We cannot make it a pointer as the parser panics for inlined pointer structs.
...
...
config/config_test.go
浏览文件 @
1bf3b91a
...
...
@@ -668,6 +668,12 @@ var expectedErrors = []struct {
},
{
filename
:
"unknown_global_attr.bad.yml"
,
errMsg
:
"unknown fields in global config: nonexistent_field"
,
},
{
filename
:
"remote_read_url_missing.bad.yml"
,
errMsg
:
`url for remote_read is empty`
,
},
{
filename
:
"remote_write_url_missing.bad.yml"
,
errMsg
:
`url for remote_write is empty`
,
},
}
...
...
config/testdata/remote_read_url_missing.bad.yml
0 → 100644
浏览文件 @
1bf3b91a
remote_read
:
-
url
:
config/testdata/remote_write_url_missing.bad.yml
0 → 100644
浏览文件 @
1bf3b91a
remote_write
:
-
url
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录