Skip to content

Hide sensitive Wechat configuration + remove default fields#1253

Merged
stuartnelson3 merged 2 commits intoprometheus:masterfrom
simonpasquier:fix-wechat-secret
Mar 2, 2018
Merged

Hide sensitive Wechat configuration + remove default fields#1253
stuartnelson3 merged 2 commits intoprometheus:masterfrom
simonpasquier:fix-wechat-secret

Conversation

@simonpasquier
Copy link
Member

No description provided.

@simonpasquier simonpasquier changed the title Hide sensitive Wechat configuration Hide sensitive Wechat configuration + remove default fields Feb 22, 2018
},
Message: `{{ template "wechat.default.message" . }}`,
APISecret: `{{ template "wechat.default.api_secret" . }}`,
ToUser: `{{ template "wechat.default.to_user" . }}`,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why aren't these templated? We do for other notifiers.

Copy link
Member Author

Choose a reason for hiding this comment

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

I must admit I have no clue. @songjiayang any insight?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hi, guys, I don't known the benefit of templated this fields, I support to delete it like @simonpasquier pr.

Copy link
Contributor

Choose a reason for hiding this comment

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

I say we leave it in and just update the wechat secrets to the Secret type for this PR.

Copy link
Member Author

@simonpasquier simonpasquier Feb 27, 2018

Choose a reason for hiding this comment

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

Ack @stuartnelson3. I've rebased the PR to remove the commit on the templated fields.

@stuartnelson3 stuartnelson3 merged commit e67aa8e into prometheus:master Mar 2, 2018
@whybeyoung
Copy link
Contributor

@stuartnelson3 sorry about didn't solve the issues theses days because of some individual things.
and @songjiayang thanks you help me solve the issue. 感谢!

@simonpasquier simonpasquier deleted the fix-wechat-secret branch March 13, 2018 08:59
hh pushed a commit to ii/alertmanager that referenced this pull request Apr 2, 2019
…heus#1253)

The cpu frequency information is not always needed and/or available.
This change allows the cpu frequency metrics to be enabled/disabled
separately from the other cpu metrics, and also prevents a frequency
metric failure (such as a parse error) from failing the main cpu
collector.

Fixes prometheus#1241

Signed-off-by: Paul Gier <pgier@redhat.com>
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.

5 participants