Support prescribed labels #3848
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
Konstantinov-Innokentii
added
the
pr:no public docs
Ferril
reviewed
Feb 8, 2024
engine/apps/labels/utils.py
Outdated
| @@ -16,32 +16,28 @@ | |||
| ASSOCIATED_MODEL_NAME = "AssociatedLabel" | |||
|
|
|||
|
|
|||
| class LabelUpdateParam(typing.TypedDict): | |||
| class Key(typing.TypedDict): | |||
There was a problem hiding this comment.
I'd propose to rename it to LabelKey
Ferril
reviewed
Feb 8, 2024
engine/apps/labels/utils.py
Outdated
|
|
||
|
|
||
| class LabelParams(typing.TypedDict): | ||
| class Value(typing.TypedDict): |
There was a problem hiding this comment.
I'd propose to rename it to LabelValue
Ferril
reviewed
Feb 8, 2024
Ferril
reviewed
Feb 8, 2024
Co-authored-by: Yulya Artyukhina <Ferril.darkdiver@gmail.com>
Co-authored-by: Yulya Artyukhina <Ferril.darkdiver@gmail.com>
Konstantinov-Innokentii
force-pushed
the
prescribed-labels
branch
from
b8a7748 to
3a72579
Compare
vstpme
approved these changes
Feb 16, 2024
| self._update_labels_cache(result) | ||
| return Response(result, status=response.status_code) | ||
| value, response = LabelsAPIClient(organization.grafana_url, organization.api_token).get_value(key_id, value_id) | ||
| # TODO: update_labels_cache expects LabelOption, but get value returns a Value. Investigate, temporary disable. |
There was a problem hiding this comment.
Does this TODO need to be addressed before merging the PR?
There was a problem hiding this comment.
No, it's for future iterations.
engine/apps/labels/models.py
Outdated
| update_labels_cache.apply_async((labels_data,)) | ||
| # Many labels | ||
| update_label_pairs_cache.apply_async((label_pairs,)) | ||
| # update_labels_cache.apply_async((label_pairs,)) |
There was a problem hiding this comment.
Looks like this line should be deleted
# Conflicts: # engine/apps/labels/tasks.py # engine/apps/labels/tests/test_labels_cache.py # grafana-plugin/src/containers/IntegrationLabelsForm/IntegrationLabelsForm.tsx
|
just FYI for next time, this PR introduced linting issues into |
|
@joeyorlando Oh, I thought it was introduced here. Did I bring new one? |
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
# What this PR does **Cleanup label typing:** 1. LabelParam -> two separate types LabekKey and LabelValue 2. LabelData -> renamed to LabelPair. 3. LabelKeyData -> renamed to LabelOption Data is not giving any info about what this type represents. 4. Remove LabelsData and LabelsKeysData types. They are just list of types listed above and with new naming it feels obsolete. 5. ValueData removed. LabelPair is used instead. 6. Rework AlertGroupCustomLabel to use LabelKey type for key to make type system more consistent. Name model type AlertGroupCustomLabel**DB** and api type AlertGroupCustomLabel**API** to clearly distinguish them. **Split update_labels_cache into two tasks** update_label_option_cache and update_label_pairs_cache. Original task was expecting array of LabelsData (now it's LabelPair) OR one LabelKeyData ( now it's LabelOption). I believe having one function with two sp different argument types makes it more complicated for understanding. **Make OnCall backend support prescribed labels**. OnCall will sync and store "prescribed" field for key and values, so Label dropdown able to disable editing for certain labels. ## Which issue(s) this PR fixes ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --------- Co-authored-by: Maxim Mordasov <maxim.mordasov@grafana.com> Co-authored-by: Yulya Artyukhina <Ferril.darkdiver@gmail.com>
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.
What this PR does
Cleanup label typing:
Data is not giving any info about what this type represents.
Split update_labels_cache into two tasks update_label_option_cache and update_label_pairs_cache.
Original task was expecting array of LabelsData (now it's LabelPair) OR one LabelKeyData ( now it's LabelOption). I believe having one function with two sp different argument types makes it more complicated for understanding.
Make OnCall backend support prescribed labels. OnCall will sync and store "prescribed" field for key and values, so Label dropdown able to disable editing for certain labels.
Which issue(s) this PR fixes
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)