Skip to content

support loading pushover secrets from files#3200

Merged
simonpasquier merged 6 commits intoprometheus:mainfrom
sr:pushover-file
Jan 18, 2023
Merged

support loading pushover secrets from files#3200
simonpasquier merged 6 commits intoprometheus:mainfrom
sr:pushover-file

Conversation

@sr
Copy link
Contributor

@sr sr commented Jan 3, 2023

Add the user_key_file and token_file keys to the pushover config.

/cc #2498

Signed-off-by: Simon Rozet me@simonrozet.com

sr added 2 commits January 3, 2023 18:32
Add the user_key_file and token_file keys to the pushover config.

/cc prometheus#2498

Signed-off-by: Simon Rozet <me@simonrozet.com>
Signed-off-by: Simon Rozet <me@simonrozet.com>
@sr
Copy link
Contributor Author

sr commented Jan 3, 2023

Huum the test failure looks like a flake?

--- FAIL: TestSilences_Maintenance_SupportsCustomCallback (0.00s)
    silence_test.go:231: 
        	Error Trace:	/root/project/silence/silence_test.go:231
        	Error:      	Not equal: 
        	            	expected: 2
        	            	actual  : 1
        	Test:       	TestSilences_Maintenance_SupportsCustomCallback

The previous commit passed:

https://app.circleci.com/pipelines/github/prometheus/alertmanager/3232

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. Just a few nits on the documentation to have a consistent wording.

@simonpasquier
Copy link
Member

Huum the test failure looks like a flake?

yep, nothing to do with your change.

sr and others added 2 commits January 5, 2023 13:41
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Rozet <me@simonrozet.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Rozet <me@simonrozet.com>
@sr
Copy link
Contributor Author

sr commented Jan 5, 2023

Thanks for the review, I've committed your suggestions.

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.

thanks!

@simonpasquier simonpasquier enabled auto-merge (squash) January 5, 2023 13:00
@sr
Copy link
Contributor Author

sr commented Jan 7, 2023

Do I need to do something to move this forward? Rebase?

@simonpasquier
Copy link
Member

sorry for the late reply!

Do I need to do something to move this forward? Rebase?

I'm investigating why the tests are flaky which could be resolved by #3216 . I'll let you know if you need to rebase after the other PR gets merged :)

@simonpasquier simonpasquier merged commit a8e4c16 into prometheus:main Jan 18, 2023
@sr
Copy link
Contributor Author

sr commented Jan 18, 2023

Sweet, thanks for fixing those flakey tests @simonpasquier 🥂

@sr sr deleted the pushover-file branch January 18, 2023 22:35
hoperays pushed a commit to hoperays/alertmanager that referenced this pull request Apr 23, 2023
* support loading pushover secrets from files

Add the user_key_file and token_file keys to the pushover config.

/cc prometheus#2498

Signed-off-by: Simon Rozet <me@simonrozet.com>
radek-ryckowski pushed a commit to goldmansachs/alertmanager that referenced this pull request Nov 6, 2023
* support loading pushover secrets from files

Add the user_key_file and token_file keys to the pushover config.

/cc prometheus#2498

Signed-off-by: Simon Rozet <me@simonrozet.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.

2 participants