amtool to support http_config to access alertmanager #2764

clyang82 · 2021-11-10T07:35:44Z

This PR is to enable amtool using bearerToken to access alertmanager. the use case is expose the alertmanager api via openshift route or k8s ingress, the external amtool can access the exposed alertmanager by providing bearerToken.

Signed-off-by: clyang82 chuyang@redhat.com

roidelapluie · 2021-11-10T08:38:14Z

Thanks! We should error if the user specifies multiple authentication mechanisms.

clyang82 · 2021-11-10T13:38:35Z

/retest

cli/root.go

clyang82 · 2021-11-11T01:16:28Z

Thanks @roidelapluie

roidelapluie · 2021-11-15T23:41:29Z

Wait, I now realize that this is giving the token on the command line, which is insecure. Can we point to a bearer token file instead?

clyang82 · 2021-11-23T15:18:24Z

Sorry for late response. You can put the bearer_token in $HOME/.config/amtool/config.yml or /etc/amtool/config.yml. for example:

alertmanager.url: https://xxx
tls.insecure.skip.verify: true
bearer-token: sha256~xxxxxxx

Does it help? @roidelapluie

roidelapluie · 2021-11-23T16:16:59Z

I am still against it but I do not want to be "on the way" so I have reached the community for more data/ideas/opinions: https://groups.google.com/g/prometheus-developers/c/-lXLx2nYKlk

clyang82 · 2021-11-24T08:10:04Z

Agree with your point that give the token on the command line is insecure. But it is a little complex for the user who needs to create 2 or more files (config.yml and http_client conf file, etc).

clyang82 · 2021-12-03T07:15:46Z

@roidelapluie Can we merge http_config with config.yml? the example of $HOME/.config/amtool/config.yml can be:

alertmanager.url: https://alertmanager
tls.insecure.skip.verify: true
require-comment: false
http_config:
  bearer_token_file: /tmp/bar

roidelapluie · 2021-12-03T09:51:32Z

This is two different things. I would not mix them:

First, the style is different: one is dot.style.keys; the other is snake_case_keys.

Then, they map to different things. I would avois users thinking they can pass the parameters to the command line, like the other values.

Signed-off-by: clyang82 <chuyang@redhat.com>

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com> Signed-off-by: clyang82 <chuyang@redhat.com>

Signed-off-by: clyang82 <chuyang@redhat.com>

cli/root.go

cli/config/http_config.go

cli/root.go

Signed-off-by: clyang82 <chuyang@redhat.com>

simonpasquier

Minor comments, looks good otherwise. Thanks!

cli/config/http_config_test.go

cli/config/http_config.go

cli/config/http_config_test.go

cli/config/http_config.go

cli/root.go

Signed-off-by: clyang82 <chuyang@redhat.com>

cli/root.go

Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: clyang82 <chuyang@redhat.com>

cli/root.go

Signed-off-by: clyang82 <chuyang@redhat.com>

cli/config/http_config.go

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 · 2022-01-14T03:09:22Z

@simonpasquier PTAL if you are OK to merge it in. Thanks.

simonpasquier

lgtm. @roidelapluie could you give a final look in case I've missed anything? thanks!

roidelapluie

LGTM

roidelapluie · 2022-01-19T12:57:35Z

Thanks!

* Support http_config for amtool Co-authored-by: Julien Pivotto <roidelapluie@gmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: clyang82 <chuyang@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com>

* add active time interval Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix active time interval Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix unittests for active time interval Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update notify/notify.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update dispatch/route.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * split the stage for active and mute intervals Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update notify/notify.go Adds doc for a helper function Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update notify/notify.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update notify/notify.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update notify/notify.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix code after commit suggestions Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Making mute_time_interval and time_intervals can coexist in the config Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * docs: configuration's doc has been updated about time intervals Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update config/config.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * updates configuration readme to improve active time description Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * merge deprecated mute_time_intervals and time_intervals Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update cmd/alertmanager/main.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update cmd/alertmanager/main.go Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fmt main.go Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix lint error Signed-off-by: clyang82 <chuyang@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Document that matchers are ANDed together Signed-off-by: Mac Chaffee <me@macchaffee.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Remove extra parentheticals Signed-off-by: Mac Chaffee <me@macchaffee.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * config: root route should have empty matchers Unmarshal should validate that the root route does not contain any matchers. Prior to this change, only the deprecated match structures were checked. Signed-off-by: Philip Gough <philip.p.gough@gmail.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * chore: Let git ignore temporary files for ui/app Signed-off-by: nekketsuuu <nekketsuuu@users.noreply.github.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * adding max_alerts parameter to slack webhook config correcting the logic to trucate fields instead of dropping alerts in the slack integration Signed-off-by: Prashant Balachandran <pnair@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * *: bump to Go 1.17 (#2792) * *: bump to Go 1.17 Signed-off-by: Simon Pasquier <spasquie@redhat.com> * *: fix yamllint errors Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Automate CSS-inlining for default HTML email template (#2798) * Automate CSS-inlining for default HTML email template The original HTML email template was added in `template/email.html`. It looks like the CSS was manually inlined. Most likely using the premailer.dialect.ca web form, which is mentioned in the README for the Mailgun transactional-email-templates project. The resulting HTML with inlined CSS was then copied into `template/default.tmpl`. This has resulted in `email.html` and `default.tmpl` diverging at times. This commit adds build automation to inline the CSS automatically using [juice][1]. The Go template containing the resulting HTML has been moved into its own file to avoid the script that performs the CSS inlining having to parse the `default.tmpl` file to insert it there. Fixes #1939. [1]: https://www.npmjs.com/package/juice Signed-off-by: Brad Ison <bison@xvdf.io> * Update asset/assets_vfsdata.go Signed-off-by: Brad Ison <bison@xvdf.io> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * go.{mod,sum}: update Go dependencies Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * amtool to support http_config to access alertmanager (#2764) * Support http_config for amtool Co-authored-by: Julien Pivotto <roidelapluie@gmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: clyang82 <chuyang@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * notify/sns: detect FIFO topic based on the rendered value Since the TopicARN field is a template string, it's safer to check for the ".fifo" suffix in the rendered string. Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * config: delegate Sigv4 validation to the inner type This change also adds unit tests for SNS configuration. Signed-off-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix unittests Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix comment about active time interval Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * fix another comment about active time interval Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Fix typo in documentation Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> * Update docs/configuration.md Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: Sinuhe Tellez <dubyte@gmail.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com> Co-authored-by: clyang82 <chuyang@redhat.com> Co-authored-by: Mac Chaffee <me@macchaffee.com> Co-authored-by: Philip Gough <philip.p.gough@gmail.com> Co-authored-by: nekketsuuu <nekketsuuu@users.noreply.github.com> Co-authored-by: Prashant Balachandran <pnair@redhat.com> Co-authored-by: Simon Pasquier <pasquier.simon@gmail.com> Co-authored-by: Brad Ison <brad.ison@redhat.com> Co-authored-by: Julien Pivotto <roidelapluie@gmail.com>

roidelapluie reviewed Nov 10, 2021

View reviewed changes

cli/root.go Outdated Show resolved Hide resolved

clyang82 force-pushed the amtool_bearer_token branch from 04a8436 to f10f952 Compare November 11, 2021 01:15

roidelapluie mentioned this pull request Nov 22, 2021

Ability to set request headers of amtool #2597

Open

clyang82 force-pushed the amtool_bearer_token branch from f10f952 to 2ff62e4 Compare December 8, 2021 05:56

clyang82 requested a review from roidelapluie December 8, 2021 05:56

clyang82 force-pushed the amtool_bearer_token branch from 2ff62e4 to e94ae73 Compare December 8, 2021 06:02

clyang82 changed the title ~~amtool to support BearerToken to access alertmanager~~ amtool to support http_config to access alertmanager Dec 8, 2021

clyang82 force-pushed the amtool_bearer_token branch from e94ae73 to 5e7eea0 Compare December 8, 2021 06:20

clyang82 and others added 3 commits December 20, 2021 17:47

amtool to support BearerToken to access alertmanager

e806c2a

Signed-off-by: clyang82 <chuyang@redhat.com>

check multiple authentication mechanisms

d2d3295

Signed-off-by: clyang82 <chuyang@redhat.com>

Update cli/root.go

8dee436

Co-authored-by: Julien Pivotto <roidelapluie@gmail.com> Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from 5e7eea0 to 07714ee Compare December 20, 2021 09:47

Support http_config for amtool

35cbac8

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from 07714ee to 35cbac8 Compare December 20, 2021 13:11

simonpasquier reviewed Dec 20, 2021

View reviewed changes

clyang82 force-pushed the amtool_bearer_token branch from df41a14 to dfcbd82 Compare December 21, 2021 06:02

Address review comments

7cac620

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from dfcbd82 to 7cac620 Compare December 21, 2021 06:11

clyang82 requested a review from simonpasquier December 21, 2021 06:11

Use promconfig.NewClientFromConfig

eabd9c4

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from 17498b9 to eabd9c4 Compare December 24, 2021 01:25

simonpasquier reviewed Jan 5, 2022

View reviewed changes

clyang82 requested a review from simonpasquier January 6, 2022 03:47

clyang82 force-pushed the amtool_bearer_token branch from d6a5a05 to 5b4796f Compare January 6, 2022 03:52

Address comments

9d105f6

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from 5b4796f to 9d105f6 Compare January 6, 2022 04:20

simonpasquier reviewed Jan 7, 2022

View reviewed changes

cli/root.go Outdated Show resolved Hide resolved

clyang82 force-pushed the amtool_bearer_token branch from 7e26e4c to 1fb8047 Compare January 7, 2022 10:49

Update cli/root.go

0625f90

Co-authored-by: Simon Pasquier <spasquie@redhat.com> Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 force-pushed the amtool_bearer_token branch from 1fb8047 to 0625f90 Compare January 7, 2022 10:56

clyang82 requested a review from simonpasquier January 7, 2022 11:40

simonpasquier reviewed Jan 7, 2022

View reviewed changes

cli/root.go Outdated Show resolved Hide resolved

address comments

0d2945d

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 requested a review from simonpasquier January 8, 2022 02:07

simonpasquier reviewed Jan 11, 2022

View reviewed changes

cli/config/http_config.go Show resolved Hide resolved

resolve relative paths

4b62a7f

Signed-off-by: clyang82 <chuyang@redhat.com>

clyang82 requested a review from simonpasquier January 11, 2022 14:41

simonpasquier approved these changes Jan 19, 2022

View reviewed changes

roidelapluie approved these changes Jan 19, 2022

View reviewed changes

roidelapluie merged commit ef25f81 into prometheus:main Jan 19, 2022

clyang82 deleted the amtool_bearer_token branch January 19, 2022 12:52

FUSAKLA mentioned this pull request Oct 24, 2022

Promtool: add http config support to query commands prometheus/prometheus#11487

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

amtool to support http_config to access alertmanager #2764

amtool to support http_config to access alertmanager #2764

clyang82 commented Nov 10, 2021

roidelapluie commented Nov 10, 2021 •

edited

Loading

clyang82 commented Nov 10, 2021

clyang82 commented Nov 11, 2021

roidelapluie commented Nov 15, 2021

clyang82 commented Nov 23, 2021

roidelapluie commented Nov 23, 2021

clyang82 commented Nov 24, 2021

clyang82 commented Dec 3, 2021

roidelapluie commented Dec 3, 2021

simonpasquier left a comment

clyang82 commented Jan 14, 2022

simonpasquier left a comment

roidelapluie left a comment

roidelapluie commented Jan 19, 2022

amtool to support http_config to access alertmanager #2764

amtool to support http_config to access alertmanager #2764

Conversation

clyang82 commented Nov 10, 2021

roidelapluie commented Nov 10, 2021 • edited Loading

clyang82 commented Nov 10, 2021

clyang82 commented Nov 11, 2021

roidelapluie commented Nov 15, 2021

clyang82 commented Nov 23, 2021

roidelapluie commented Nov 23, 2021

clyang82 commented Nov 24, 2021

clyang82 commented Dec 3, 2021

roidelapluie commented Dec 3, 2021

simonpasquier left a comment

Choose a reason for hiding this comment

clyang82 commented Jan 14, 2022

simonpasquier left a comment

Choose a reason for hiding this comment

roidelapluie left a comment

Choose a reason for hiding this comment

roidelapluie commented Jan 19, 2022

roidelapluie commented Nov 10, 2021 •

edited

Loading