Fix: Email and username trimming and invitation validation #58449
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
* Trim leading and trailing whitespaces from email and username on signup * Check whether the provided email address is the same as where the invitation sent
Jguer
added
no-backport
Jguer
requested review from
sakjur,
papagian and
ying-jeanne
and removed request for
a team
mgyongyosi
approved these changes
Nov 14, 2022
openshift-merge-robot
pushed a commit
to stolostron/grafana
that referenced
this pull request
Feb 22, 2023
* A11y: Fix remaining focus issues with Switch (#48376) (#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 #46472
Co-authored-by: Elfo404 <me@giordanoricci.com>
(cherry picked from commit c57924e332283bd107886a9b01123edda4f29f8d)
Co-authored-by: Adam Simpson <adam@adamsimpson.net>
* Graphite Datasource: add responseType: 'text' to http options to return full list of functions (#47663) (#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 {} #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 4867a6b15f5a8c8516f12b6afe1443de9932ef07)
Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
* CloudWatch: fix variable query tag migration (#48587)
* Variables: allow Regex tooltip links to be clickable (#48560) (#48597)
Fixes #48558
I had to rebase in some additional changes from #47907 (specifically 87de4d7)
Co-authored-by: Adam Simpson <adam@adamsimpson.net>
* add alias to fix 404 error (#48599) (#48601)
* Elasticsearch: Add deprecation notice for < 7.10 versions (#48506) (#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 da1d34e83da75af01d0ee6ad6fad42ff3f76dce3)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* Backport 48077 to v8.5.x (#48620)
* AzureMonitor: Add support for not equals and startsWith operators when creating Azure Metrics dimension filters. (#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 d7c16e06d2d1f1510f78446f039bb82f8e42f599)
# 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
* docs: backport alias fixes (#48464)
* 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
* AzureMonitor: Updates allowed namespaces (#48468) (#48634)
(cherry picked from commit 3ee99821bccb8957d8e8349de55e46d6980f8a79)
Co-authored-by: jcolladokuri <jcolladokuri@microsoft.com>
* loki: backend: use millisecond-timestamps (#48630)
* Add new DynamoDB metrics & dimensions (#48551) (#48632)
(cherry picked from commit 7f4b1b767ebabba98d9f5dc49f0b6316f5703cd3)
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* [v8.5.x] Backport 48550 to v8.5.x (#48656)
* resolve conflicts
* update swagger docs
* Alerting: skip flaky test (#48500) (#48517)
(cherry picked from commit 9e3a01a1bea3f4d5d99e53d55128d79160610349)
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
* Fix permission query for postgres (#48543) (#48568)
(cherry picked from commit 9622e7457eb4e77832f0930af31d4a3b68a3d651)
* QueryGroup: More efficient way to scroll to bottom when adding new queries (#48399) (#48457)
* "Release: Updated versions in package to 8.5.2" (#48680)
* ReleaseNotes: Updated changelog and release notes for 8.5.2 (#48681) (#48686)
(cherry picked from commit f45dc224d9d98bac67505a1ecdf0a83e569a34bc)
* TimeRange: Fixes updating time range from url and browser history (#48657) (#48687)
(cherry picked from commit b71aa912c6420d248177cf9027cc0dd2bdb894ed)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Alerting: correctly show all alerts in a folder (#48684) (#48685)
(cherry picked from commit e04d8fca7b2d5fcd9bc4fb28888ac4f72553cb58)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* unhide alert rule's data sources during migraiton (#48559) (#48703)
(cherry picked from commit f85e758972450e987a0a481c23eefc14e36ba8bf)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* Variables: Fixes issue with null variables breaking the dropdown (#48644) (#48702)
* Alerting: Improved RBAC for Alert managers (#48344) (#48757)
* 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 65d7d466d781e2183041a46b7881e1e574ab50e0)
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* Tooltip: Make tooltip use secondary background color for legible links (#48748) (#48764)
(cherry picked from commit af578045136a76c2e59ae308c3045abf5efaa8ad)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* FileUpload: associate the label with the input (#48766) (#48779)
* FileUpload: associate the label with the input
* generate a unique id and set the correct role
* add a test to prevent regressions
(cherry picked from commit 10db6182046964cda9eb1be1f1b627e636e90c48)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* Prometheus: make parsing of Infinity variants case-insensitive (#48660) (#48785)
(cherry picked from commit 6de77283c682e8baba133250f67453a03fdbf5bf)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Update documentation to explicitly state we should not be putting migrations behind feature flags (#48663) (#48666)
(cherry picked from commit 38fc0c68e4ed4825eebaba182741e65f9c26a3b7)
Co-authored-by: Jeff Levin <jeff@levinology.com>
* [v8.5.x] Alerting: Provisioning message templates (#48789)
* Alerting: Provisioning message templates (#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 0f56462fbeb149c055158fa1ad2c549473b1b884)
* ErrorContains -> Error then Contains
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* Alerting: Fix notification route removal (#48774) (#48799)
* Fix notification route removal
* fix tests
Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
(cherry picked from commit ee8e1251340688bc98e0d2f580e8ce1ce456ff29)
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* backport 48171 (#48775)
* fix a bug (#48782) (#48800)
(cherry picked from commit 3c78196d0be3c22671b8a92a4f2c8b463abd80eb)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Cloudwatch: Add support for new AWS/RDS EBS* metrics (#48798) (#48801)
Add support for the missing AWS/RDS metrics, EBSIOBalance% and
EBSByteBalance%. Change is based on the official AWS blog post[1]. Those
metrics work on for Nitro instances.
1. https://aws.amazon.com/blogs/compute/improving-application-performance-and-reducing-costs-with-amazon-ebs-optimized-instance-burst-capability/
(cherry picked from commit b6c5f29373c0759799661647a861a279c9930b8a)
Co-authored-by: Szymon Szypulski <szymon.szypulski@gmail.com>
* RolePicker: Fix menu position on smaller screens (#48429) (#48809)
* RolePicker: Fix menu position on smaller screens
* RolePicker: Add comment
* Add offset for the bottom position
(cherry picked from commit 25b4aa8d86013a409a50c92e4a6e8f45db790438)
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Alerting: automatically select last expression (#48787) (#48818)
(cherry picked from commit 2d6ab03e4f15ba05e3699a72b304de2c4ee1051a)
* Alerting: check provenance of alert rules in current API (#48694) (#48827)
(cherry picked from commit 30d9cc81ec0b54de39a480989bc0a35270277ae7)
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
* POST routes to PUT routes (#48828) (#48829)
(cherry picked from commit 809aa38103771726aa3a6208a87f8138d6d15ea6)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* Put identifier in path (#48831) (#48832)
(cherry picked from commit 99eaa0fc206a5829fee973c02e92793d8e0a3c2d)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* chore: update contribution docs (#46942) (#48732)
* add bus deprecation note in contribution docs
(cherry picked from commit dac8abfc2c9a5dfb0097440f3188e64f27f030d4)
Co-authored-by: Jeff Levin <jeff@levinology.com>
* Alerting: Apply Custom Headers to datasource queries. (#47860) (#48851)
Backport 53a4f39 from #47860
* Dashboard: Fix dashboard update permission check (#48746) (#48853)
* Change dash permission check for dashboards that are moved to a different folder
(cherry picked from commit 6923b4c6c6787e53d05694d3788864f6e3bd5afb)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Encryption: Add Prometheus metrics (#48603) (#48888)
* Encryption: Add Prometheus metrics (#48603)
(cherry picked from commit 9826a694a879a66ffe0bb18f4d19af8793ed60f3)
* Conflicts solved from commit 9826a69
* Transformation: Added variance and standard deviation (#48844) (#48921)
* Transformation: Added variance and standard deviation for sample and population. Modified mean calculation approach
* Transformation: Removed existing mean calculation
* Transformation: Added testcases for variance and Standard deviation
* Update docs/sources/panels/calculation-types.md
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 906484b809a1e4df219fc7dd3b7fe8c34e31fda9)
Co-authored-by: selvavm <selvavm@hotmail.com>
* Update dashboard-header.md (#46986) (#48987)
Just a tiny typo -> point 4, "homw" to "home"
(cherry picked from commit 6f1f7cdc88017287ae227030d59ea64dbe81e52b)
Co-authored-by: Anind Kiran <53901204+AnindKiran@users.noreply.github.com>
* Add note to docs: log out / in after plugin add. (#47666) (#48986)
(cherry picked from commit 08268d87138831b5849a28559fc5b255c28f0044)
Co-authored-by: Dan Roscigno <dan@roscigno.com>
* Expressions: adds inline documentation for the Math expression (#48784) (#48999)
(cherry picked from commit 1a7ca3f0de35d8e81d0e67c18f51e0ea95926e1f)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Alerting: Allow disabling override timings for notification policies (#48648) (#49001)
(cherry picked from commit fa37c6c9d3ddcd79f0d238865a0df56fdfd60d56)
* Revert "Transformation: Added variance and standard deviation (#48844) (#48921)" (#48996)
This reverts commit 4597c33c3fadb6b5aa14b543b1960df889fd690e.
* TimeSeries: insert null values at each missing interval (#49036) (#49047)
(cherry picked from commit eecdbebf75488665720530392a9fdf613826d49e)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* [v8.5.x] TimeSeries: Fix detection & rendering of sparse datapoints (#49050)
* TimeSeries: Fix detection & rendering of sparse datapoints (#48841)
(cherry picked from commit 84d4ce51addb5f88abd53b9b2787d4c18409fc01)
* revert annotations list datasource
* revert more
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Encryption: Split database transactions within migration/rollback commands (#48394) (#49038)
(cherry picked from commit 6c4eae710f4ce770a654dbb25650b181dead4ab0)
* [v8.5.x] Alerting: Provisioning GET routes for mute timings (#49113)
* Alerting: Provisioning GET routes for mute timings (#49044)
* Define GET routes and run codegen
* Wire up forked and non-generated API
* Implement and wire
* Tests, authorization
* Fix linter error
(cherry picked from commit 9af30f6570fef5a865f1b77eb65a57c6a63eab57)
* ErrorContains -> Error, then Contains
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* Fix CloudWatch: Add missing ELB metrics #48756 (#48985) (#49114)
* Fix CloudWatch: Add missing ELB metrics #48756
* run go fmt
(cherry picked from commit 78287618abab16b6de2a2b2561007b40c7521101)
Co-authored-by: qs_pang <qingshuang.pang@gmail.com>
* Tooltip: Sort decimals using standard numeric compare (#49084) (#49093)
* Failing test case
* Compare numeric values not using collator
(cherry picked from commit 6a5a0e577063947fe778efb9c2e56dca44beb54a)
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* Alerting: Do not serve alerting images from root (#49022) (#49135)
Manually tested with serve_from_sub_path = true and a custom pathUrl
(cherry picked from commit 0a44fbdd42936a59015ce3e969e7d497361ba8a9)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* fetch permissions by uid (#49100) (#49134)
(cherry picked from commit 5c4ebb6f341973fffdd8a751b90caeeefd579e6f)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* Alerting: Fix Loki buildinfo request error (#49073) (#49144)
* Skip buildinfo fetching for Loki data sources
* Fix and add tests
* Fix linter
* Improve typings
* Improve Loki's buildinfo notice
* Fix rename, improve prom app display name
(cherry picked from commit 43ab0c1f957425d74905d121f390d175a7da9d26)
* LibraryPanels: Fix library panels not connecting properly in imported dashboards (#49161) (#49176)
* Use saved dashboard model to create library panel connections when importing
* Rename variables in dashboard import for clarity
(cherry picked from commit 71e13053646e55c1aebb9ac7365e0ec760afcea9)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Fix flaky test. Sort records and only test the important fields (#49120) (#49191)
(cherry picked from commit 81e368dbb5b3b87c2051ad990f9cdaffa56af301)
* Indicate whether templates are provisioned (#49025) (#49194)
(cherry picked from commit 25da759bf22b005dc716927f8bb52f7f07e85d35)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* List Azure Devops as an enterprise plugin (#49189) (#49196)
* list azure devops as an enterprise plugin
* change base url to grafana.com/grafana/plugins and remove trailing slashes for consistency
(cherry picked from commit 5b52a1c391234bab5d548f7393b7c79391fe41a1)
Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
* Templating: Prefix variable picker element IDs (#48405) (#48682)
(cherry picked from commit bb7e556efcfd625af64f03cada17707a621e8516)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Alerting: Fix flaky migration test (#48595) (#49190)
* Fix flaky migration test
(cherry picked from commit 5c32a6b6f60edbc311261e08407cd906832641ee)
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
* Alerting: Update migration to migrate only alerts that belong to existing org\dashboard (#49192) (#49199)
* Update migration to migrate only alerts that belong to existing org\dashboard
(cherry picked from commit d87fdc10375fe208898fca79132d3b15974664ec)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* Alerting: Fix anonymous access to alerting (#49203) (#49268)
* introduce a fallback handler that checks that role is Viewer.
* update UI nav links to allow alerting tabs for anonymous user
* update rule api to check for Viewer role instead of SignedIn when RBAC is disabled
(cherry picked from commit f7f22530720cebd57f3ef802c1c5300583615d2d)
* "Release: Updated versions in package to 8.5.3" (#49274)
* OAuth: make oauth case insensitive match for email (#49252) (#49264)
(cherry picked from commit 8919c8b014be18eb763f31f09e1f1229abc9851d)
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
* Security: fixes CVE-2022-29170 (#49240) (#49254)
* Request interceptor: block redirects
* handle location missing
* Update pkg/infra/httpclient/httpclientprovider/host_redirect_validation_middleware.go
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Update pkg/infra/httpclient/httpclientprovider/host_redirect_validation_middleware.go
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* linter
* fixes tests
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit aad29833506bac717ff28781bdb3c1b32416eb92)
Co-authored-by: Leonard Gram <leo@xlson.com>
* CloudWatch: migrate old variable queries with empty array (#49197) (#49269)
(cherry picked from commit 66220758b30ebbb9f0b9594defd7bba0273c7eaf)
* Transforms: Labels to fields, fix label picker layout (#49304) (#49343)
(cherry picked from commit c3a5ff1eebce87a5ab6e85319b9d46e0aa983d51)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* GrafanaUI: Fix color of links in error Tooltips in light theme (#49327) (#49345)
* GrafanaUI: Fix color of links in input validation errors in light theme
* Change colors
(cherry picked from commit 426ca2999eeb93294c23d0e333bc0a75630d5e6d)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Alerting: Fix RBAC actions for notification policies (#49185) (#49348)
* squash actions "alert.notifications:update", "alert.notifications:create", "alert.notifications:delete" to "alert.notifications:write"
* add migration
* update UI to use the write action
* update docs
* changelog
(cherry picked from commit 258b3ab18b6e13aeaf48003361a2f23d65ecaf01)
* Encryption: Add support for decrypting ciphertexts with algorithm metadata (#49312) (#49336)
(cherry picked from commit 15605b6c80652806755a3720b88c563f61d30e8d)
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
* Alerting: Fix notification policies label matchers layout (#49159) (#49164)
(cherry picked from commit 0ae8e3bd4e8f133249cc34c8117ccdd0237adf9a)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* AzureMonitor: Fixes metric definition for Azure Storage queue/file/bl… (#49412)
* AzureMonitor: Fixes metric definition for Azure Storage queue/file/blob/table resources. (#49101)
* Appropriately set metric definition
- Nested storage account resources (queues/blobs/tables/files) require metric definition of Microsoft.Storage/storageAccounts
- Update tests accordingly
* Restructure getResourceNames test
- Add expect on getResource args
* Update to fix issue for new query editor
- Reconstruct resourceUri if the resource is a storage account
- Correctly push storage namespaces as options for metric namespaces
- Filter options appropriately
* Fix duplicate options
* Fix lint issues
* Add comment explaining URI modification
(cherry picked from commit 34fa7b493cd1a38145f3ca2f0514ac4a10bea497)
# Conflicts:
# public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
# public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts
# public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/dataHooks.ts
* Fix lint issue
* Plugins: Fix Azure Devops plugin link and plugins list order (#49394) (#49432)
* Plugins: Fix Azure Devops plugin link and plugins list order
* tests added for plugins sorting
(cherry picked from commit f9d1d8370f651f621a12d82fec44bc5818ffee0d)
Co-authored-by: Sriram <yesoreyeram@gmail.com>
* Parse template when validating it (#49282) (#49284)
(cherry picked from commit e8b498fe8b7612d20cde106bc4d46c5aee93842d)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* [v8.5.x] Alerting: Fix access to alerts for viewer with editor permissions when RBAC is disabled (#49427)
* Alerting: Fix access to alerts for viewer with editor permissions when RBAC is disabled (#49270)
* Add folder edit permission for users with Viewer role
* relax permissions required to create an alert when RBAC is disabled
(cherry picked from commit 3dfafbadef3f17ff4aefe64381caaf1fda03510f)
* fix backend conflict
* fixup
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* DashList: Handle long dashboard titles more gracefully (#49460) (#49464)
(cherry picked from commit a1b709626f7cdbf876292c4323148abccc3ad15e)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* AzureMonitor: Do not quote variables when a custom All variable option is used (#49428) (#49474)
(cherry picked from commit b0300d56acfc614e73a4d7ee0b96985722202cd0)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* AzureMonitor: Fix auto-selection of time-grain for metrics. (#49278) (#49420)
* AzureMonitor: Fix auto-selection of time-grain for metrics. (#49278)
* Update query editor to fix auto time-grain selection
* Update new query editor to fix auto time-grain selection
* Remove log and fix lint issues
* Add test for useMetricMetadata
- Add necessary types
* More test updates
- Update old dataHooks test
- Ensure query changes
Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>
Co-authored-by: Andres Martinez Gotor <andres.mgotor@gmail.com>
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
(cherry picked from commit 2780651ea864457c0d71c1db62a9dc02df4c4569)
# Conflicts:
# public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts
# public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.ts
# public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/dataHooks.test.ts
# public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/dataHooks.ts
* Update mocks appropriately
* Separate asyncState tests
* Fix lint error
* Variables: Fixes issue with data source variables not updating queries with variable (#49478) (#49481)
(cherry picked from commit 04bc482f11dc206708634b1e1267a26e8d254074)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Alerting: Make alertmanager datasource stable (#49485) (#49490)
(cherry picked from commit 86871807d27a155e044d7c6fb6608efdc2f2974e)
* ReleaseNotes: Updated changelog and release notes for 8.5.3 (#49275) (#49277)
* ReleaseNotes: Updated changelog and release notes for 8.5.3
* Update CHANGELOG.md
Co-authored-by: Leonard Gram <leo@xlson.com>
(cherry picked from commit 3bd6b8a5ae3e5d810a05646535c8aaa87cae845b)
* Release: downgrade to centos 7 in verify repo as 8 doesn't have a valid mirror list (#48422) (#48424)
(cherry picked from commit 9688d7d7aaad6f159df83811919015beb3eb4227)
Co-authored-by: Leonard Gram <leo@xlson.com>
* [v8.5.x] InfluxDB: Use backend for influxDB by default via feature toggle (#48453) (#49398)
* InfluxDB: Use backend for influxDB by default via feature toggle (#48453)
(cherry picked from commit 755ec3b469a15c585236527156d0451a5ff77d23)
* Update defaults.ini
* Alerting: Validate alert notification UID length (#45546) (#49512)
* validate alert notification UID length
* simplify-ish
* remove unused field
* whoopsie
* delete newline
* remove check
* apply feedback
(cherry picked from commit 635fa4ab0f349a9e7a6baa09c69414960c57a44e)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* AzureAD: Fallback to no groups if user does not have permission to query groups from azure (#49506) (#49521)
* If GroupMemver.Read.All permissions is not configured return no groups
* fix log
(cherry picked from commit 624f8ef40de6d2855911752bd0e0c716d477d213)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* [v8.5.x] InfluxDB: Removing influxDB backend migration feature flag (#49533)
* InfluxDB: Removing influxDB backend migration feature flag (#49531)
Removing the `influxdbBackendMigration` feature toggle default value.
(cherry picked from commit 27c26c30d1a6fabd48ed1bdacde8e3481f9a9b4c)
* Update defaults.ini
* Prevent exception when panel has multiple queries (#49368) (#49561)
This fixes the issues that when a panel has multiple queries this throws an exception if source is not part of the current frame
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit eab806620c84878047eabb455a342da2f9a5a944)
Co-authored-by: Ward Bekker <ward@wardbekker.com>
* Transformations: Add an All Unique Values Reducer (#48653) (#48733)
(cherry picked from commit 570ff074f6fc83663e35ed57b54ed7f825d38553)
Co-authored-by: Josiah (Jay) Goodson <josiah.goodson@gmail.com>
* AccessControl: Grant data source reader to all users when running oss (#49514) (#49608)
* grant data source reader to all users when running oss or enterprise
without license
* fix asserts in alerting tests
* add oss licensing service for test setup
* fix tests to pass in enterprise
* lint
* fix tests
* set setting.IsEnterprise flag for tests
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
(cherry picked from commit 1796a1d27724a2e3818b83f37221a4a99642b451)
* show notification tab only to editor (#49624) (#49631)
(cherry picked from commit 307c207a24fcb10cb0b35f04fa4ee2a631a0240f)
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
* CloudMonitor: Correctly encode default project response (#49510) (#49611)
* Correctly encode default project response
* Make getGCEDefaultProject a method of Service and add test
* Handle error appropriately
* Update test and function definition
(cherry picked from commit ccb8888055acd0ebde029d896e65676ac3f565a5)
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* Old Graph migration: Preserve null values settings (#49493) (#49578)
* Graph migration: Preserve null values settings
* Review
(cherry picked from commit 30880e6e18cec1f0469516da0d497e126d281754)
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* loki: better unpack handling (#49074) (#49673)
(cherry picked from commit b54817033a4e0942f4c3fb82220da49612d8be1a)
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
* AzureMonitor: Ensure original query properties are included unchanged (#49712)
* AzureMonitor: Ensure original query properties are included unchanged (#49642)
* Ensure original query properties are included unchanged
* Remove refId from pseudo datasources
* Include testing for interpolateVariablesInQueries
- Add util function to create template variables
- Update mock query with missing props
- Additional tests on each ds for template variables
* Correct typo and add explicit check for datasource
(cherry picked from commit c8094b33cd1ee556c96cbac1e8d1800d4cb8855a)
# Conflicts:
# public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
* Add missing prop
* Convert TOML front matter to YAML (#49724)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* [v8.5.x] Timeseries: Fix outside range stale state (#49655)
* Timeseries: fix outside range stale state (#49633)
Co-authored-by: Todd Treece <todd.treece@grafana.com>
(cherry picked from commit df90393057918328a11c16cf758e1b0848edfe27)
* remove typed array
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* CloudWatch: Use scopedVars in expressions (#49178) (#49769)
* CloudWatch: Use scopedVars in expressions
* fix spec test
(cherry picked from commit b80934617b14477ca4ffde52edf3e286e65066e8)
* Dashboards: Remove "delete dashboard" button for new dashboards (#48947) (#48959)
(cherry picked from commit 90b7a763288b649f514388410e45dc5def6ea34b)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Fix typo in curl command (#46729) (#49818)
* Fix typo in curl command
Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Fix typo in another curl command
Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>
(cherry picked from commit 0a23299878056f88d61527a88bcce9788379cb5b)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* Alerting: fix layout with long words / numbers (#49882) (#49888)
(cherry picked from commit e04f84fd1bd54fb9d129643a5a3a356ada143a8d)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* [v8.5.x] Alerting: Add fgac support to alert list panel (#49911)
Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
* "Release: Updated versions in package to 8.5.4" (#49953)
* ReleaseNotes: Updated changelog and release notes for 8.5.4 (#49954) (#49961)
(cherry picked from commit 3e04dcb72c9c9a80377d6f34930dd4ed6bc3cc31)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Azure Monitor: Include datasource ref when interpolating variables (#49543) (#49955)
* Alerting: do not overwrite existing alert rule condition (#49920) (#49991)
(cherry picked from commit 82e9f4e7e7fb7aa1d55638c12ad9c29378a3b5e3)
* CloudWatch: Add multi-value template variable support for log group names in logs query builder (#49737) (#50036)
* Add multi-value template variable support for log group names
* add test for multi-value template variable for log group names
* add test
(cherry picked from commit dca0453c2e6692b6b09d7ee247f01ebedab611a0)
Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>
* Alerting: Remove double quotes from matchers (#50038) (#50044)
* Alerting: Remove double quotes from matchers
With #38629 a new Alertmanager configuration object was introduced with `object_matchers`, it was meant to circumvent around the fact that Prometheus label names don't support a set of characters that Grafana needs to support for alerts, silences, matchers, etc. (with a common example being elasticsearch's `.`).
This new object does not include the label of sanitzation or validation that its Prometheus equivalent supports in `matchers` and therefore are semantically not equivalent.
This triggered the problem that when the migration is run, we use `matchers` as the object to populate in configuration for routing policies, but when the UI does its first save this object is transformed to `object_matchers`.
Matchers that were previously running just fine would immediately stop working as soon as the configuration is saved.
This problem surfaced with the introduction of #49952 where we stopped stripping double quotes from matchers (not just regex but _all_ of them).
* Add comment explaining rationale and future removal
Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>
(cherry picked from commit 1a50b0dbb733399eed729850140fe9b080373568)
Co-authored-by: gotjosh <josue.abreu@gmail.com>
* Azure OAuth: silent fail on getting groups (#49909) (#50021)
(cherry picked from commit 3049534c405e1f59a718c2f6b8d114cafa28bb4c)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* [v8.5.x]Encryption: Fix decrypting secrets with inactive deks (#50011)
* merged and backport to 8.5 (#50104)
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* [v8.5.x] Alerting: Fix alert list panel showing firing alerts with no instances (#50094)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* [v8.5.x] Cloudwatch: Add template variable query function for listing log grou… (#50161)
* Cloudwatch: Add template variable query function for listing log groups (#50100)
* cloud-datasources mob! :shipit:
* cloud-datasources mob! :shipit:
lastFile:public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
* mob next [ci-skip] [ci skip] [skip ci]
lastFile:public/app/plugins/datasource/cloudwatch/variables.ts
* cloud-datasources mob! :baby:
lastFile:public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
* cloud-datasources mob! :baby:
lastFile:public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
* mob next [ci-skip] [ci skip] [skip ci]
lastFile:public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx
* cloud-datasources mob! :shipit:
lastFile:public/app/plugins/datasource/cloudwatch/variables.test.ts
* cloud-datasources mob! :coffee:
* prettier md
Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>
Co-authored-by: Andres <andres.martinez@grafana.com>
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
Co-authored-by: Adam Simpson <adam@adamsimpson.net>
(cherry picked from commit bcf8320e079a61d784a4a40ad2ac5c4ebc2e413d)
* Fixed test
* Encryption: Stop decrypting EE encrypted secrets with legacy encryption (#50090) (#50176)
(cherry picked from commit 7a614fd8a1686643ffd1bf236a565f6957b83691)
* Update Golang - bump grabpl and build-container (#50253) (#50257)
(cherry picked from commit 7b750cc0f03ab7a4998b4e5726ba682508695a6a)
* Docs: Add documentation for reporting.enabled config option (#46606) (#50129)
Co-authored-by: JitaC <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit d3c6c2ed9461d44900a16e2568687c6529526fda)
Co-authored-by: Jesse Weaver <jesse.weaver@grafana.com>
* Legend: Use correct unit for percent and count calculations (#49004) (#49151)
(cherry picked from commit cdc6344a969560f46c753f9da0b2ff8218a9b9bc)
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* AngularSupport: Update description for angular_support_enabled config option (#49569) (#49573)
* AngularSupport: Update description for angular_support_enabled config option
* Update angular deprecration plan doc
* Update
* Update article
* Updated
(cherry picked from commit e1909fe74b2b67dd91c80ac6ec4075adaf3c7dc7)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* DashboardExport: Fixes issues sharing dashboards where query data source was set wrong (#48410) (#49344)
(cherry picked from commit 6fe28854bc3ff87150055b6b4d995fa1c675856b)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* State Timeline: Fix Null Value Filling and Value Transformation (#50054) (#50195)
(cherry picked from commit 12ba2d6b8b3be0f21fc8057887ead7bb8b272d87)
Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
* "Release: Updated versions in package to 8.5.5" (#50339)
* Backport 50340 to v8.5.x (#50355)
* ReleaseNotes: Updated changelog and release notes for 8.5.5 (#50340)
(cherry picked from commit 5f65edff28ab6c21ca44ffc42dbfe7bb6cf29ef0)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Dashboard: Fixes random scrolling on time range change (#50379) (#50383)
* Dashboard: Fixes random scrolling on time range change
* fix ts issue
* removed logging
(cherry picked from commit fd408652dc653a6019fda08b5f55de7c4ef60522)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Security: Fixes javascript security warnings in old vendored libs (#50382) (#50412)
(cherry picked from commit 74608d6480b1b1b40a3ad52e4930edb0172073b9)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* Bumping protobufjs version (#50435) (#50445)
Backport (cherry picked from commit b9cce18f726b98b6256a0c69f63c8e6cee9a282d)
* Alerting: Improve Unified Alerting Rollback Warning (#50470) (#50471)
After migrating to unified alerting, users must explicitly allow rolling
back to legacy alerting by setting force_migration = true in config.
This updates the panic message to clarify why that's required and what
the consequences of rolling back will be.
Fixes #50469
(cherry picked from commit 30f035ca347d9f6ba02bc48c0e1f183c885227c5)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* [v8.5.x] RBAC: drop permissions with folder:create action added by migration (#50493)
* add migrator to drop folder create actions that was set fromt he folder (#49878)
(cherry picked from commit f4f25d911b77f98ed3748365b807360d3d219926)
* Add missing const
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: gamab <gabi.mabs@gmail.com>
* RBAC: Include alert.rules action when setting folder permissions (#49946) (#50510)
* Generate additional actions when setting folder permissions in acl list
* Add migration for managed folder permissions to include alert rule
actions
(cherry picked from commit bdff63d4a8c25b6e2e400d278b11eb510db030e7)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* [v8.5.x] TimeSeries: Add an option to set legend width (#50549)
* TimeSeries: Add an option to set legend width (#49126)
* Add an option to set legend width
* Add width to the cue file
* Use legendStyle
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit a6693ba62fb3c3d8fb02349e92ce454226bf9417)
* Add missing migration
Co-authored-by: Ivan Babrou <github@ivan.computer>
* Add current alias to all files (#48635) (#49102)
* Add aliases to all files
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Prettify front matter
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 51dfcd7)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Docs: update query caching InfluxDB support (#50662)
* "Release: Updated versions in package to 8.5.6" (#50806)
* Remove publish.yml for v8.5.x (#50811)
* ReleaseNotes: Updated changelog and release notes for 8.5.6 (#50807) (#50830)
(cherry picked from commit 2dd784852c409dd7a224443268007f4b9d9a87a6)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* StateTimeline: make sure we use result of applyNullInsertThreshold() (#50988) (#50993)
Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com>
(cherry picked from commit 406509cdd3af702879c857390850fd3e3edc47ed)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Alerting: Fix AM config overwrite when SQLite db is locked during sync (#50951) (#51001)
If SQLite is used and the database is locked temporarily (ex. heavy write-load) during periodic
AM config sync, it was possible for your AM config to be overwritten with the default one.
This fixes that by patching a bug in xorm v0.8.2 which was causing SQLITE_BUSY errors to be ignored
in certain cases.
(cherry picked from commit 8f5912b94c89b86fdd7615df612a7b6aff8a9166)
* Time Series Panel: Add Null Filling and "No Value" Support (#50907) (#51066)
* Use nullInsertThreshold and nullToValue in time series
* Allow for undefined timeRange to support certain candlestick uses of prepareGraphableFields
* Make sure null to value doesn't modify initial data
* Do a shallow values copy and avoid Array.push()
* Clean up null to value transformation.
* Add basic tests
* Remove redunant null threshold application flagging
* set nullThresholdApplied flag even when no null inserts were done
* Include nullThresholdApplied in test snapshot
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
(cherry picked from commit 86b785d039aa2a1d0e4ac91765ad5b37bfe1e020)
Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
* Update gopkg.in/yaml.v3 dep (#51042)
* TablePanel: Show filter icon on correct field when other fields are hidden (#50940) (#51090)
* [v8.5.x] Alerting: Fix alert rule page crashing when datasource contained URL unsafe characters (#51122)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Fix query parameter template variable (#50023) (#51173)
As documented under [Advanced variable format options – Query parameters](https://grafana.com/docs/grafana/latest/variables/advanced-variable-format-options/#query-parameters), the option is `queryparam`, not `queryparams`.
I have verified in Grafana 8.5.3 that the former works while the latter doesn't.
(cherry picked from commit 1b091454ec3c8351d3d32c8f2ab23fee25384539)
Co-authored-by: kiwi-oss <71145773+kiwi-oss@users.noreply.github.com>
* Alerting: Don't stop the migration when alert rule tags are invalid (#51253) (#51339)
* Alerting: Don't stop the migration when alert rule tags are invalid
As we migrate we expect the `alertRuleTags` on a dashboard alert to be a JSON object. However, it seems this is not really validated by Grafana and an user can change the format to something else that the JSON parser is not able to marshal into a `map[string]string`.
Let's do a bit better by "attempting" to parse the tags and if we can't we'll simple return an empty map. The data is still there so if the user wishes they can go back, fix the data and attemp the migration again.
(cherry picked from commit 90646e7f414107fffc1b2fd7f0aa084d3cb43446)
* Variables: Selectively reload panels on URL update (#51003) (#51396)
(cherry picked from commit 342344bb03734c6c3c4aef68359b5d93614174e8)
* Chore: update golang.org/x dependencies (#51430)
* Variables: improve performance of transformMetricFindResponse (#49360) (#51435)
* improve performance of transformMetricFindResponse
* use lodash uniqBy for postgres
* use lodash uniqBy for mysql
* use lodash uniqBy for mssql
* hopefully conform to import linting rules
* Added .betterer.results
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Victor Marin <victor.marin@grafana.com>
(cherry picked from commit 683f31f2c6e4f4cd997ea46b16418c230b758450)
Co-authored-by: Nathaniel Saxe <NathanielSaxophone@gmail.com>
* Access control: role checks before updates (#51449) (#51457)
* add role checks
* linting
(cherry picked from commit 0c0cf36ab8ccee1511bd1d116962f0c1ad91a560)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Access Control: Allow dashboard admins to query org users (#51695)
* "Release: Updated versions in package to 8.5.6" (#370)
* allow dashboard admins to query org users
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Graphite: Use TimeRange with applied fiscalYearStartMonth (#51623) (#51774)
* Parse date with fiscalYearStartMonth in graphite ds
* Use precalculated timeranges
* Always use precalculated values
* Modify test
(cherry picked from commit 5b058d617d2e74e390087866476f70d8332bed09)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Only define plugin install endpoints when catalog enabled (#51788) (#51789)
(cherry picked from commit ba9fc10a745642fe7b0ba6c0a25b0de1a76365b5)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* Histogram: filter nulls, bucket-adaptive xAxis decimals (#51773) (#51822)
(cherry picked from commit 173636aa613c781539087b02e6f3b4b2911a588e)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Chore: Update ConcreteLogger to implement gokit Logger interface (#51599) (#51647)
# Conflicts:
# pkg/infra/log/log.go
* Plugins: Register management endpoints only when external managed is also false (#51802) (#51816)
* Only define plugin install endpoints when catalog enabled
* add external check
(cherry picked from commit 40dff288cd2fd3381775f07cf04c8de5da2c0ded)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* [v8.5.x] Bar chart: Fix stacking bug when data produces 0 accumulators (#51809)
* Bar chart: Fix stacking bug when data produces 0 accumulators (#51450)
* Don't divide by 0 ...
* Add test panel to gdev dashboard
(cherry picked from commit daf0e3cb4ebfc78221aff906d86ea9040dc2db5a)
* betterer
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* Time series panel: Fix an issue with stacks being not complete due to the incorrect data frame length (#51910) (#51914)
* Test failure
* Fix
(cherry picked from commit 5a65a12278179918b95d684d987523b6ae5534ae)
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* Alerting: Fix RegExp matchers in frontend for Silences and other previews. (#51726) (#51872)
(cherry picked from commit d99a7334d5f9a89106be9067b427f85d15ea5f97)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* backport (#51964)
* Prometheus datasource: query builder freezes when metrics metadata is undefined (#51929) (#51988)
* add error handling for prom query builder returning undefined metrics metadata
* remove reference to escalation
(cherry picked from commit e51187a47420c91cde38f1aa3fed445776f82fae)
Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
* [v8.5.x] CLI: Allow relative symlinks in zip archives when installing plugins (#52049)
* resolve conflicts
* fix build issue
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* BarChart: fix crash when checking bar value text overlap (#52061) (#52063)
(cherry picked from commit 254159ad69584c2842edf1d54d8777a883303efa)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Plugins: Improved handling of symlinks (#51324) (#52089)
Improves how we handle symlinks in plugin management.
(cherry picked from commit 04df634ef510b81b25da498b7755f5879084ea03)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* [v8.5.x] GraphNG: uPlot 1.6.22 (#51945) (#51991)
* GraphNG: uPlot 1.6.22 (#51945)
(cherry picked from commit fda7f064adcdc97ffce4c4913f4ea12ba222b815)
# Conflicts:
# .betterer.results
# package.json
# packages/grafana-data/package.json
# packages/grafana-data/src/transformations/transformers/joinDataFrames.ts
# packages/grafana-ui/package.json
# yarn.lock
* revert changes to isLikelyAscendingVector()
* types
* Alerting: Backport fix database unavailable removes rules from scheduler (#52140)
* Alerting: Fix bug where state did not change between Alerting and Error (#52204) (#52208)
This commit fixes a bug where the state did not change from Alerting to Error if the evaluation result returned an error, or from Error to Alerting if evaluations stopped returning errors.
(cherry picked from commit 34d45977ca94d12414259e21c25243d8ec9ef3e2)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Fix XSS in runbook URL (#379)
* Fix: Choose Lookup params per auth module (#397)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Prefer pointer to struct in lookup
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Use only login for lookup in LDAP
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: use user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
fix remaining test
fix nit picks
* [v8.5.x] Merge `release-8.5.8` branch (#406)
* "Release: Updated versions in package to 8.5.6" (#370)
* Fix XSS in runbook URL (#379)
(cherry picked from commit ac3f79956df5e661937d19db63267e4fcb665a11)
* "Release: Updated versions in package to 8.5.7" (#380)
* Fix: Choose Lookup params per auth module
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Prefer pointer to struct in lookup
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Use only login for lookup in LDAP
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: use user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
fix remaining test
fix nit picks
(cherry picked from commit 51c83909ebc99017fa0029c1e3f75724f25c5660)
* "Release: Updated versions in package to 8.5.8" (#398)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: jguer <joao.guerreiro@grafana.com>
* "Release: Updated versions in package to 8.5.9" (#408)
* backport changelog (#52258)
* backport changelog
* add 8.5.9 back in
* add date
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Alerting: Fix Teams notifier not failing on 200 response with error (#52254) (#52269)
Team's webhook API does not always use the status code to communicate errors.
There are cases where it returns 200 and an error message in the body.
For example, 429 - Too Many Requests or when the message is too large.
Instead, what we should be looking for is a response body = "1".
https://docs.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/connectors-using?tabs=cURL#send-messages-using-curl-and-powershell
(cherry picked from commit efa0d90093179057ee487aaeac78f2a582e7b89f)
* Bump grafana-azure-sdk-go version (#52328)
* Docs: Update query caching support (#50706) (#52461)
* Docs: Update query caching support
* Update query-caching.md
(cherry picked from commit 2b7fe7251cbf3a318e8ba37925f16fb5b2c65607)
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
* Alerting: Allow the webhook notifier to support a custom Authorization header (#52515) (#52621)
* Allow the webhook notifier to support a custom Authorization header
Instead of doing something clever of re-using the existing username/password fields of Basic Authentication - I opted for two diffent fields to match the upstream Alertmanager configuration (that in turn is based of the HTTP Basic authentication).
It'll fail if you have values for both HTTP Basic Authentication and Authorization.
(cherry picked from commit b026f2bc5d25a05465bc7cb43875b5231d095f97)
* Fix anonymous access (#52615) (#52635)
(cherry picked from commit 8d938175f5d770c6a33921673a5d321328c25881)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* RBAC: Fix Anonymous Editors missing dashboard controls (#52649)
* [v8.5.x] Alerting: Fix alert panel instance-based rules filtering (#52583) (#52653)
* [v8.5.x] UI/Card: Fix card items always having pointer cursor (#52816)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Add GetDialect function (#52818)
* [v8.5.x] Plugins: Add validation for plugin manifest (#52865)
* resolve conflicts
* add plugin data for test
* [v8.5.x] API: Do not expose user input in datasource error responses (#52995)
* API: Do not expose user input in datasource error responses (#52992)
(cherry picked from commit 87004cc22dcd096e496bd94bf8ff0269ae290297)
* Remove unused import
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
* Variables: Add 'jsonwithoutquote' formatting options for variables, and format of variable supports pipeline. (#51859)
* BarchartPanel: Fix color from thresholds show incorrectly (#52038) (#52968)
Signed-off-by: Kyle Cunningham <kyle.cunningham@grafana.com>
(cherry picked from commit 11c79cd6da1cf4824e1a48d98d0b5935b1a22351)
Co-authored-by: mingozh <77652617+mingozh@users.noreply.github.com>
* TimeSeriesPanel: Tooltip works properly when changing modes (#52876) (#53054)
* TimeSeriesPanel: Tooltip works properly when changing modes
* TooltipPlugin respects display mode
* Pass options to TimeSeriesPanel props
(cherry picked from commit 2948bf01dc2d8f31da296d1a805aade94c336ebf)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* [8.5.x] Alerting: Remove user input from error response (#53147)
* Plugins: Validate root URLs when signing private plugins via grafana-toolkit (#51968) (#53227)
* validate URLs
* apply PR review feedback
* fix err msg
(cherry picked from commit b32ad993c504b72ae912683b5512e3fe7c3cabf9)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* check not empty root urls before setting field (#53135) (#53234)
(cherry picked from commit 5523c00b019632a201709f26ad3230c957af9651)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* add missing check for root URLs length (#53239) (#53249)
(cherry picked from commit 46b7ca12e1ae19f91d6dfd79c9b2f8cf5b7603c3)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* [v8.5.x] API: Fix snapshot responses (#53301)
* API: Fix snapshot responses (#52998)
* API: Fix response status when snapshots are not found
* API: Fix response status when snapshot key is empty
* Apply suggestions from code review
(cherry picked from commit 5fec6cc4f5b7dd4aa37399e93a77e6111d867f95)
* "Release: Updated versions in package to 8.5.10" (#53394)
* Backport release notes of 8.5.10
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Geomap: Set markers color based on selected color field #53493 (#53496)
(cherry picked from commit 45750da66758744061f3687184f47af5a606a076)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* [v8.5.x] Geomap: Revert temporary fix for markers coloring (#53611) (#53630)
(cherry picked from commit 1f93216f1d16c1903adf3df210684745a7778e48)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* Chore: Panic! in the Logs (#53664) (#53667)
(cherry picked from commit cc777e175e9042716ab4ad878b0876cbd0a95da7)
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* [v8.5.x] Alerting: AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled (#53681)
* use constants from prior to the refactoring
* Fix small typo in panel doc (#52568) (#52726)
(cherry picked from commit bdcef92e3532066ec4a0ec2fd96638d3e14f457e)
Co-authored-by: Chris Hodges <chris.hodges@gmail.com>
* TimeSeries: Fix memory leak on viz re-init caused by KeyboardPlugin (#53892)
(cherry picked from commit 329aab73952e9762d07b6fa46f5c51471c91b1d1)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Geomap: Fix geohash editor settings #54058 (#54063)
(cherry picked from commit 13aacf3590978586908aacf796e3de93f2dd902e)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* alerting: redact alertmanagers in scheduler logs (#54183) (#54186)
(cherry picked from commit 438c95892f893886864fbcf41fa776cb677b126d)
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
* [v8.5.x] Build: Use specific nodejs version for levitate pipeline (#54211)
Co-authored-by: Esteban Beltran <academo@users.noreply.github.com>
* Geomap: Local color range for dimensions (#54348) (#54350)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 0707d682e04cf1e76cfe3a6a3f985e3e5d1dba5c)
* Rendering: Add support for renderer token (#54425) (#54438)
(cherry picked from commit a4f75cc0438712c90b02d24740416f8615e3a0cb)
(cherry picked from commit 6ec06f66b9dec2e73ce8734f041a6e266849df9b)
* "Release: Updated versions in package to 8.5.11" (#54457)
* AppRootPage: Fixes issue navigating between two app plugin pages (#54519) (#54527)
* AppRootPage: Fixes issue where it was not possible to navigate to another plugin
* Externalize react-router
* fixing test
(cherry picked from commit e5fba788d6ac3de087f030a43a2bee39366981c6)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* API: Do not expose user input in datasource error responses (#53483) (#54707)
(cherry picked from commit 950715b2550530f869c36130c878e7af03d1f38a)
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
* Manual back-port of #52399 (#55035)
* [v8.5.x] Chore: Update slate and related packages (#54566) (#54800)
* Chore: Update slate and related packages (#54566)
* Plugins: Expose emotion/react to plugins to prevent load failures (#55297) (#55398)
(cherry picked from commit db17a881932934ece4acab0ca9066fdc53385109)
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* V8.5.12 security patch (#486) (#55495)
* Data source: prevent from using auth proxy header as custom data source header (#477)
* apply security changes for auth proxy permission escalation
* add links to CVE
* remove duplicate check
* apply security fix for admin only folder migration (#484)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* "Release: Updated versions in package to 8.5.13" (#55501)
* resolve merge conflicts (#55508)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Access Control: Allow org admins to invite new users (#55585)
* backport change to allow org admins to invite new users to org
* remove docs from backport
* Dashboard: Single right-aligned y axis loses gridlines (#54206) (#55536)
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: Matheus Benini Ferreira <88898100+MatheusBeniniF@users.noreply.github.com>
Co-authored-by: Rafael Toledo <87545086+Toledodev@users.noreply.github.com>
Co-authored-by: Rubens Rafael <70234898+RubensRafael@users.noreply.github.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Thiago Nascimbeni <tnascimbeni@gmail.com>
(cherry picked from commit 667993eae78f29ce3263ab2b7be4cd9c090ccfd5)
Co-authored-by: GitStart <1501599+gitstart@users.noreply.github.com>
* Docs: Fix caching.memcached setting name (#56606) (#56672)
(cherry picked from commit ef17f12c2320727664a1f7c2853a60dce6244277)
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
* [v8.5.x] Chore: Release 8.5.14 (#56698)
* remove support for v1
(cherry picked from commit 8630a7a991af74edc4030f57d37a4bc263202fde)
* Security: Make proxy endpoints not leak sensitive HTTP headers
Fixes CVE-2022-31130
(cherry picked from commit 2974574a53ab6d26be7b706e76271173a91fea3a)
* Security: Fix do not forward login cookie in outgoing requests
(cherry picked from commit 54a32fc83b233f5910495b5fcca0b4f881221538)
* Add test for username/login field conflict
(cherry picked from commit 7aabcf26944835b0418eec6b057a0b186ff206bf)
* Swap order of login fields
(cherry picked from commit 5ec176cada3d8adf651f844e3f707bc469495abd)
* "Release: Updated versions in package to 8.5.14" (#547)
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* "Release: Updated versions in package to 8.5.15" (#56707)
* Chore: Upgrade Go to 1.19.2 (#56857)
We also need to upgrade the linter together with the Go version, all the changes should relate to either fixing linting problems or upgrading the Go version used to build Grafana.
* [v8.5.x] Login email before username (#57408)
* Add test for username/login field conflict
* Swap order of login fields
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
* Chore: Upgrade Go to 1.19.3 (#58070)
* "Release: Updated versions in package to 8.5.16" (#58457)
* resolve conflicts (#58466)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* [v8.5.x] Omit error from http response (#58453)
* [v8.5.x] Docs: Add document for jsondata field alertmanagerUid (#57118)
* Add document for jsondata field `alertmanagerUid` (#52895)
alertmanagerUid can be used to specify Alert Manager for a particular Prometheus/Loki data source.
Co-authored-by: Garrett Guillotte <garrett.guillotte@grafana.com>
* Docs: Fix provisioning table formatting (#57042)
Co-authored-by: Vũ Quốc Phong <phong.vq.198@gmail.com>
* Fix: Email and username trimming and invitation validation (#58449)
* Trim leading and trailing whitespaces from email and username on signup
* Check whether the provided email address is the same as where the invitation sent
Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
* [v8.5.x] Chore: Upgrade go-sqlite3 to v1.14.16 (#58696)
Chore: Upgrade go-sqlite3 to v1.14.16
* [v8.5.x] Automate docs publishing steps (#59563)
* Automate docs publishing steps (#59550)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 10a83714c87253c2951e97913cc2a2e61801eb41)
* Remove dependency on test job (#59575)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Fix release_branch_regexp (#59590)
Apparently the non-capturing group was incorrect.
I verified the logic in a branch in grafana-github-actions:
https://github.com/grafana/grafana-github-actions/compare/jdb/2022-11-prove-grafana-regexp-behaves-correctly?expand=1
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.ba…
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.
Fix: Email and username trimming and invitation validation