38197 Commits
Author SHA1 Message Date
Dimitris Sotirakis 042e4d216b [v9.2.x] CI: Remove base and arch args (#58209) (#58713)
Remove base and arch args (#58209)

(cherry picked from commit 9c1c10ab9a)

# Conflicts:
#	.drone.yml

# Conflicts:
#	.drone.yml
v9.2.5
2022-11-16 08:13:14 +00:00
Grot (@grafanabot) 72900d81d8 [v9.2.x] Search: Fixes issue with Recent/Starred section always displaying "General" folder (#58749) 2022-11-15 14:26:01 +01:00
Grot (@grafanabot)andJack Baldry bc708d3543 [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 b9d8bcb59b)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2022-11-14 17:13:05 -04:00
Grot (@grafanabot)andkay delaney a8ceec0ed9 [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 59d2cf2ff7)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2022-11-14 14:25:41 -05:00
Grot (@grafanabot)andChristopher Moyer 62f4012590 [v9.2.x] Docs: corrects relrefs (#58709)
Docs: corrects relrefs (#58706)

corrects relrefs

(cherry picked from commit a9458c8c00)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2022-11-14 09:49:20 -06:00
Grot (@grafanabot)andOscar Kilhed 0c9e3abc52 [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 75e435fb00)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
2022-11-14 15:53:14 +01:00
malcolmholmesandDimitris Sotirakis 1cf016c9b2 CI: Make build and store storybook trigger in the release process (#58686) (#58704)
Make storybook trigger conditional

(cherry picked from commit 09c3ead945)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2022-11-14 16:15:23 +02:00
JoandMihaly Gyongyosi 15179a6abb 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>
2022-11-14 13:10:15 +01:00
d26b6aae07 [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>
2022-11-14 11:04:38 +01:00
Grot (@grafanabot)andJack Westbrook d074471557 [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 ce50400740)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2022-11-14 09:54:58 +01:00
Karl Persson 0f0211f400 [v9.2.x] Omit error from http response (#58445) 2022-11-14 09:42:45 +01:00
Grot (@grafanabot)andVictor Marin 47f8928be1 [v9.2.x] StateTimelinePanel: Fix duration on merged values (#58679)
StateTimelinePanel: Fix duration on merged values (#58561)

Fix stateTimeline duration

(cherry picked from commit 79142340e0)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2022-11-11 13:33:48 -05:00
ismail simsek 1e97806819 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 8edeb1aa22)
2022-11-11 16:30:55 +01:00
Timur Olzhabayev d6d6db54f9 Bumping msw and xmldom to mitigate xmldom vulnerability (#58632) 2022-11-11 16:12:55 +01:00
Grot (@grafanabot)andJoey Tawadrous a01d5a10f5 [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 c76183a961)

Co-authored-by: Joey Tawadrous <90795735+joey-grafana@users.noreply.github.com>
2022-11-11 10:59:05 +00:00
Grot (@grafanabot)andEmil Tullstedt a151924ed3 [v9.2.x] Chore: Upgrade go-sqlite3 to v1.14.16 (#58588)
(cherry picked from commit 990d8cd22e)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2022-11-11 11:31:33 +01:00
Grot (@grafanabot)andAlexa V 65bd73f5cc [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>
2022-11-10 16:42:06 -05:00
Grot (@grafanabot)andNathan Marrs 2c28ae5e70 [v9.2.x] Canvas: Improve disabled inline editing UX (#58614)
Canvas: Improve disabled inline editing UX (#58610)

(cherry picked from commit fd6edbf8c5)

Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
2022-11-10 16:17:41 -05:00
Grot (@grafanabot)andNathan Marrs 707800cd6c Canvas: Fix setting icon from field data #58499 (#58604)
(cherry picked from commit 47055561ec)

Co-authored-by: Nathan Marrs <nathanielmarrs@gmail.com>
2022-11-10 14:10:24 -05:00
George Robinson cc2560b96f Alerting: Fix logging pointer address of DashboardUID and PanelID variables (#58539) (#58565)
(cherry picked from commit c5ae1bcfe0)
2022-11-10 13:45:20 +00:00
Grot (@grafanabot)andGiuseppe Guerra 4e687bf869 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 33f02839f0)

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
2022-11-10 13:38:46 +01:00
George Robinson b372406a61 Alerting: Log when alert rule cannot be screenshot to help debugging (#58537) (#58563)
(cherry picked from commit 68600c224b)
2022-11-10 11:06:50 +00:00
Ashley Harrison b689ec5d43 Navigation: Expose new props to extend Page/PluginPage (#58465) (#58562)
* add extensions and customisation to `Page`

* adjust alignment

(cherry picked from commit b3c761aaa7)
2022-11-10 10:05:45 +00:00
Grot (@grafanabot)andJulien Duchesne bcb1e94784 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 f1f401147f)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
2022-11-10 11:01:25 +01:00
Grot (@grafanabot)andGalen Kistler b2b673ab16 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 ee7348afee)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2022-11-09 15:15:17 -05:00
Grot (@grafanabot)andChristopher Moyer b333b2bc97 adjusts the stem sentence (#58538) (#58541)
(cherry picked from commit ad374efcbd)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2022-11-09 11:33:06 -06:00
George Robinson a2f412e21f Alerting: Small improvements to staleResultsHandler (#58007) (#58513)
(cherry picked from commit 1290951b65)
2022-11-09 17:15:09 +00:00
Grot (@grafanabot)andGeorge Robinson 40ad7fe358 Alerting: Fix images cached on rule instead of dashboard panel signature (#58510) (#58536)
(cherry picked from commit 7e852720e3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-09 17:14:16 +00:00
Grot (@grafanabot)andAshley Harrison c48d42177f Add new PageInfo component (#58421) (#58534)
(cherry picked from commit 831ecb467c)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2022-11-09 11:59:50 -05:00
Grot (@grafanabot)andGeorge Robinson 18e8f6dc65 Alerting: Improve debug logs in image service (#58507) (#58533)
(cherry picked from commit b92a0223e3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-09 16:48:59 +00:00
Grot (@grafanabot)andChristopher Moyer b123e396ec 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 2dfe0a4060)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2022-11-09 10:20:01 -06:00
Grot (@grafanabot)andGareth Dawson 725618e1d1 Elasticsearch: fix typo (#58519) (#58523)
(cherry picked from commit fa5a304de8)

Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
2022-11-09 15:39:31 +00:00
8f06aa45ac Tempo: Fix dropdown issue on tag field focus (#57616) (#57883)
(cherry picked from commit 77be89eb1c)

Co-authored-by: xiyu95 <112968312+xiyu95@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
2022-11-09 11:10:33 +01:00
Grot (@grafanabot)andJoe Blubaugh bc7d29b3d6 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 f07da85d8b)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
2022-11-09 13:04:51 +08:00
George Robinson 749d9c2cba Alerting: Fix screenshots were not cached (#58493) (#58494)
(cherry picked from commit c646ff0ce3)
2022-11-09 10:43:00 +08:00
Grot (@grafanabot)andGeorge Robinson a54d45fa90 Alerting: Use hash of opts in singleflight (#58474) (#58488)
(cherry picked from commit ad9ac85ee0)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-08 22:52:49 +00:00
Grot (@grafanabot)andGeorge Robinson 91d4141cf9 Use fnv64 for InmemCacheService (#58468) (#58487)
(cherry picked from commit 72275e97d2)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2022-11-08 22:18:39 +00:00
Grot (@grafanabot)andAdam Simpson 00bede823f 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 3e92a2dc77)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
2022-11-08 12:11:34 -05:00
Grot (@grafanabot)andEmil Tullstedt 4d00a510d1 pkg/web: avoid shared middleware slice (#58458) (#58463)
(cherry picked from commit 75701695d8)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2022-11-08 11:13:05 -05:00
Grot (@grafanabot)andDan Cech 68882a861a properly format new .drone.yml in verify-drone (#58436) (#58452)
(cherry picked from commit d593aede3d)

Co-authored-by: Dan Cech <dcech@grafana.com>
2022-11-08 10:41:52 -05:00
Grot (@grafanabot)andGalen Kistler a6faa45073 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 9281746914)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2022-11-08 08:56:35 -06:00
Grot (@grafanabot) d9a6bf92d7 "Release: Updated versions in package to 9.2.5" (#58430) 2022-11-08 14:11:37 +00:00
Grot (@grafanabot) c845bfd9ac Changelog: Updated changelog for 9.2.4 (#58429) (#58431)
(cherry picked from commit 94573d3e61)
2022-11-08 09:03:10 -05:00
Grot (@grafanabot)andJulien Duchesne 1049636ef6 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 786c7faff2)

Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
2022-11-08 08:11:54 -05:00
Marcus Efraimsson 0e5a094447 Prometheus: Upgrades http client to v1.13.1 (#58363) (#58395)
(cherry picked from commit faa0fda6eb)
2022-11-08 12:37:59 +01:00
Grot (@grafanabot)andBen Sully b82d26e130 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 480277f612)

Co-authored-by: Ben Sully <ben.sully@grafana.com>
2022-11-08 12:31:45 +01:00
Grot (@grafanabot)andWill Jordan 945c3fafe7 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 d581b368bd)

Co-authored-by: Will Jordan <wjordan@users.noreply.github.com>
2022-11-08 11:41:35 +01:00
Grot (@grafanabot)andChristopher Moyer 164fb230cb 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 0315f6317e)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2022-11-07 13:53:18 -06:00
Dimitris SotirakisandMarcus Efraimsson 7382b1be90 [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 57ee0e4a4b)

* sign drone.yml

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-11-07 18:23:44 +01:00
George RobinsonandNeel d38ac63f22 Alerting: Append org ID to alert notification URLs (#57123) (#58349)
(cherry picked from commit db1fd10ff1)

Co-authored-by: Neel <47709856+neel1996@users.noreply.github.com>
2022-11-07 17:07:07 +00:00