Skip to content

Validating new fields on the PagerDuty AM config #5290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 26, 2023

Conversation

alanprot
Copy link
Member

@alanprot alanprot commented Apr 26, 2023

What this PR does:
Validate the PagerDuty config to block setting routing_key_file and service_key_file.

This fields got introduced on: prometheus/alertmanager@1045dc0

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Alan Protasio <[email protected]>
@alanprot alanprot marked this pull request as ready for review April 26, 2023 16:45
Signed-off-by: Alan Protasio <[email protected]>
@alanprot alanprot enabled auto-merge (squash) April 26, 2023 16:53
@alvinlin123 alvinlin123 added this to the Release 1.15.1 milestone Apr 26, 2023
@alanprot alanprot merged commit 8e36c84 into cortexproject:master Apr 26, 2023
alanprot added a commit to alanprot/cortex that referenced this pull request Apr 26, 2023
* Not Allowing to set the new  service_key_file and routing_key_file on AM config

Signed-off-by: Alan Protasio <[email protected]>

* changelog

Signed-off-by: Alan Protasio <[email protected]>

* fix multiples types

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
alanprot added a commit that referenced this pull request Apr 27, 2023
* Handle grpc code resource exhausted for store gateway (#5286)

* handle grpc code resource exhausted for store gateway

Signed-off-by: Ben Ye <[email protected]>

* fix lint

Signed-off-by: Ben Ye <[email protected]>

* update changelog

Signed-off-by: Ben Ye <[email protected]>

* try fixing test

Signed-off-by: Ben Ye <[email protected]>

* try to fix E2E test

Signed-off-by: Ben Ye <[email protected]>

* lint

Signed-off-by: Ben Ye <[email protected]>

* try again

Signed-off-by: Ben Ye <[email protected]>

* fix message

Signed-off-by: Ben Ye <[email protected]>

* remove labels API

Signed-off-by: Ben Ye <[email protected]>

* remove logic to check string contains

Signed-off-by: Ben Ye <[email protected]>

* make limiter vars private

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* Validating new fields on the PagerDuty AM config (#5290)

* Not Allowing to set the new  service_key_file and routing_key_file on AM config

Signed-off-by: Alan Protasio <[email protected]>

* changelog

Signed-off-by: Alan Protasio <[email protected]>

* fix multiples types

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Co-authored-by: Ben Ye <[email protected]>
yeya24 added a commit to yeya24/cortex that referenced this pull request Apr 28, 2023
* Handle grpc code resource exhausted for store gateway (cortexproject#5286)

* handle grpc code resource exhausted for store gateway

Signed-off-by: Ben Ye <[email protected]>

* fix lint

Signed-off-by: Ben Ye <[email protected]>

* update changelog

Signed-off-by: Ben Ye <[email protected]>

* try fixing test

Signed-off-by: Ben Ye <[email protected]>

* try to fix E2E test

Signed-off-by: Ben Ye <[email protected]>

* lint

Signed-off-by: Ben Ye <[email protected]>

* try again

Signed-off-by: Ben Ye <[email protected]>

* fix message

Signed-off-by: Ben Ye <[email protected]>

* remove labels API

Signed-off-by: Ben Ye <[email protected]>

* remove logic to check string contains

Signed-off-by: Ben Ye <[email protected]>

* make limiter vars private

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* Validating new fields on the PagerDuty AM config (cortexproject#5290)

* Not Allowing to set the new  service_key_file and routing_key_file on AM config

Signed-off-by: Alan Protasio <[email protected]>

* changelog

Signed-off-by: Alan Protasio <[email protected]>

* fix multiples types

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Co-authored-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
yeya24 pushed a commit to yeya24/cortex that referenced this pull request Apr 28, 2023
* Not Allowing to set the new  service_key_file and routing_key_file on AM config

Signed-off-by: Alan Protasio <[email protected]>

* changelog

Signed-off-by: Alan Protasio <[email protected]>

* fix multiples types

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants