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

Merge pull request #1888 from MIBc/master 

Invalid APISecret error if only set default api_secret for wechat
This commit is contained in:
stuart nelson 2019-05-15 14:58:28 +02:00 committed by GitHub
parent c20873b1fe 46a59f12d5
commit d291471f1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asset/assets_vfsdata.go
View File

File diff suppressed because one or more lines are too long

11
config/notifiers.go
View File

@ -108,12 +108,11 @@ var (
NotifierConfig: NotifierConfig{ NotifierConfig: NotifierConfig{
VSendResolved: false, VSendResolved: false,
}, },
Message: `{{ template "wechat.default.message" . }}`, Message: `{{ template "wechat.default.message" . }}`,
APISecret: `{{ template "wechat.default.api_secret" . }}`, ToUser: `{{ template "wechat.default.to_user" . }}`,
ToUser: `{{ template "wechat.default.to_user" . }}`, ToParty: `{{ template "wechat.default.to_party" . }}`,
ToParty: `{{ template "wechat.default.to_party" . }}`, ToTag: `{{ template "wechat.default.to_tag" . }}`,
ToTag: `{{ template "wechat.default.to_tag" . }}`, AgentID: `{{ template "wechat.default.agent_id" . }}`,
AgentID: `{{ template "wechat.default.agent_id" . }}`,
} }
// DefaultVictorOpsConfig defines default values for VictorOps configurations. // DefaultVictorOpsConfig defines default values for VictorOps configurations.

1
template/default.tmpl
View File

@ -61,7 +61,6 @@ Alerts Resolved:
AlertmanagerUrl: AlertmanagerUrl:
{{ template "__alertmanagerURL" . }} {{ template "__alertmanagerURL" . }}
{{- end }} {{- end }}
{{ define "wechat.default.api_secret" }}{{ end }}
{{ define "wechat.default.to_user" }}{{ end }} {{ define "wechat.default.to_user" }}{{ end }}
{{ define "wechat.default.to_party" }}{{ end }} {{ define "wechat.default.to_party" }}{{ end }}
{{ define "wechat.default.to_tag" }}{{ end }} {{ define "wechat.default.to_tag" }}{{ end }}