Skip to content
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

Add support for promQL condition type in AlertPolicy #8448

Merged
merged 11 commits into from
Jul 26, 2023

Conversation

jedouard1994
Copy link
Contributor

@jedouard1994 jedouard1994 commented Jul 25, 2023

Resolves hashicorp/terraform-provider-google/issues/15292.

Adds support for promQL condition type in AlertPolicy.

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Generated Terraform providers, and ran make test and make lint in the generated providers to ensure it passes unit and linter tests.
  • Ran relevant acceptance tests using my own Google Cloud project and credentials (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read Write release notes before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

monitoring: added `condition_prometheus_query_language` field to `google_monitoring_alert_policy` resource

@modular-magician
Copy link
Collaborator

Oops! It looks like you're using an unknown release-note type in your changelog entries:

  • REPLACEME

Please only use the types listed in https://github.com/GoogleCloudPlatform/magic-modules/blob/master/.ci/RELEASE_NOTES_GUIDE.md.

@modular-magician
Copy link
Collaborator

Hello! I am a robot. It looks like you are a community contributor. @c2thorn, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 337 insertions(+))
Terraform Beta: Diff ( 3 files changed, 337 insertions(+))
TF Conversion: Diff ( 3 files changed, 95 insertions(+), 3 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_monitoring_alert_policy (1 total tests)
Untested fields: conditions.condition_prometheus_query_language.evaluation_interval, conditions.condition_prometheus_query_language.query, conditions.condition_prometheus_query_language.alert_rule, conditions.condition_prometheus_query_language.duration, conditions.condition_prometheus_query_language.labels, conditions.condition_prometheus_query_language.rule_group

Please add acceptance tests which include these fields.

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2882
Passed tests 2579
Skipped tests: 301
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccMonitoringAlertPolicy|TestAccContainerAwsNodePool_BetaBasicHandWritten

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccMonitoringAlertPolicy[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 340 insertions(+))
Terraform Beta: Diff ( 3 files changed, 340 insertions(+))
TF Conversion: Diff ( 3 files changed, 95 insertions(+), 3 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_monitoring_alert_policy (1 total tests)
Untested fields: conditions.condition_prometheus_query_language.labels, conditions.condition_prometheus_query_language.rule_group, conditions.condition_prometheus_query_language.evaluation_interval, conditions.condition_prometheus_query_language.query, conditions.condition_prometheus_query_language.alert_rule, conditions.condition_prometheus_query_language.duration

Please add acceptance tests which include these fields.

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2882
Passed tests 2579
Skipped tests: 301
Affected tests: 2

Action taken

Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccMonitoringAlertPolicy|TestAccContainerAwsNodePool_BetaBasicHandWritten

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{green}{\textsf{Tests passed during RECORDING mode:}}$
TestAccMonitoringAlertPolicy[Debug log]

Rerun these tests in REPLAYING mode to catch issues

$\textcolor{green}{\textsf{No issues found for passed tests after REPLAYING rerun.}}$


$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

Copy link
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

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

linter doesn't like some trailing white spaces

mmv1/products/monitoring/AlertPolicy.yaml Outdated Show resolved Hide resolved
mmv1/products/monitoring/AlertPolicy.yaml Outdated Show resolved Hide resolved
@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 340 insertions(+))
Terraform Beta: Diff ( 3 files changed, 340 insertions(+))
TF Conversion: Diff ( 3 files changed, 95 insertions(+), 3 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_monitoring_alert_policy (1 total tests)
Untested fields: conditions.condition_prometheus_query_language.query, conditions.condition_prometheus_query_language.alert_rule, conditions.condition_prometheus_query_language.duration, conditions.condition_prometheus_query_language.labels, conditions.condition_prometheus_query_language.rule_group, conditions.condition_prometheus_query_language.evaluation_interval

Please add acceptance tests which include these fields.

@modular-magician
Copy link
Collaborator

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 340 insertions(+))
Terraform Beta: Diff ( 3 files changed, 340 insertions(+))
TF Conversion: Diff ( 3 files changed, 95 insertions(+), 3 deletions(-))

Missing test report

Your PR includes resource fields which are not covered by any test.

Resource: google_monitoring_alert_policy (1 total tests)
Untested fields: conditions.condition_prometheus_query_language.evaluation_interval, conditions.condition_prometheus_query_language.query, conditions.condition_prometheus_query_language.alert_rule, conditions.condition_prometheus_query_language.duration, conditions.condition_prometheus_query_language.labels, conditions.condition_prometheus_query_language.rule_group

Please add acceptance tests which include these fields.

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2884
Passed tests 2582
Skipped tests: 301
Affected tests: 1

Action taken

Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
TestAccContainerAwsNodePool_BetaBasicHandWritten

Get to know how VCR tests work

@modular-magician
Copy link
Collaborator

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccContainerAwsNodePool_BetaBasicHandWritten[Error message] [Debug log]

$\textcolor{red}{\textsf{Please fix these to complete your PR.}}$
View the build log or the debug log for each test

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.

google_monitoring_alert_policy doesn't support promQL condition types
3 participants