Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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)
* [v9.2.x] QueryEditorRow: Fixes issue loading query editor when data source variable selected (#62179)
QueryEditorRow: Fixes issue loading query editor when data source variable selected (#61927)
* QueryEditorRow: Fixes issue loading query editor when data source variable selected
* Fix func name
* Removed wait
* restore waiting for with better check
* restore waiting for with better check
(cherry picked from commit 9f7ddf1f0b5234a1fd82e1f92d1444f81a794e45)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
* [v9.2.x] update gpg secret names (#62250)
update gpg secret names
* [v9.2.x] Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62205)
Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62193)
* fix: capture both ErrInvalidAPIKey
* rename of variable
(cherry picked from commit c5cb5be3cc078cc99b0324ae0db429646e0603ad)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [v9.2.x] Login: Fix panic when UpsertUser is called without ReqContext (#62574)
* Login: Fix panic when UpsertUser is called without ReqContext (#62539)
(cherry picked from commit b1151dd118f2a1c305a6f757661e42e59cf145c1)
(cherry picked from commit 679cc18648295053a6ab9b764b85cd68f773f81b)
* [v9.2.x] Tempo: Fix span name being dropped from the query (#62591)
Tempo: Fix span name being dropped from the query (#62257)
(cherry picked from commit c3b476e1dcb310e1d3b425f058264ed5be00d1d8)
Co-authored-by: Hamas Shafiq <hamas.shafiq@grafana.com>
* [v9.2.x] Expressions: Fixes the issue showing expressions editor (#62626)
* Expressions: Fixes the issue showing expressions editor (#62510)
* Use suggested value for uid
* update the snapshot
* use __expr__
* replace all -100 with __expr__
* update snapshot
* more changes
* revert redundant change
* Use expr.DatasourceUID where it's possible
* generate files
(cherry picked from commit 91221bc4362e50b9cca6dbff3a8342b2991900d2)
* unit text fix
* [v9.2.x] docs: deleted link to moved content (#62703)
deleted link to moved content
* [v9.2.x] docs: fix broken elasticsearch metrics play link (#62717)
docs: fix broken elasticsearch metrics play link (#62715)
fix broken elastic search play link
(cherry picked from commit 1225e8d6d8a2076f2141065c0ad20b55241d6f25)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* [v9.2.x] Fix/60084/save and test (#62748)
Fix: Save and test error message does not persist across datasource instance settings anymore
(cherry picked from commit ce50168b70b4444abb5a1aa36d695dc1b7c339b9)
Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
* [v9.2.x] Server: Switch from separate server & cli to a unified grafana binary (#58286) (#62754)
* Server: Switch from separate server & cli to a unified grafana binary (#58286)
* avoid the need for a second bulky binary for grafana-cli
* look for grafana-server in $PATH as well as same directory
* implement unified "grafana" command
* update dockerfiles, fix grafana-cli -v
* update packaging to work with single binary
- add wrapper scripts for grafana and grafana-server
- update and sync package files
- implement --sign flag of build package command
- stop packaging scripts folder, they are not useful for end users
- add support for --configOverrides in server command
- remove unused nfpm.yaml config file
* windows support
(cherry picked from commit de99ce139c96e7229bb5e194aed225e3321d8685)
* Build: don't remove grafana-server and grafana-cli binaries from deb and rpm packages (#59890)
* don't remove grafana-server and grafana-cli binaries from /usr/share/grafana/bin in deb and rpm packages
* don't add config overrides in /usr/sbin/grafana-server
(cherry picked from commit 01cba80cbd762a180a18592a82d6e5992c4fb941)
---------
Co-authored-by: Dan Cech <dcech@grafana.com>
* [v9.2.x] MSSQL: Add support for macro function calls (#62887)
MSSQL: Add support for macro function calls (#62742)
* MSSQL: Add support for macro function calls
* Add tests
(cherry picked from commit 9fc3b360a43e9f0295f7366e9ea635a43521b341)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* [v9.2.x] Remove packages path from branch filter (#60946)
Remove packages path from branch filter (#60128)
That directory is no longer used in published docs and causes this
workflow to fail when changes only affect the packages directory.
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 1516aa27622ee5dc8d14cc3ebcd07647bf1619bd)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Update publishing workflows to use organization secret (#63043)
Update publishing workflows to use organization secret (#63001)
The new tokens are managed centrally and have a longer expiry.
Administrators of the grafanabot account will be
notified of the pending expiry and the secret can be rotated centrally
without the need for a repository administrator to update their
secrets.
The existing repository secrets can safely be removed. The tokens for
those secrets will be removed by the end of this week.
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit ba9bdf3455b24f3d86b425ccd24994b915327c3b)
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v9.2.x] Server: Fix issue backporting #58286 to v9.2.x in #62754 (#63067)
Fix issue backporting #58286 to v9.2.x in #62754
* [v9.2.x] Remove `gen-jsonnet` make target from `bra.toml` (#63102)
Remove gen-jsonnet from toml
* [v9.2.x] fix broken envelope encryption link (#63141)
fix broken envelope encryption link (#63135)
(cherry picked from commit 72ca7fe7fe30a95e75e558bf83efc4e791e5018e)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* [v9.2.x] Fix MSSQL queries failing because of bad interpolation (#63170)
Fix MSSQL queries failing because of bad interpolation (#63167)
fix failing mssql queries
(cherry picked from commit 62b078e4e4cad882e9e9a01f36cc8df4aa084eab)
Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
* CI: Backport CI/Release related code to v9.2.x (#63251)
* Cherry pick from 03b1cf7
* Remove publishpackages/go
* Backport enterprise checks
* CI: Allow other modules to register build sub-commands (#62741)
* Allow other modules to register build sub-commands
* CI: Fix retries on artifacts-page clone
* Fix linting errors
* Fix golint issues
* Update to grabpl 3.0.21
(cherry picked from commit 312ea59e6da16c28226042b7cdebf4e660880ed7)
* CI: Remove variants arg from `package` step (#62858)
* Remove variants arg from package step
* Fix starlark lint
* Default to releaseModeConfig.Variants
* Check for empty variants arg
(cherry picked from commit e5c48ac9454a8513d526384751b953ff98d12ecb)
* Remove verify-jsonnet-step
* Revert github.com/grafana/thema bump
* go mod tidy
* Remove publish.star
* Fix lib.star lint
* CI: Running Redis integration tests without grabpl (#63028)
This restores some changes from
https://github.com/grafana/grafana/pull/61920 that were accidentally
deleted.
(cherry picked from commit 2804acd264ff247673f71854d25d79656b7b0775)
* go mod tidy
* Fix clone enterprise for custom events
* Chore: Bump alpine version to `3.17.1` (#63252)
Bump alpine version to 3.17.1
(cherry picked from commit 24c60486f62fd723b3d61718d45e7b9382f74656)
---------
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
* [v9.2.x] MSSQL Datasource: Revert functions within macros change (#63596)
MSSQL Datasource: Revert functions within macros change (#63592)
* Revert functions within macros change
* Add tests for function and macro for mssql
* Remove macro support tests
---------
Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
(cherry picked from commit 356e2e1933f5e717a0e8f7688ba1b44f7bf9fa01)
Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
* [v9.2.x] docs: fixed headings and link to explore with logs (#63673)
[9.3.x] docs: fixed headings and link to explore with logs (#63670)
fixed headings and link to explore with logs
(cherry picked from commit abfd8792e536ec8096f83f5abb4612fb7312f90b)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* [v9.2.x] Update grafana/saml library (#689)
SAML: update grafana/saml
Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Jo <joao.guerreiro@grafana.com>
* [v9.2.x] SVG: Add dompurify preprocessor step (#704)
* SVG: Add dompurify preprocessor step (#698)
* add sanitized SVG component
(cherry picked from commit dbbe819368f507b9493b7a3cf6e080a5dd752b3e)
* remove added file
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* Auth: Update saml go.mod (missing query sig verification) [9.2.x] (#713)
update saml go.mod (missing query sig verification)
(cherry picked from commit 1e1dbd1a06455a451d722856dc619b2a7c78e2c0)
* Release: Bump version to 9.2.11 (#728)
"Release: Updated versions in package to 9.2.11"
* [v9.2.x] Geomap: Sanitize the attribution string (#753)
Geomap: Sanitize the attribution string (#745)
* SAML: Update grafana/saml library (#691)
Co-authored-by: jguer <joao.guerreiro@grafana.com>
* SVG: Add dompurify preprocessor step (#698)
* add sanitized SVG component
* add sanitize
* Fix frontend build
* Remove unnecessary yarn.lock changes
* Fix formatting
* Re-add yarn.lock message as I guess it is needed
---------
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: jguer <joao.guerreiro@grafana.com>
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>
(cherry picked from commit 37b4af7ffacfc24d5f24d190356a9ef32d99aa6f)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* [v9.2.x] TraceView: Add key and url escaping of json tag values (#760)
* [v9.2.x] Docker Build: Use `tonistiigi/binfmt` image for cross compilation (#64115)
Docker Build: Use `tonistiigi/binfmt` image for cross compilation (#64108)
* Change docker image used for cross-compilation
* Replace fmt.Println with log.Println
* Add specific tag for docker image
(cherry picked from commit b42fd92fad7c4e826cb6ae9ed360952bbc9a87a9)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] build: fix corss build (#63263)
build: fix corss build (#61121)
* build: fix corss build
* fix lint
(cherry picked from commit 37baae3699fcad37dac87a759491ae5db02369df)
Co-authored-by: Jimmie Han <hanjinming@outlook.com>
* [9.2.x] CI: Move some build settings (#64491) (#64517)
Backporting https://github.com/grafana/grafana/pull/64491.
* Move some build settings to Vault
* CI: Remove reference to DOWNSTREAM_REPO as it isn't used
(cherry picked from commit 4b241804b401eed529e41fa775186d8ffe89ea1c)
* [v9.2.x] CI: Add `PrereleaseBucket` field in `versions.go` (#64522)
CI: Add `PrereleaseBucket` field in `versions.go` (#64519)
Add PrereleaseBucket in versions.go
(cherry picked from commit 29b3f3fbf4cd64a59422ac14c58d8fb81f7b17f9)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [9.2.x] CI: Do not clone in artifacts-page pipeline (#64663)
This is done in a later step.
* [v9.2.x] Alerting: Fix queries not being previewed in detail view (#64977)
* Alerting: Fix queries not being previewed in detail view (#64198)
(cherry picked from commit 4e81aab60a587b102305a255891986e592a0d1a4)
* Update imports
---------
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
* [v9.2.x] Alerting: Fix expression issues in alert rule view and edit pages (#65008)
* Fix rule viewer
* Fix expressions editor and viewer in alerting
* [v9.2.x] Update CODEOWNERship for grafana-delivery team (#64973) (#65020)
Update CODEOWNERship for grafana-delivery team (#64973)
(cherry picked from commit 2897ee37bf9f575eef19bcd35182232f965c6499)
* [v9.2.x] CI: Update `grabpl` to `3.0.30` (#65028) (#65087)
CI: Update `grabpl` to `3.0.30` (#65028)
Update grabpl
(cherry picked from commit 4a80233bedf6e750f0ce43fa9fe1f6eb7ab9f6fa)
* [v9.2.x] NPM: Stop using the folder path before the name path (#65156)
NPM: Stop using the folder path before the name path (#63851)
Stop using the folder path before the name path
(cherry picked from commit 177aa254c563dfe98ffabd2de56330bee960f160)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v9.2.x] Fix xss in Graphite functions tooltip (#810)
Fix xss in Graphite functions tooltip (#804)
(cherry picked from commit 87aad3f11836f810ee1fdfee27827e746ef36055)
Co-authored-by: Ludovic Viaud <ludovic.viaud@gmail.com>
* [v9.2.x] Changelog: Updated changelog for 9.2.15 (#65196) (#65200)
Changelog: Updated changelog for 9.2.15 (#65196)
* Changelog: Updated changelog for 9.2.15
* Update CHANGELOG.md
---------
Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
(cherry picked from commit a907e042f9cdba3d4c00e89f820bfd9030025af9)
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* Release: Bump version to 9.2.16 (#65202)
"Release: Updated versions in package to 9.2.16"
* [v9.2.x] CD: Remove `fetch-images` dependency from AWS marketplace automation (#65173) (#65193)
CD: Remove `fetch-images` dependency from AWS marketplace automation (#65173)
* Remove fetch-images dependency
* Fix starlark link
(cherry picked from commit d0be9610f0e22a4571a13c2ebf2aaabe281ecf48)
* [v9.2.x] Expressions: More robust expression check (#65231)
* Expressions: More robust expression check (#65006)
More robust expression check
(cherry picked from commit 1328878aceb37da7051c5685375e2ca32ef0a6b4)
* Fix import
* [v9.2.x] CI: Remove `grabpl` dependency from `publish-packages` steps (#65329) (#65331)
CI: Remove `grabpl` dependency from `publish-packages` steps (#65329)
Remove grabpl dependency from publish packages
(cherry picked from commit 3b00d2c273d5b7622b225ae56381879b60a10c2a)
# Conflicts:
# .drone.yml
* [v9.2.x] CI: Cleanup unnecessary `grabpl` dependencies (#65330) (#65345)
CI: Cleanup unnecessary `grabpl` dependencies (#65330)
* Remove unnecessary grabpl dependencies
* Revert test-frontend change
(cherry picked from commit 89d642e001513c72120aac89be997735717dd174)
# Conflicts:
# .drone.yml
* [v9.2.x] CI: Allow overwriting of existing GitHub release assets (#65457)
CI: Allow overwriting of existing GitHub release assets (#65127)
* CI: Allow overwriting of existing GitHub release assets
This closes #63698
* Use c for *cli.Context in publishgithub.go
(cherry picked from commit 4ab3bd6f7e8bff7719c6c8756bfd8a86126a8616)
Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
* [v9.2] docs: fix alias and broken link (#65483)
fixed alias and broken link
* [v9.2.x] configure HTTPS documentation (#65558)
configure HTTPS documentation (#65271)
* configure HTTPS settings for grafana
* Apply suggestions from code review
* Apply suggestions from code review
* rewrites and restructures content
* Apply suggestions from code review
* PR feedback review; https docs
* Update docs/sources/setup-grafana/set-up-https.md
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Update docs/sources/setup-grafana/set-up-https.md
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* Update docs/sources/setup-grafana/set-up-ht…- Loading branch information
98 people
committed
Jun 29, 2023
1 parent
56de6e8
commit 7ff49f3