ACM-1783: Upgrade grafana to 8.5.20 #96
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
…#48584) * refactor: replace uses of checked prop for <Switch> with value prop * fix: remove spaces from ids The ID format is stated as follows([source][1]): > ID and NAME tokens must begin with a letter ([A-Za-z]) and may be followed by any number of letters, digits ([0-9]), hyphens ("-"), underscores ("_"), colons (":"), and periods ("."). Since `QueryHeaderSwitch` is used in two places I created a new variable that replaces spaces with a dash in the label. [1]: https://www.w3.org/TR/html401/types.html#type-name * fix: allow Switch in AlertingSettings to be focused by keyboard * fix: allow Switch in PromSettings to be focused by keyboard Fixes grafana#46472 Co-authored-by: Elfo404 <me@giordanoricci.com> (cherry picked from commit c57924e) Co-authored-by: Adam Simpson <adam@adamsimpson.net>
…rn full list of functions (grafana#47663) (grafana#48594) * add response type text to graphite datasource http options to return full list of functions * add comment for adding response type text to call to graphite /functions endpoint * Add tests for invalid and valid JSON mocking backendSrv fromFetch * remove unnecessary code from tests * remove extra logic for graphite /functions endpoint returning {} grafana#46681 * add graphite functions list logic back in to see why alert test broke * fix conflict message * fix conflicts * fix issues with rebase, add responseType text back in, remove extra graphite functions list logic checks * add email for license/cla check (cherry picked from commit 4867a6b) Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
…rafana#48597) Fixes grafana#48558 I had to rebase in some additional changes from grafana#47907 (specifically 87de4d7) Co-authored-by: Adam Simpson <adam@adamsimpson.net>
) (grafana#48591) * Elasticsearch: Add deprecation notice for old versions * Add option to remove notice * Remove deprecation from editor * Update * Update public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx * Simplify * Update documentation * Update * Update docs/sources/datasources/elasticsearch.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> (cherry picked from commit da1d34e) Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* AzureMonitor: Add support for not equals and startsWith operators when creating Azure Metrics dimension filters. (grafana#48077) * Allow dimension operator selection - Add dimension operators and function to update the operator in the query - Add logic to ensure the same dimension cannot be selected multiple times (Azure restriction) - Add selection component * Update backend logic to default operation and filter to eq '*' - This must be done as the ne and sw operators do not work with the wildcard filter * Add tests on dimension operators * Correct placement of 'and' when building query * Add comment and simplify filtering logic * Allow multiSelect for eq and ne operators - Pass PanelData to DimensionFields component - Add logic to retrieve labels from PanelData - Add MultiSelect component for relevant operators - Update frontend types to allow filter to be an array of strings - Update backend types to allow filter to be an array of strings - Update filter string building * Improve setting of labels * Update go tests * Update frontend tests - Add panelData mock (to be expanded later) - Update null check in DimensionFields * Allow custom value and set default * Add frontend test and fix lint issues * Improved handling of options for sw operator * Remove changes related to multiselect * Add check on refId to ensure dimension labels are correct for query * Extract custom hook for setting dimension labels * Add documentation around Azure Monitor metrics dimensions * Update MetricQueryEditor tests - Add missing data prop * Correctly set field values * Add additional expect for onQueryChange * Correctly set operators - Simplify onFilterInputChange * Ensure no duplicate filters appear * Ensure that filters are displayed correctly for saved queries * Update dimension filter test * Include additional test around changing dimension labels (cherry picked from commit d7c16e0) # Conflicts: # public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx # public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/MetricsQueryEditor.test.tsx # public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/MetricsQueryEditor.tsx # public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/QueryEditor.tsx * Update test for older testing-library version
* backport alias fixes * Delete about-rbac.md * Delete assign-rbac-roles.md * Delete plan-rbac-rollout-strategy.md * Delete manage-rbac-roles.md * revert to 8.5
(cherry picked from commit 3ee9982) Co-authored-by: jcolladokuri <jcolladokuri@microsoft.com>
(cherry picked from commit 7f4b1b7) Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* resolve conflicts * update swagger docs
(cherry picked from commit 9e3a01a) Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
(cherry picked from commit 9622e74)
…48681) (grafana#48686) (cherry picked from commit f45dc22)
…afana#48657) (grafana#48687) (cherry picked from commit b71aa91) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
…ana#48685) (cherry picked from commit e04d8fc) Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
…afana#48703) (cherry picked from commit f85e758) Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
…8757) * Initial support for grafana or cloud only alert managers * Handle missing alert manager * Refactor code, fix tests * Fix redirect url * Bring back the test * Improve missing alert manager warning, add useAlertManagerSourceName tests * Fix lint errors * Rename alert manager hook * Refactor alert manager label creation * Improve warnings' messages * Fix linter * Fix warning condition in RuleEditor (cherry picked from commit 65d7d46) Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
grafana#48748) (grafana#48764) (cherry picked from commit af57804) Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
…na#48660) (grafana#48785) (cherry picked from commit 6de7728) Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
…rations behind feature flags (grafana#48663) (grafana#48666) (cherry picked from commit 38fc0c6) Co-authored-by: Jeff Levin <jeff@levinology.com>
* Alerting: Provisioning message templates (grafana#48665) * Generate API for writing templates * Persist templates app logic layer * Validate templates * Extract logic, make set and delete methods * Drop post route for templates * Fix response details, wire up remainder of API * Authorize routes * Mirror some existing tests on new APIs * Generate mock for prov store * Wire up prov store mock, add tests using it * Cover cases for both storage paths * Add happy path tests and fix bugs if file contains no template section * Normalize template content with define statement * Tests for deletion * Fix linter error * Move provenance field to DTO * empty commit * ID to name * Fix in auth too (cherry picked from commit 0f56462) * ErrorContains -> Error then Contains Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* Fix notification route removal * fix tests Co-authored-by: gillesdemey <gilles.de.mey@gmail.com> (cherry picked from commit ee8e125) Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
(cherry picked from commit 3c78196) Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* SVG: Add dompurify preprocessor step (grafana#698) * add sanitized SVG component (cherry picked from commit dbbe819368f507b9493b7a3cf6e080a5dd752b3e) * Remove unused import to fix build * Fix lint issues * Remove additional class handling as not needed Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
"Release: Updated versions in package to 8.5.20"
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
Signed-off-by: Disaiah Bennett <dbennett@redhat.com>
|
SonarCloud Quality Gate failed.
|
|
/override ci/prow/sonar-pre-submit To avoid prolonging this PR, I will override the sonar job. I will create an issue to update the test coverage that is provided in this repo since it is not meeting the standard quality gate. |
|
@dislbenn: Overrode contexts on behalf of dislbenn: ci/prow/sonar-pre-submit In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dislbenn, subbarao-meduri The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
dislbenn
changed the title
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.
Jira issue: https://issues.redhat.com/browse/ACM-1783