Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Canvas: Improve resource picker initialization (#57319) (#57566)
(cherry picked from commit 9d857f4d61803f6156de5c7d89b04cd2593d0632)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* Storage: Fix initialization on windows (#57504) (#57577)
(cherry picked from commit 749b3b62631e89b07a592ec922447b1c9158afa5)
Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
* TablePanel: Fix updating footer values on data change (#57518) (#57581)
* TablePanel: Fix updating footer values on data change
* tests
(cherry picked from commit c30716a073d0147fe85ddb1102429d04f6a4d6df)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* live: explicitely reply with http 200 (#57428) (#57592)
`pkg/web` triggers a panic when a http handler chain does not return any
response to the client.
This has been put in place, because it usually means a middleware along
the way did not call the next one.
In this specific case however, the handlers meant to return 200, but did
not do so explicitely, instead relying on the default behavior of `net/http`
(cherry picked from commit beaaabd770e540c463800e6d320884e3c6e00ae0)
Co-authored-by: sh0rez <me@shorez.de>
* Changelog: Updated changelog for 9.2.2 (#57601) (#57604)
(cherry picked from commit f64b0e1fae248469ee0fc8fbb2fc8efb90228808)
* "Release: Updated versions in package to 9.2.3" (#57605)
* [v9.2.x] Alerting: Always allow configuring AM configuration (#57614)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* move data source permission model to enterprise repo (#57615) (#57659)
(cherry picked from commit 92531c559612dd077f30b186873e23002c5c5ac5)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Prometheus: Flavor/version configuration (#57554) (#57563)
* Backport PR for: Prometheus: Flavor/version configuration (#57554), and /label match parameter support #56510
* Revert "Revert "Prometheus: Type and flavor configuration (#56496)" (#57552)"
This reverts commit 2432ce619a7e62026685df14f60116ea4fb3447d.
* Adds new fields and documentation for Prometheus datasource configuration: prometheus type, and version
(cherry picked from commit f93c3acc51180cee78222f2df95ac7b380d1a616)
* Revert "Revert "Prometheus: Provide label values match parameter API when supported prometheus instance is configured (#56510)" (#57551)" (#57553) (#57564)
This reverts commit e7671bf9092811ecb053466e5b9c9913e2922fe1.
(cherry picked from commit e59ddd6bc5630625e49cafc965764cd8faa23cd6)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Prometheus query builder: Replace select with AsyncSelect to support high cardinality prometheus instances (#57300) (#57630)
* Replace current select with AsyncSelect component to facilitate autocomplete via prometheus server instead of client application
Co-authored-by: Kyle Brandt <kyle@grafana.com>
(cherry picked from commit c27aac0d385bfe695dec5f1b268940b4a19d3c50)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Docs: (Whats new 9.2) Prom Stream Parser (#57603) (#57693)
* Docs: (Whats new 9.2) Prom Stream Parser
* Update docs/sources/whatsnew/whats-new-in-v9-2.md
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
(cherry picked from commit dfdc9bcbc1491beb746914fcb8645436819d8aee)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* Fix: Unlock new button based on user permissions (#57733) (#57760)
(cherry picked from commit 4d380978d304029ff17f2c2f0195e1b5b0a0c5b5)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* fix GF_AUTH_JWT_URL_LOGIN not working (#57689) (#57761)
(cherry picked from commit cae900c6f9e41b5559d8ed25afa5cd5d2af56aa0)
* [v9.2.x] Alerting: Fall back to "range" query type for unified alerting when "both" is specified (#57765)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Alerting: Fix "Not Implemented" responses (#57710) (#57712)
* Prometheus: fix Raw query is not updated when label op change. (#57492) (#57493) (#57780)
(cherry picked from commit 9aac0d32f9dbb77d0701398bf3d577a55dcce224)
Co-authored-by: yinjialu <37073056+yinjialu@users.noreply.github.com>
* Candlestick: Maintain candle width at different display resolutions (#57709) (#57794)
(cherry picked from commit 7d020d3f6e5476b47ce258dd4315e24a311f0506)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* TimeseriesPanel: Fill below to override works with name override (#57728) (#57800)
(cherry picked from commit 953fdfe76f3d6e51b8b32f4285e9501dfab944c5)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Security: Upgrade x/text to version unaffected by CVE-2022-32149 (#57797)
* Only provide version ot build-frontend-packages if it's a valid semver (has 2 digits) (#57808) (#57810)
(cherry picked from commit fd16cad7da36420148ae5811cfefa9876ce8f782)
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
* CI: Add `CreateTempDir` func and use it in publish packages logic (#57171) (#57261)
* Add CreateTempDir func and use it in publish packages logic
* Fill err return in defer func
(cherry picked from commit e829b5014911363be862306b34a41fb0eeb13362)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] Chore: Fix vulnerabilities in webpack loader-utils (#57753)
* chore: remove unused webpack loaders from core and toolkit
* chore: refresh yarn.lock file
* getting there...I hope..
* making sure we are not using naughty loader-utils.
* fixed storybook.
* Remove Sensu from docs (#57812) (#57823)
We do not support Sensu in Grafana Alerting, only Sensu Go.
(cherry picked from commit ee7adc081b3b2136d3786c069762057e8f428461)
Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
* Prometheus: Do not drop errors in streaming parser (#57698) (#57835)
- Fixes #57692
- and also takes care of #42776 when using the streaming parser, not an ideal fix for #42776 but makes explore work better I think. https://github.com/grafana/grafana/issues/57365 might be a better longer term solution
(cherry picked from commit 6126f56ef0a0428ab3021c5a3368c2911000654f)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* Prometheus: Chore - Remove incorrect FrameType from exemplar frame (#57695) (#57828)
(cherry picked from commit 2cd9cbd35925830dee97d9d18840eadc9d0cbbf3)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* resolves merge conflicts (#57840)
* Dashboards: Add workaround for react-grid-layout rearrange bug (#57832) (#57836)
(cherry picked from commit e4d1d8d70cd553c262e1095bb3d77f4271b111d6)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Dashboards: Add workaround for react-grid-layout rearrange bug (#57832) (#57836)
(cherry picked from commit e4d1d8d70cd553c262e1095bb3d77f4271b111d6)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* Docs: Add information about DB version support to upgrade guide. (#57643) (#57868)
In v9.2 Grafana added an official DB version support policy. That change
is now noted in the upgrade guide.
(cherry picked from commit 89d917b196a12bafbec80d043fa1f36e9c825243)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Access Control: documentation for RBAC provisioning with Terraform (#57747) (#57882)
* add docs for RBAC provisioning with Terraform
* remove unnecessary bit
* shuffle the structure around, as docs can't go more than four levels deep
* Update index.md
* Update index.md
(cherry picked from commit 7e62352aea20a47589b66f20c2c8ef7ca5847b65)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* docs(config): Include admin_email documentation (#55789) (#57725)
(cherry picked from commit 1340c2c358d37c3249246277d4eeb51806faacb1)
Co-authored-by: Pepe Fagoaga <pepe@verica.io>
* RBAC: Allow to list users for dashboard / folder admins (#57080) (#57252)
* RBAC: Use query struct in tests
* RBAC: If access control enforcement is disabled don't filter out users
when fetching permissions
(cherry picked from commit 9adaf1565c2408e3e13668af7d50cdcdd5d77242)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* CloudWatch: Fix broken test (#57879) (#57900)
* mock date.now
* fix broken test
(cherry picked from commit 92ed9a4f2f6c3d5b8a0cfeaecda0062f6b77c525)
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
* Chore: Update footer changelog link to github (#57871) (#57895)
(cherry picked from commit fd5c14757486ef510741ac344469b1ccfe2a6242)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Google Cloud Monitoring: Ensure selectors fit in the screen (#57817) (#57899)
(cherry picked from commit ce38840f293bfe94a1d6338a9bab255b3d7cc56c)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* add an endpoint for updating several managed permissions with one call (#57893) (#57898)
(cherry picked from commit 2546437e2052025daaf8ee2ab9ea4262b7364e61)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* change json command parameter names from userID to userId and teamID to teamId (#57902) (#57913)
(cherry picked from commit 5c1a1c8318bec43dec6aaf130aaafda3f19e54a6)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* Alerting: Add debug logs in validateAndGetPrefix (#57002) (#57923)
(cherry picked from commit b0a927b1385654a6776cbe8deb36f6dfadc914fd)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Attempt to preserve UID from migrated channel (#57639) (#57919)
(cherry picked from commit 0dfd78c88cbb97df6594dda57d73c705bda106e0)
Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
* [v9.2.x] Alerting: fix filtering in notification policies (#57925)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* removes CTAs (#57931) (#57935)
(cherry picked from commit 6aa3003a541552aa9ce6e9b3e95a9dd0b8213e78)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* BarChart: Fix stacked hover (#57711) (#57937)
(cherry picked from commit fbfd0fd51b1d61b186957e0b58c2ea60472f55f3)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* TimeSeries: Render null-bounded points at data edges (#57798) (#57938)
(cherry picked from commit 45234e76eb82a417d8cee236d7a2ad91dc580bbb)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* CloudWatch: Fix `all-log-groups` endpoint when called without logGroupNamePrefix (#57483) (#57945)
(cherry picked from commit 1f7c84f1256ed46fe5099f27aae57a2121da1080)
Co-authored-by: Lion Ralfs <lion.ralfs@gmail.com>
* Add GCP_KEY to publish-grafanacom step (#57910) (#57948)
(cherry picked from commit 1eaf7cbfc0f4aaed8b84c3e50d9c0c352668b363)
* Changelog: Updated changelog for 9.2.3 (#57955) (#57957)
(cherry picked from commit 02add89b530a569f38e38597be294c6b16ef29d8)
* "Release: Updated versions in package to 9.2.4" (#57958)
* metrics: expose when the binary was built as an gauge (#57951) (#57969)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 3188af9be352feabeb000b204d7375b5626231d5)
* Alerting: Fix flaky test in notifiers (#57927) (#57993)
* Alerting: Fix flaky test in notifiers
* remove TODO comment
(cherry picked from commit a3f828de8aae968f783aeeb648de98e75c421af4)
Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
* [v9.2.x] Google Cloud Monitoring: Set frame interval to draw null values (#57914)
* Linux Packages: Handle publish to beta (#57528) (#58044)
Uses the feature added here: https://github.com/grafana/deployment_tools/pull/46301
When a version is named "beta", it will be distributed in the beta distribution, rather than in stable
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
(cherry picked from commit c46a4a0b260d3b008bfa771cdc103065a6fe6880)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* chore: bump code coverage action version (#56710) (#58040)
(cherry picked from commit e3e32c7d04a5d20b45411c118f7e3c7e63d90709)
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
* Alerting: Fix response is not returned for invalid Duration in Provisioning API (#58046) (#58049)
(cherry picked from commit 4c581b5f85db705bd4b01d5679407069dd3b2cfb)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* LibrayPanels: Fix unlinking libray panel (#57825) (#58042)
* remove unneeded package updates (#58005) (#58068)
(cherry picked from commit 6a4a10fa926e89eb0498a4d703ccc8c67b5dd46d)
Co-authored-by: Dan Cech <dcech@grafana.com>
* Alerting: Fix feedback (#57922) (#58104)
(cherry picked from commit f2e4cb7c4ea4ee85a177e27fba3d6bf191e043a7)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Fix screenshot is not taken for stale series (#57982) (#58102)
(cherry picked from commit 215ffee4375adb784526827340bbc8c66fd342cc)
* fix: migration of alert_rules fix (#58123)
* increase select placeholder contrast to be WCAG AA compliant (#58034) (#58125)
(cherry picked from commit c3206167a65babd66ca4d590723c4fd754c4aad9)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* Tempo: Make usage of time range for TraceID query optional (#58057) (#58128)
* Added switch to toggle the TraceID query time shift
* Fix and improve tests
(cherry picked from commit 90ac300d1023768f9778bb58e77a05948dea5b2e)
Co-authored-by: Andre Pereira <adrapereira@gmail.com>
* [v9.2.x] Explore: Track data links usage (#56868) (#58037)
* Explore: Track data links usage (#56868)
* Add tracking for data links in explore
* Add tracking for data links in explore
* Fix tests
* Retrigger build
(cherry picked from commit dd5e3a08184b3d875c0ee62aab7ca9a054a8c23e)
# Conflicts:
# public/app/features/explore/Explore.tsx
# public/app/features/explore/LogsContainer.tsx
* Post-merge fixes
Remove unused import
* reduce the number of requests in folder section (#55876) (#58145)
(cherry picked from commit 372ba83534e0fd91e1c25d7c3c27a3ac1f68f62c)
Co-authored-by: Marcos Vinicius <marcos.vinicius.wz@gmail.com>
* TimeSeries: more thorough detection of negative values for stacking dir (#57863) (#58147)
(cherry picked from commit 4d88e2b542c62bf287a60af01fddfa2e6de220b4)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* fixed explain handlers for label- and lineformat (#58135) (#58151)
(cherry picked from commit 4b1ddba0a8998884982d275e846ec4af6787a06f)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* fixes typo (#58159) (#58194)
(cherry picked from commit 1722000309c6e6dc36c9e4f5ef9c2e40cc6e6c65)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* [v9.2.x] Alerting: Encode path separators to side-step proxies (#58222)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* Build: add explicit build step for go codeql (#58195) (#58243)
* add explicit build step for go codeql
* support workflow_dispatch for codeql checks
* syntax fix
* enable on push to codeql-go branch
* test
* use go version from go.mod
* explicitly set go version
* tidy up, add workflow_dispatch support to all codeql actions
(cherry picked from commit da9c646f242fd16ba8a789fa5d1c50094d761ae7)
Co-authored-by: Dan Cech <dcech@grafana.com>
* Search: Fixes searching by current folder when opened by clicking dashboard folder name (#57716) (#57949)
* Search: Read from url on mount no on app boot
* Fixed tests
* Remove unused type
(cherry picked from commit 3991be4c1dd35ff05e1a7dee117710e766b1a3c9)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* merge complete (#58272)
* followup fix for backport (#58273)
* merge complete (#58274)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* Timeseries: Fix null pointer when matching fill below to field (#58030) (#58298)
* Fix timeseries fill below to error
* wip
* modifications
* add tests for fillBelowTo option
(cherry picked from commit d673c8809b64237690b192d25bb6fefd177ae33d)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* MySQL: make it possible to add CA cert without using tlsAuth (#58226) (#58308)
(cherry picked from commit b1bfae035022d6cedd89014744073e89741e4738)
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
* Auth: Check for OrgUsersAdd on frontend to display pending invites (#58217) (#58225)
(cherry picked from commit 9ff2765bb9e7938c88f2333647a6210589a06535)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* Chore: Disable dashboard-time-zone e2e tests (#58320) (#58323)
(cherry picked from commit d4e3d47f563de34cd09372e048943a8698861d59)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
* @grafana/e2e: Fix addPanel for small screen size (#57398) (#58314)
(cherry picked from commit d001a1b035bdbbaae384cdaf3d69f9ebfd5193a0)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* Toolkit: Fix Webpack less-loader config (#57950) (#58175)
(cherry picked from commit b799be3052247f6d3da2a10ab18474dcb0705a5d)
Co-authored-by: dessen-xu <1805680163@qq.com>
* fix thanos semver string (#58335) (#58344)
(cherry picked from commit 6bc8ec0f9bbcdc48e6865e8318eb7fb8de7068ab)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Chore: Upgrade Go to 1.19.3 (v9.2) (#58339)
* Datasource Loki: preserve header `X-ID-Token` (#57878) (#58346)
(cherry picked from commit bc280d07492f66456e47eb262f935c933312b1ed)
Co-authored-by: Si Mon <85333972+siiimooon@users.noreply.github.com>
* MSSql/Postgres: Fix visual query editor filter disappearing (#58248) (#58354)
(cherry picked from commit b47230623944f01aa6e2367913e2f7596ff284bf)
* Alerting: Fix test fails in some environments (#58251) (#58356)
(cherry picked from commit 8353f307aa2ed842c9045c1e420d51574019e905)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Append org ID to alert notification URLs (#57123) (#58349)
(cherry picked from commit db1fd10ff13d936665210e0c8a86c50ecae09998)
Co-authored-by: Neel <47709856+neel1996@users.noreply.github.com>
* [v9.2.x] CI: Use full `dockerhub` repository name (#57979) (#57983)
* CI: Use full `dockerhub` repository name (#57979)
* Add full dockerhub repo name
* Update grabpl version
(cherry picked from commit 57ee0e4a4b3b6b5536e63b117718c6384920650f)
* sign drone.yml
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Docs: corrects outer join example (#58348) (#58366)
* corrects outer join example
* Update docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
* adds query tables back in
(cherry picked from commit 0315f6317e2653da203c9ac0f21eceb9aa9e29de)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Alerting: Remove duplicate Slack notification title (#58107) (#58256)
Move mentions to a markdown-formatted pretext field
to prevent issues mixing blocks and legacy-attachment content.
(cherry picked from commit d581b368bdeeaf8870e495a15dcfdf5aef293be9)
Co-authored-by: Will Jordan <wjordan@users.noreply.github.com>
* CallResource: don't set Content-Type header if status is 204 (#50780) (#58362)
Grafana's HTTPServer ensures that the Content-Type header is always set
in the response to a CallResource call, but when the status code is
204 No Content this shouldn't be done; the body should be empty and no
Content-Type header should be set.
We ran into this in the Grafana ML plugin where we were sending an empty
response with status 204, but the frontend client saw that the content
type was JSON and tried to parse it, resulting in an error that made it
to the JS console.
(cherry picked from commit 480277f6129b61d4f23e85a31b0e46b052cbb498)
Co-authored-by: Ben Sully <ben.sully@grafana.com>
* Prometheus: Upgrades http client to v1.13.1 (#58363) (#58395)
(cherry picked from commit faa0fda6eb846752983447c2590c68d68c6cb173)
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace (#58189) (#58418)
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace
When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana
This is not what we want. Users should be able to install either OSS or Enterprise
* Set it only one way. It's how it's currently tested
(cherry picked from commit 786c7faff2c70a563bd1f3f391e28564d1c59964)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Changelog: Updated changelog for 9.2.4 (#58429) (#58431)
(cherry picked from commit 94573d3e6109b5a832c21013c83d9464c43ea4b4)
* "Release: Updated versions in package to 9.2.5" (#58430)
* Prometheus: remove /series endpoint calls in query builder label names and values for supported clients (#58087) (#58438)
* add other filter variables to match param for label values query against filter values, in order to resolve bug in which filter value options would display that aren't relevant in the current query editor context, i.e. options would display that upon select would display no data
* expanding current unit test coverage to cover calls to new API
* interpolate the label name string instead of the match promql expression
(cherry picked from commit 92817469143a222e6d1be8b3369151d55c7fe47d)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* properly format new .drone.yml in verify-drone (#58436) (#58452)
(cherry picked from commit d593aede3d0bc712dbae34d442918532d8c158d4)
Co-authored-by: Dan Cech <dcech@grafana.com>
* pkg/web: avoid shared middleware slice (#58458) (#58463)
(cherry picked from commit 75701695d8a938d4958c12febdf37d96afcd6092)
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* Tooltips: Make tooltips in FormField and FormLabel interactive and keyboard friendly (#57706) (#58471)
* Tooltips: add tabindex and interactive
A couple tooltips used in configuration of datasources like ADX were not
clickable or didn't show on keyboard focus.
- fixes #56561
- Same solution as #47137
* test: add test around tabbing to tooltips
(cherry picked from commit 3e92a2dc7725677336534eae4008be6a679ed44b)
Co-authored-by: Adam Simpson <adam@adamsimpson.net>
* Use fnv64 for InmemCacheService (#58468) (#58487)
(cherry picked from commit 72275e97d281f6b4dfb2cd1188db1e7ec5cbb198)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Use hash of opts in singleflight (#58474) (#58488)
(cherry picked from commit ad9ac85ee090f8bb006c5b095c0fe3ac7e1b71cd)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Fix screenshots were not cached (#58493) (#58494)
(cherry picked from commit c646ff0ce3b5d68d6d96a9c98916186b91a3706c)
* Dashboards: Provide better error messages in SaveDashboardAsForm (#57866) (#58432)
The existing code uses `instanceof Error` to check for a `message` field on the thrown object. The objects that are thrown are never instances of the error interface. This change introduces a new type that extends Error so that the check works properly and displays a meaningful error message in the UI.
(cherry picked from commit f07da85d8b64c7df00121b6b9ace36f9eca1b9b2)
Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
* Tempo: Fix dropdown issue on tag field focus (#57616) (#57883)
(cherry picked from commit 77be89eb1c743c681d0e070cb5f170e58ffa1bfb)
Co-authored-by: xiyu95 <112968312+xiyu95@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
* Elasticsearch: fix typo (#58519) (#58523)
(cherry picked from commit fa5a304de862c438e25ab8818b7477d1c8304b13)
Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
* Docs: adjusts topics to align with task templates (#58478) (#58531)
* updates topic to align with multiple task template
* updates goal intro
* aligns formatting with single task topic template
* Update docs/sources/administration/team-management/index.md
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
* adds permissions requirements to two tasks
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit 2dfe0a4060c84aaff8edc0ce3a07573d114f3f67)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Alerting: Improve debug logs in image service (#58507) (#58533)
(cherry picked from commit b92a0223e3f5f60f2ae082e21ab43243d51469f0)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Add new PageInfo component (#58421) (#58534)
(cherry picked from commit 831ecb467cfaad7942cbe785f732bd91a43b479a)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* Alerting: Fix images cached on rule instead of dashboard panel signature (#58510) (#58536)
(cherry picked from commit 7e852720e3fd6394e62749383d1e502fd9fca83d)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Alerting: Small improvements to staleResultsHandler (#58007) (#58513)
(cherry picked from commit 1290951b65b75ac6a054b401d3e91388cddfe33d)
* adjusts the stem sentence (#58538) (#58541)
(cherry picked from commit ad374efcbdddfd896cc19bdd98ff1d1cc54c94b4)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Prometheus: Query builder label filters dropdown UI overload fix (#58266) (#58546)
* WIP: try to support removing series endpoint for supported clients
* add other filter variables to match param for label values query against filter values, in order to resolve bug in which filter value options would display that aren't relevant in the current query editor context, i.e. options would display that upon select would display no data
* clean up console logs
* refactor and comment
* expanding current unit test coverage to cover calls to new API
* fix unit test
* whitespace
* prettier
* WIP: need to merge in other PR
* WIP giving up and trying again
* WIP: most functionality is working, split out shared loki/prom code
* fix bug in which search results wouldn't take other label context into the query
* Fix bug in which the previously selected value would conflict with the async search
* interpolate the label name string instead of the match promql expression
* remove type assertions
* remove type assertion
* clean up generic confusing types, and add back in a type assertion
* remove generic type
* make sure to interpolate label names
* fix bugs with variables not interpolating before query
* remove debug
* assert partial properties on QueryBuilderLabelFilter
* Force update betterer results :(
* update regex so dropdown UX more closely matches current behavior
* add eslint ignore
* add eslint ignore and update betterer
(cherry picked from commit ee7348afeea1f746a6ee4e6c7bbfc77743a43204)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
* Linux repositories: Document `apt|rpm.grafana.com` (#57527) (#58475)
* Linux repositories: Document `apt|rpm.grafana.com`
We'll be moving off packages.grafana.com (it will be linked to the new repositories)
The new package repositories are easier to use, so let's document them instead
Question: Are the scripts in `scripts/build/update_repo` and `scripts/verify-repo-update` still used? They seem very old, and seem like the generation of scripts before grabpl was created
* Shorter RPM docs. No need to copy the same snippet twice
* Add warning about repository migration
* oops
(cherry picked from commit f1f401147f5ea3bf71099b6358a5ee81f7c68f6a)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* Navigation: Expose new props to extend `Page`/`PluginPage` (#58465) (#58562)
* add extensions and customisation to `Page`
* adjust alignment
(cherry picked from commit b3c761aaa79d374d7dc13c5456e322e1cc294b09)
* Alerting: Log when alert rule cannot be screenshot to help debugging (#58537) (#58563)
(cherry picked from commit 68600c224b36c4668cec75b7acc30369ac8f4eec)
* Plugins: CallResource: Use canonical MIME headers when writing response (#58506) (#58567)
* Plugins: CallResource: use canonical MIME headers when writing response
* Plugins: add tests for canonical mime headers and Set-Cookie filter
* Removed extra new line
(cherry picked from commit 33f02839f0792974a103629136df36528159059a)
Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
* Alerting: Fix logging pointer address of DashboardUID and PanelID variables (#58539) (#58565)
(cherry picked from commit c5ae1bcfe06449fafe6cc4abb8d4a4c17a8c94e4)
* Canvas: Fix setting icon from field data #58499 (#58604)
(cherry picked from commit 47055561ec92ddb6f4d1d1fdcedb09345cb3b0cf)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* [v9.2.x] Canvas: Improve disabled inline editing UX (#58614)
Canvas: Improve disabled inline editing UX (#58610)
(cherry picked from commit fd6edbf8c5a52619f00a7e4e440e8bc93df18260)
Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
* [v9.2.x] Docs: Add feature flag example to override configuration with environment variables (#58615)
Co-authored-by: Alexa V <239999+axelavargas@users.noreply.github.com>
* [v9.2.x] Chore: Upgrade go-sqlite3 to v1.14.16 (#58588)
(cherry picked from commit 990d8cd22e4a9ed2347663fe8c72dc37b46537d1)
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* [v9.2.x] Tempo: Fix search removing service name from query (#58633)
Tempo: Fix search removing service name from query (#58630)
* Fix handleOnChange deps
* Remove eslint disable
(cherry picked from commit c76183a961edd87eb1c620e327bb0aa4ea930041)
Co-authored-by: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com>
* Bumping msw and xmldom to mitigate xmldom vulnerability (#58632)
* Prometheus: Handle errors and warnings in buffered client (#58657)
Prometheus: Handle errors in buffered client (#58504)
* Handle prometheus errors in buffered client
* Handle prometheus warnings
* Fix tests
* Add unit test for warnings
(cherry picked from commit 8edeb1aa2268c0c9666a739d6e0841aab98390b9)
* [v9.2.x] StateTimelinePanel: Fix duration on merged values (#58679)
StateTimelinePanel: Fix duration on merged values (#58561)
Fix stateTimeline duration
(cherry picked from commit 79142340e085aa1aa1e02ae77bd59b481c2e5f96)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* [v9.2.x] Omit error from http response (#58445)
* [v9.2.x] Toolkit: Fix compilation loop when watching plugins for changes (#58695)
Toolkit: Fix compilation loop when watching plugins for changes (#58167)
* fix(toolkit): ignore node_modules and dist directories when watching for changes to plugin
* fix(toolkit): move watchOptions.ignored config to pluginDev watch call
(cherry picked from commit ce5040074058062e1777feafe2ad419af1f6a216)
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* [v9.2.x] Docs: Add document for jsondata field alertmanagerUid (#57121)
* 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>
Co-authored-by: Daniel Lee <dan.limerick@gmail.com>
* Fix: Email and username trimming and invitation validation (#58446)
* 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>
* CI: Make build and store storybook trigger in the release process (#58686) (#58704)
Make storybook trigger conditional
(cherry picked from commit 09c3ead94573815e089a99caa8aaf536dd83193b)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] SQL: Fix issue where testing the datasource would always be successful if the `datasourceQueryMultiStatus` feature was enabled (#58685)
SQL: Fix issue where testing the datasource would always be successful if the `datasourceQueryMultiStatus` feature was enabled (#58671)
SQL Datasources: fix issue where testing the datasource connection would show success even when there was an error.
Co-authored-by: Victor Marin <victor.marin@grafana.com>
(cherry picked from commit 75e435fb00942483c421d052066225b9f5fe9ce4)
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
* [v9.2.x] Docs: corrects relrefs (#58709)
Docs: corrects relrefs (#58706)
corrects relrefs
(cherry picked from commit a9458c8c00c5aba6efcbf9879662ebdd6174c248)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* [v9.2.x] Snapshots: Allow user with viewer permissions to delete own snapshots (#58715)
Snapshots: Allow user with viewer permissions to delete own snapshots (#58572)
(cherry picked from commit 59d2cf2ff790ccc55b82902b66b241c8d809dcb2)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* [v9.2.x] Use relref resolved from nearest section (#58721)
Use relref resolved from nearest section (#58718)
As image-rendering is a branch bundle, it is considered a section by
Hugo and relrefs should be resolved from there even for child pages.
The behavior that worked in `next` but not `latest` could be explained
by the lenient but potentially ambiguous relref resolution algorithm
Hugo uses. However, I have not determined the exact difference between
the two sets of content that causes `next` to work but `latest` not to.
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit b9d8bcb59ba1725dcc58a0c0c7e3dc812d3a75b3)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Search: Fixes issue with Recent/Starred section always displaying "General" folder (#58749)
* [v9.2.x] CI: Remove base and arch args (#58209) (#58713)
Remove base and arch args (#58209)
(cherry picked from commit 9c1c10ab9a522db4a99310e1f2e01148b86e222d)
# Conflicts:
# .drone.yml
# Conflicts:
# .drone.yml
* [v9.2.x] SSE: Keep value name from numeric table (#58850)
SSE: Keep value name from numeric table (#58831)
fixes #48868
(cherry picked from commit 1953d473c04eb4a5b6c9f4231384ab0cb3dae8f3)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* Release: Bump version to 9.2.6 (#58857)
"Release: Updated versions in package to 9.2.6"
* [v9.2.x] Transformations: Make Card Descriptions Clickable (#58733)
Transformations: Make Card Descriptions Clickable (#58717)
replace Card Meta w Card Description
(cherry picked from commit 16aa4376acf2d5eb559feeb514f1852cd3b48ff9)
Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
* [v9.2.x] Changelog: Updated changelog for 9.2.5 (#58856) (#58862)
* Changelog: Updated changelog for 9.2.5 (#58856)
(cherry picked from commit df27164b8e0167b1b6c277d3f5a0fbd64b520eab)
* [v9.2.x] Chore: Extract server lock error so it can be used with errors.As (#58905)
Chore: Extract server lock error so it can be used with errors.As (#58899)
chore: extract server lock Error so it can be used with error.As
(cherry picked from commit 7e9d94cfda96f4229019d3a9ae1d854162595ae2)
Co-authored-by: Jo <joao.guerreiro@grafana.com>
* [v9.2.x] Alerting: Fix metric in Images in Notifications docs (#58978)
Alerting: Fix metric in Images in Notifications docs (#58954)
(cherry picked from commit 4da97aef7dc202f8fc671ef2f925bb14f3c90ad6)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* [v9.2.x] Docs: adjusts link to kms integration (#58982)
Docs: adjusts link to kms integration (#58981)
adjusts link to kms integration
(cherry picked from commit e7b5bd34bdc126f696a9b13ecfcab19f660cfde9)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* [v9.2.x] Docs: adds permission validation setting (#58987)
Docs: adds permission validation setting (#58970)
* adds permission validation setting
* Update docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
* makes prettier
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
(cherry picked from commit 780efa57917c2951054a7558710e53d19f140f22)
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* resolves merge conflict (#58997)
* [v9.2.x] Alerting: Add Troubleshooting to Images in notifications docs (#59025)
Alerting: Add Troubleshooting to Images in notifications docs (#58955)
(cherry picked from commit 2f878acd9df99881f5a92456ec987c6548f07ec7)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* [v9.2.x] Prometheus: fix Heatmap y buckets when legendFormat: auto (#59064)
Prometheus: fix Heatmap y buckets when legendFormat: auto (#59053)
(cherry picked from commit 1f4834a144087fcdb408baec9db00075384e27cd)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* [v9.2.x] Alerting: Support Prometheus durations in Provisioning API (#59066)
Alerting: Support Prometheus durations in Provisioning API (#58293)
Provisioning API should support Prometheus durations
(cherry picked from commit 57d6adbc7c4008143ac18fc7076607be227e12d3)
Co-authored-by: Bart Peeters <birtpeeters@hotmail.com>
* [v9.2.x] MS/My/PostgresSQL: Migrate annotation query (#58847) (#59072)
MS/My/PostgresSQL: Migrate annotation query (#58847)
(cherry picked from commit 38f25a0bf56cc1727472dd9a2755d5206890fbce)
* [v9.2.x] Azure Monitor: Fix resource picker selection for subresources (#59136)
Azure Monitor: Fix resource picker selection for subresources (#56392)
(cherry picked from commit 5b1ff83ee9c527c83439f0ac52d74d9b0df6d3c1)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* [v9.2.x] SQL: Fix code editor for SQL datasources (#59189)
SQL: Fix code editor for SQL datasources (#58116)
* SQL: Fix code editor for sql datasources
* Fix: mysql completion with defaultdb
(cherry picked from commit 75097b99fb68a5c7b1dad2c41d4927afc493d3c7)
* [9.2.x] Fix #58598 X-ID-Token header missing on Loki Datasource (#58784) (#59196)
* Fix #58598 X-ID-Token header missing on Loki Datasource (#58784)
* Fix #58598 X-ID-Token header missing on Loki Datasource
* Remove unecessary continue statements
* Add getAuthHeadersForCallResource unit tests
* Fix test and switch statement issues introduced during merge
(cherry picked from commit f1ef63791ad17d4c3b16cd296148c403515ad37d)
* update test
* missed linting
Co-authored-by: Yann Vigara <yvigara@users.noreply.github.com>
* Changelog: Updated changelog for 9.2.6 (#59232) (#59244)
(cherry picked from commit ae508c12f3dd9d9c69b0611b28df57c00dc5891f)
# Conflicts:
# CHANGELOG.md
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Release: Bump version to 9.2.7 (#59245)
"Release: Updated versions in package to 9.2.7"
* [v9.2.x] Heatmap: Fix blurry text & rendering (#59261)
Heatmap: Fix blurry text & rendering (#59260)
(cherry picked from commit 6f00bc5674d994cb85716610807e4b4f3e232fbf)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* [v9.2.x] Azure Monitor: Fix empty/errored responses for Logs variables (#59277)
Azure Monitor: Fix empty/errored responses for Logs variables (#59240)
(cherry picked from commit 276b54fe9d41d7c435eb255f75cc1a54bf415db3)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* [v9.2.x] PostgreSQL: Fix missing CA field from configuration (#59285)
PostgreSQL: Fix missing CA field from configuration (#59280)
* PostgreSQL: Fix missing CA field from configuration
(cherry picked from commit be73418d0011c6303c2f638c49002445cd63ccf9)
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
* [v9.2.x] TimeseriesPanel: Preserve string fields for data link interpolation (#59296)
TimeseriesPanel: Preserve string fields for data link interpolation (#58424)
* TimeseriesPanel: Preserve string fields for data link interpolation
* clean code
* Modify tests so that string fields are allowed only when a valid time/number dataframe exists
* performance mods
* fix wrong length
* remove console.log
* Check if aligned dataframe has links
(cherry picked from commit 0da77201bf0958b60fcc44b2bf62f5be2a47eeff)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* Access Control: Clear user's permission cache after resource creation (#59318)
resolve merge conflicts
* [v9.2.x] Navigation: Fix crash when Help is disabled (#59375)
Navigation: Set navtree to an empty array instead of null (#58919)
set navtree to an empty array instead of null
(cherry picked from commit 4aa5dea96bd2f9bb137be704e1f69c09c00cdfb3)
Co-authored-by: Leo <108552997+lpskdl@users.noreply.github.com>
* [v9.2.x] BarChart: fix hover overlay for hz stacked (#59397)
BarChart: fix hover overlay for hz stacked (#59359)
(cherry picked from commit 13d5ad2ce2a7283dc25dace1328cbf0c11fec639)
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
* Docs: Improve docs for images in notifications (#59033) (#59404)
(cherry picked from commit 0af3515e95cf185b60242022ede43562127757be)
* [v9.2.x] SSE: Make sure to forward headers, user and cookies/OAuth token (#58897) (#59430)
SSE: Make sure to forward headers, user and cookies/OAuth token (#58897)
Fixes #58793 and Fixes https://github.com/grafana/azure-data-explorer-datasource/issues/513
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 5623b5afafbf541eac66fab1d9398756bdf9052c)
Co-authored-by: Kyle Brandt <kyle@grafana.com>
* [v9.2.x] SQL Datasources: Fix annotation migration (#59454)
SQL Datasources: Fix annotation migration (#59438)
(cherry picked from commit 71e4a8261df505cd1f14e3aeed18c7cd182dad0f)
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
* [v9.2.x] Fix: Allow creating snapshot with no dashboard id (#59465)
Fix: Allow creating snapshot with no dashboard id (#58669)
(cherry picked from commit d279b6d7b09b979add6cc285542bf44bd1eb85fe)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* [v9.2.x] Docs: Add docs for labels with dots (#59486)
Docs: Add docs for labels with dots (#59352)
(cherry picked from commit c8c1499cd0cb76da66c8949332efe5050e5d656d)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* Release: Bump version to 9.2.8 (#59526)
"Release: Updated versions in package to 9.2.8"
* [v9.2.x] Changelog: Updated changelog for 9.2.7 (#59525) (#59528)
Changelog: Updated changelog for 9.2.7 (#59525)
(cherry picked from commit 312dbc979e3126bbdd491beb68c976910905f979)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Backport Fix XSS in runbook URL (#681) to v9.2.x (#683)
(cherry picked from commit db1548c1491c2f5b522e3c0ceb1832b914a4b2f0)
(cherry picked from commit 3135a81edf0ebeb575c95560dd548f9589c14d02)
(cherry picked from commit fe17b64445d9cac8c0b4756867f609320c9cb049)
* [v9.2.x] Docs: Remove publish.yml (#59536)
Remove publish.yml
* [v9.2.x] Fix: Unlocking the UI for AuthProxy users (#59529)
Fix: Unlocking the UI for AuthProxy users (#59507)
Unlocking the UI for AuthProxy users
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
(cherry picked from commit 5bb99775bb995436e9fcf723ed1e622b685a9f1f)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* [v9.2.x] Datasources: Use context logger in cache service (#59557)
Datasources: Use context logger in cache service (#59547)
(cherry picked from commit 0fca3cf9ddc1c0e4dd1407d36099ac630fa5a74f)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
* [v9.2.x] Sessions: Remove invalid session cookie if it's invalid/expired/missing (#59588)
only remove invalid session cookie if it's invalid/expired/missing
(cherry picked from commit 270a893e127c7b9a050b9db16bb54ee0f5783191)
* [v9.2.x] Automate docs publishing steps (#59565)
* 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.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] AzureMonitor: Fix panic from empty response in ARG (#59706)
AzureMonitor: Fix panic from empty response in ARG (#59691)
AzureMonitor: Avoid panic from empty response in ARG
(cherry picked from commit 231b5b587c2811d17f765e763b4f65bf58e1610c)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* [v9.2.x] DataSourcePermissions: Handle licensing properly for ds permissions (#59711)
DataSourcePermissions: Handle licensing properly for ds permissions (#59694)
* RBAC: add viewer grand if dspermissions enforcement is not enabled
* RBAC: Change permissions based on role prefix
* RBAC: Add option to for permission service to add a license middleware
* RBAC: Remove actions from query struct
(cherry picked from commit 6d1bcd9f40c5aabf6dee74fdc7a0373b7c25ee0f)
* DataLinks: Backport 58934 to v9.2.x (#59457)
* manual backport
* manual backport
* [v9.2.x] Restrict workflow to grafana/grafana repository (#59755)
Restrict workflow to grafana/grafana repository (#59740)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit e7bdcb4ba865103253c7752bd3ade5f9ebfcf949)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] AzureMonitor: Automate location retrieval (#59810)
* AzureMonitor: Automate location retrieval (#59602)
* Automate location retrieval
- Add function to retrieve provider information
- Add function to retrieve subscription locations
- Add parsers for each function
- Add types
- Update resourcePickerData with new functions
- Remove old location metadata file
* Improve types
- Add types for responses
- Use correct name parameter
- Update response parser (parseProvider unnecessary)
* Fix tests
- Add necessary mocks
* Fix logic and ensure maps are consistent
* Add tests
* Review
* Lint issue
(cherry picked from commit c52d4e2a64806e8cbf47782854fdd1f795cf549d)
* Lint issues
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* FIX: Remove service accounts from quota count (#59878)
* [v9.2.x] Chore: Remote cache key prefix (#59838) (#59877)
Chore: Remote cache key prefix (#59838)
* attempt to implement a remote cache key prefix
* add a test for the prefix store
* oh, linter
(cherry picked from commit 3978502d837986a9ad77f4bf303b433f038637b1)
* [9.2.x] Instrumentation: Log plugin and datasource info for each plugin request. (#59882)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
* [v9.2.x] Chore: Add encryption codec to the remote cache (#59871) (#59896)
* add encryption codec to the remote cache
* change config files too
* fix test constructor
* pass codec into the test cache
(cherry picked from commit f1fb202284a961bd8e3229742e57cc834a201078)
* FeatureToggle: for storing signed in user object in a Remote Cache (#59883)
* FeatureToggle: for storing sessions in a Remote Cache
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* Fix conflicting modifications :D
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* rename the flag to userRemoteCache
* undo unintended change
* Users: Add option to use remote cache for SignedInUsers (#59892)
* Add remote cache to GetSignedInUserWithCacheCtx
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* Populate SignedInUser remote cache
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* Line
* minor fixes to make this work
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* Fix tests
* change flag to updated name
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
* Auth: Session cache [v9.2.x] (#59907)
* add cache wrapper
only cache token if not to rotate
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
anticipate next rotation
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 07a4b2343d59cb593ad128355e1d9217ba493700)
* FeatureToggle: for storing sessions in a Remote Cache
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
(cherry picked from commit b8a8c15148c53a76f14f76da1b0fa4cec9be9216)
* use feature flag for session cache
* ensure ttl is minimum 1 second
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* ensure 2 ttl window to prevent caching of tokens near rotation
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
* fix description of toggle
Co-authored-by: gamab <gabi.mabs@gmail.com>
Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* [v9.2.x] Plugins: Add username to datasource plugin logging (#59947)
Plugins: Add username to datasource plugin logging (#59893)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit a5ace56be8644c725803e63798554a35eba27e79)
Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
* [9.2.x] Backport Contexthandler: Add uname as response header #59930 (#59950)
* Contexthandler: Add uname as response header (#59930)
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 1b676d0d49460572352af4639274a4e7fe03fc9b)
* fixes tests broken due to moved featuremgt package
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Signed-off-by: bergquist <carl.bergquist@gmail.com>
* Auth: Logger for user remote cache (#59961)
add logger
* [v9.2.x] UsageInsights: Record events for Explore queries (#59992)
* UsageInsights: Record events for Explore queries (#59931)
* usageinsights: record events for Explore queries
* usageinsights: make the source field optional
It is not logical to have it for an event like the dashboard-view
* usageinsights: add comment to Explore test
Explain why we are reversing a previous decision
(cherry picked from commit 74167b4d44119862c1246caa3367e4f488efd15e)
* usageinsights: fix merge conflict
* Empty-Commit to trigger build
* usageinsights: fix broken tests after merge
* [v9.2.x] Fix index out of range in regenerateLinksSupplier (#60069)
Fix index out of range in regenerateLinksSupplier (#60011)
(cherry picked from commit 896cb9ddceae6c02811a33e8a323b877cf100151)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* [v9.2.x] Fix branch filter for release workflows (#60123)
Fix branch filter for release workflows (#59963)
Ensures the workflow is run on every push to all version branches.
This was thought to be working because it was tested with a manual
dispatch, however, that trigger does not consider filters and was not
an accurate test.
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 6f9ee7acf9a8fee8b4a55af94d9dfccced55032c)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Use relative aliases for all non-current Grafana aliases (#60113)
* Use relative aliases for all non-current Grafana aliases
Prevents non-latest documentation "stealing" the page away from latest
and through permanent redirects for latest pages that no longer exist.
The redirected pages are indexed by search engines but our robots.txt
forbids them crawling the non-latest page.
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Remove all current page aliases
find docs/sources -type f -name '*.md' -exec sed -z -i 's#\n *- /docs/grafana/next/[^\n]*\n#\n#' {} \;
find docs/sources -type f -name '*.md' -exec sed -z -i 's#\n *- /docs/grafana/latest/[^\n]*\n#\n#' {} \;
find docs/sources -type f -name '*.md' -exec sed -Ez -i 's#\n((aliases:\n *-)|aliases:\n)#\n\2#' {} \;
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Snapshots: Build snapshot originalUrl on the backend (#60232) (#60256)
Co-authored-by: kay delaney <kay@grafana.com>
* Cloudwatch: Fix deeplink with default region (#60260) (#60273)
Cloudwatch: fix deeplink with default region
(cherry picked from commit d6bb2a74931a9c2b393fa22040737fb6480819f3)
* [v9.2.x] Graphite: bug fix, strip white space from queries before comparing them (#60348)
Graphite: bug fix, strip white space from queries before comparing them (#60133)
strip white space from queries before comparing them
(cherry picked from commit d5d07894b1222eab49f58157f3367d5a5ef2726e)
Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
* [v9.2.x] Alerting: Set Dashboard and Panel IDs on rule group replacement (#60443)
Alerting: Set Dashboard and Panel IDs on rule group replacement (#60374)
* Set Dashboard and Panel IDs on rule group replacement
* fix comments and abbreviate test variable name
* Update pkg/services/ngalert/provisioning/alert_rules.go
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
(cherry picked from commit 174c61b949a905ab567e9e0d65a84483f00e4079)
Co-authored-by: Alex Moreno <alexander.moreno@grafana.com>
* [v9.2.x] Add copyright notice (#60662)
* Add copyright notice (#60658)
* Create copyright
* add copyright notice
(cherry picked from commit c7671b6d1daf7987e5b8bf72b766f9b404449daa)
* yarn run prettier:write
(cherry picked from commit 160ea3e262f7db24e925d375d16670fd0200105c)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] BarChart: Clear tooltip when cursor exits bar (#60748)
BarChart: Clear tooltip when cursor exits bar (#60617)
(cherry picked from commit 9bd6e471e436fed37a908e5118593d515b134781)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* [v9.2.x] Prometheus: Fix Instant query time calculation (#60821)
Prometheus: Fix Instant query time calculation (#60815)
* Use single point in time instead of doing time range calculation
* Comment update
(cherry picked from commit 15d32546ea315f8ccada85cd64c5b49d55b0d6ec)
* [v9.2.x] Alerting: Prevent uid collision in migration when db is case-insensitive (#60834)
Alerting: Prevent uid collision in migration when db is case-insensitive (#60494)
* Alerting: Prevent short uid collision in legacy migration when db is case-insensitive
Two factors come into play that cause sporadic uid conflicts during legacy alert migration:
- MySQL and MySQL-compatible backends use case-insensitive collation.
- Our short uid generator is not a uniform RNG and generates uids in such a way that generations in quick succession have a higher probability of creating similar uids.
Normally we would be guaranteed unique short uid generation, however if the source alphabet contains
duplicate characters (for example, if we use case-insensitive comparison) this guarantee is void.
Generating even ~1000 uids in quick succession is nearly guaranteed to create a case-insensitive
duplicate.
(cherry picked from commit 570b62091c681fec4af9a761db09fbec94b3f750)
Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
* [v9.2.x] Chore: Upgrade Go to 1.19.4 (#60794) (#60826)
* [v9.2.x] remove _build param from whatsnew (#59236) (#60888)
remove `_build` param from whatsnew (#59236)
* remove `_build` param from whatsnew
* Update whats-new-in-v9-3.md
Co-authored-by: Robby Milo <robbymilo@fastmail.com>
* Docs: Add source code url field description in publish a plugin documentation (#61080) (#61133)
* [v9.2.x] Canvas: Inconsistent save behavior (#61012)
Canvas: Save element placement (#61007)
(cherry picked from commit 88a8cba6b08901966aebf8e19c16b1a973da61f8)
Co-authored-by: Adela Almasan <88068998+adela-almasan@users.noreply.github.com>
* [v9.2.x] remove splunk plugin from legacyRunner check (#61180)
remove splunk plugin from legacyRunner check (#60979)
(cherry picked from commit 7db284cfcb9f8f3c10df07a30ad42833e8890b77)
Co-authored-by: Taewoo K <taewoo.kim@grafana.com>
* [v9.2.x] Update publishing workflows to use PATs with fine-grained access control (#61267)
Update publishing workflows to use PATs with fine-grained access control (#61098)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 87ccf10ffe9adf8cf9aee48d27964a6c704ee8ac)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* Add reference to Google OAuth docs (#61148)
* [v9.2.x] Bugfix: Prevent previous query editor to set default values when changing data source (#61285)
Bugfix: Prevent previous query editor to set default values when changing data source (#60218)
* Fixed issue where the query editor of the previous ds sets default values on query passed to the query editor of the next ds.
* Fixed issue with changing data source for query in Alerting.
* Will apply default values from DS if available.
* Fix failing tests.
* fixed spell error.
* reverted getDefaultQuery call so it can be added in a separate PR.
(cherry picked from commit b633d5395db1d04cc074e295acdc5f448beb7b99)
Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
* [v9.2.x] Levitate: Only run against the main branch (#61401) (#61462)
Levitate: Only run against the main branch (#61401)
chore: only run Levitate against the main branch
(cherry picked from commit b8aaf85fdca926c6aff3d20cb9955e063e997ec1)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
* [v9.2.x] Pin doc-validator image version to allow repository to opt in to breaking changes (#61480)
Pin doc-validator image version to allow repository to opt in to breaking changes (#61456)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 017d4f2cbbe5125098fbc183a694422a3117f3a3)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Live: Fix `Subscription to the channel already exists` live streaming error (#61419)
Live: Fix `Subscription to the channel already exists` live streaming error (#61406)
#60570: Fix `subscription to the channel already exists`
(cherry picked from commit 23dbc916e8a0ea72360fcda43fcccfc45f4dba80)
Co-authored-by: Artur Wierzbicki <artur.wierzbicki@grafana.com>
* [v9.2.x] update docs docker image reference (#61501)
update docs docker image reference (#61269)
* update docs docker image
* remove command
(cherry picked from commit 98cadb3aa0d315e40599715d1687603943542347)
Co-authored-by: Robby Milo <robbymilo@fastmail.com>
* [v9.2.x] Auth: Fix correct error for updateapikey in context handler (#61564)
Auth: Fix correct error for updateapikey in context handler (#61544)
* fix: correct error for updateapikey
* refactor: send the correct err forward
* update: based on review
(cherry picked from commit 07bbc0716c8a5e105bbf96cf6965c03cd6f199aa)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [v9.2.x] Docs: Renderer token (#61681)
Docs: Renderer token (#59560)
* Docs: renderer token
* Apply suggestions from code review
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Update docs/sources/setup-grafana/image-rendering/_index.md
* Update docs/sources/setup-grafana/configure-grafana/_index.md
* makes prettier
Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>
Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit d042c0b30b4962497480feee3f57f24c6050ea4e)
Co-authored-by: Leonard Gram <leo@xlson.com>
* [v9.2.x] Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61691)
Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61675)
* fix: remove metrics from duplicate user entries
* fix: disable metrics collection for authinfo
* fix: initifine goroutine loop that happened
* removed: metrics
(cherry picked from commit bedd2304d1bbc5e65512a7938ac1a231bb6b3f14)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [9.2.x] Use new GPG key when publishing (#61791)
update .drone.yml
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* [v9.2.x] SearchV2: Fix star query when no stars exist (#61818)
SearchV2: Fix star query when no stars exist (#61726)
(cherry picked from commit c315946a9196c51c5c48ee5c1ceb1c509b709e5a)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* [v9.2.x] Packaging: Use base64 key (#61822)
backport
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
* [v9.2.x] Update _index.md (#61828)
Update _index.md (#61662)
* Update _index.md
The troubleshooting page was missing how to send dashboard panels for debugging so added it here.
* Update docs/sources/troubleshooting/_index.md
* Update docs/sources/troubleshooting/_index.md
* removed empty lines
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit 6c6c0f54025fe4183c03b529a2ab8bd5039afbda)
Co-authored-by: Usman Ahmad <69509548+usmangt@users.noreply.github.com>
* [v9.2.x] Canvas: Rectangle render error (#61888)
* TextPanel: Refactor to functional component (#60885) (#61940)
backport
* Release: Bump version to 9.2.11 (#62038)
"Release: Updated versions in package to 9.2.11"
* Docs: Update publish a plugin FAQ to cover more common questions (#62… (#62064)
* Changelog: Updated changelog for 9.2.10 (#62066) (#62076)
* Changelog: Updated changelog for 9.2.10
* Update CHANGELOG.md
* Update CHANGELOG.md
Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
(cherry picked from commit 87023c85cb767e275bda9f054d1863c5bab03caa)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* [v9.2.x] SVG: Add dompurify preprocessor step (#62158)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 8b574e22b53aa4c5a35032a58844fd4aaaa12f5f)
* [v…- Loading branch information
97 people
committed
Mar 16, 2023
1 parent
088a114
commit 7a27215