RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hide sensitive Wechat configuration + remove default fields (#1253) 

* Hide sensitive Wechat configuration

* Don't send resolved alerts for Wechat by default
This commit is contained in:
pasquier-s 2018-03-02 09:49:41 +01:00 committed by stuart nelson
parent e8a92f65ef
commit e67aa8edae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -388,7 +388,7 @@ type GlobalConfig struct {
OpsGenieAPIURL string `yaml:"opsgenie_api_url,omitempty" json:"opsgenie_api_url,omitempty"` OpsGenieAPIURL string `yaml:"opsgenie_api_url,omitempty" json:"opsgenie_api_url,omitempty"`
OpsGenieAPIKey Secret `yaml:"opsgenie_api_key,omitempty" json:"opsgenie_api_key,omitempty"` OpsGenieAPIKey Secret `yaml:"opsgenie_api_key,omitempty" json:"opsgenie_api_key,omitempty"`
WeChatAPIURL string `yaml:"wechat_api_url,omitempty" json:"wechat_api_url,omitempty"` WeChatAPIURL string `yaml:"wechat_api_url,omitempty" json:"wechat_api_url,omitempty"`
WeChatAPISecret string `yaml:"wechat_api_secret,omitempty" json:"wechat_api_secret,omitempty"` WeChatAPISecret Secret `yaml:"wechat_api_secret,omitempty" json:"wechat_api_secret,omitempty"`
WeChatAPICorpID string `yaml:"wechat_api_corp_id,omitempty" json:"wechat_api_corp_id,omitempty"` WeChatAPICorpID string `yaml:"wechat_api_corp_id,omitempty" json:"wechat_api_corp_id,omitempty"`
VictorOpsAPIURL string `yaml:"victorops_api_url,omitempty" json:"victorops_api_url,omitempty"` VictorOpsAPIURL string `yaml:"victorops_api_url,omitempty" json:"victorops_api_url,omitempty"`
VictorOpsAPIKey Secret `yaml:"victorops_api_key,omitempty" json:"victorops_api_key,omitempty"` VictorOpsAPIKey Secret `yaml:"victorops_api_key,omitempty" json:"victorops_api_key,omitempty"`

4
config/notifiers.go
View File

@ -101,7 +101,7 @@ var (
// DefaultWechatConfig defines default values for wechat configurations. // DefaultWechatConfig defines default values for wechat configurations.
DefaultWechatConfig = WechatConfig{ DefaultWechatConfig = WechatConfig{
NotifierConfig: NotifierConfig{ NotifierConfig: NotifierConfig{
VSendResolved: true, VSendResolved: false,
}, },
Message: `{{ template "wechat.default.message" . }}`, Message: `{{ template "wechat.default.message" . }}`,
APISecret: `{{ template "wechat.default.api_secret" . }}`, APISecret: `{{ template "wechat.default.api_secret" . }}`,
@ -338,7 +338,7 @@ type WechatConfig struct {
HTTPConfig *commoncfg.HTTPClientConfig `yaml:"http_config,omitempty" json:"http_config,omitempty"` HTTPConfig *commoncfg.HTTPClientConfig `yaml:"http_config,omitempty" json:"http_config,omitempty"`
APISecret string `yaml:"api_secret,omitempty" json:"api_secret,omitempty"` APISecret Secret `yaml:"api_secret,omitempty" json:"api_secret,omitempty"`
CorpID string `yaml:"corp_id,omitempty" json:"corp_id,omitempty"` CorpID string `yaml:"corp_id,omitempty" json:"corp_id,omitempty"`
Message string `yaml:"message,omitempty" json:"message,omitempty"` Message string `yaml:"message,omitempty" json:"message,omitempty"`
APIURL string `yaml:"api_url,omitempty" json:"api_url,omitempty"` APIURL string `yaml:"api_url,omitempty" json:"api_url,omitempty"`