Periodic chatops proxy sync #4565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…' into post_stack_slug_to_chatops_proxy
Konstantinov-Innokentii
had a problem deploying
to
github-pages
GitHub Actions
Failure
Konstantinov-Innokentii
added
pr:no public docs
Konstantinov-Innokentii
had a problem deploying
to
github-pages
GitHub Actions
Error
Konstantinov-Innokentii
had a problem deploying
to
github-pages
GitHub Actions
Failure
joeyorlando
reviewed
Jun 20, 2024
| try: | ||
| register_oncall_tenant(org) | ||
| except ChatopsProxyAPIException as api_exc: | ||
| # TODO: once tenants upsert api is released, remove this check |
There was a problem hiding this comment.
It's change on chatops-proxy which make tenants/register update tenant with stack_id and cluster slug instead of returning 409 on conflict
joeyorlando
approved these changes
Jun 20, 2024
| SERVICE_TYPE_ONCALL, | ||
| stack_id, | ||
| ) | ||
| register_oncall_tenant(org) | ||
| except Exception as e: |
There was a problem hiding this comment.
down below in the call to register_oncall_tenant_async.apply_async, aren't you missing the new stack_slug kwarg to pass in?
There was a problem hiding this comment.
Yep, nice catch
engine/apps/chatops_proxy/utils.py
Outdated
| def uninstall_slack(stack_id: int, grafana_user_id: int) -> bool: | ||
| """ | ||
| uninstall_slack uninstalls slack integration from chatops-proxy and returns bool indicating if it was removed. | ||
| If such installation does not exist - returns True as well.s |
There was a problem hiding this comment.
Suggested change
| If such installation does not exist - returns True as well.s | |
| If such installation does not exist - returns True as well. |
engine/apps/chatops_proxy/utils.py
Outdated
| ) | ||
| return False | ||
|
|
||
| return removed is True |
There was a problem hiding this comment.
isn't removed always a boolean? what about returning return removed?
# Conflicts: # engine/apps/chatops_proxy/tasks.py # engine/apps/chatops_proxy/utils.py # engine/apps/slack/views.py # engine/apps/user_management/models/organization.py
Konstantinov-Innokentii
had a problem deploying
to
github-pages
GitHub Actions
Failure
Konstantinov-Innokentii
temporarily deployed
to
github-pages
GitHub Actions
Inactive
Konstantinov-Innokentii
temporarily deployed
to
github-pages
GitHub Actions
Inactive
Konstantinov-Innokentii
removed this pull request from the merge queue due to a manual request
Konstantinov-Innokentii
had a problem deploying
to
github-pages
GitHub Actions
Error
Konstantinov-Innokentii
temporarily deployed
to
github-pages
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a pediodic job to sync tenants with chatops-proxy. Register request will behave as upsert, allowing us to backfill new tenant's columns: stack_id and stack_slug. Upsert is not merged on chatops-proxy, so that's why task handling 409 status on /tenants/register request.
On top of that, I did small refactoring and introduced a new register_oncall_tenant func, which receives org as an argument to not to write
register_tenant(org.uuid, org.stack_id, org.stack_slug,.....)every time.Part of https://github.com/grafana/oncall-gateway/issues/247
Need to be merged after #4559.