Skip to content

Invalid APISecret error if only set default api_secret for wechat#1888

Merged
stuartnelson3 merged 1 commit intoprometheus:masterfrom
MIBc:master
May 15, 2019
Merged

Invalid APISecret error if only set default api_secret for wechat#1888
stuartnelson3 merged 1 commit intoprometheus:masterfrom
MIBc:master

Conversation

@MIBc
Copy link
Contributor

@MIBc MIBc commented May 15, 2019

fixes #1887
Signed-off-by: lvjiawei lvjiawei@cmss.chinamobile.com

Copy link
Member

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks legit to me as it removes some confusion about the Wechat configuration and is consistent with what we advocate for the other receivers (eg no templating for secrets and passwords). See #1385 (comment).

Can you also remove this line:

{{ define "wechat.default.api_secret" }}{{ end }}

@MIBc MIBc force-pushed the master branch 2 times, most recently from 79138a8 to 6c90423 Compare May 15, 2019 08:47
@MIBc
Copy link
Contributor Author

MIBc commented May 15, 2019

Thanks for your review @simonpasquier . I have updated it .

@stuartnelson3
Copy link
Contributor

Because the template was changed, you need to regenerate the assets. Can you run make assets and commit that?

@MIBc
Copy link
Contributor Author

MIBc commented May 15, 2019

Yes. I see that.

Signed-off-by: lvjiawei <lvjiawei@cmss.chinamobile.com>
Copy link
Member

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@stuartnelson3 stuartnelson3 merged commit d291471 into prometheus:master May 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use default api_secret, the wechat recevier raise invalid APISecret error

3 participants