Commit Graph

40783 Commits

Author SHA1 Message Date
Grot (@grafanabot) 6d0beaedaf [v9.4.x] build: fix corss build (#63261)
build: fix corss build (#61121)

* build: fix corss build

* fix lint

(cherry picked from commit 37baae3699)

Co-authored-by: Jimmie Han <hanjinming@outlook.com>
2023-03-03 10:04:12 -06:00
Grot (@grafanabot) 8c1d16c879 [v9.4.x] Logs: Log samples not being ordered correctly (#64147)
Logs: Log samples not being ordered correctly (#64097)

* fix log samples being unsorted and multiple results when chunking

* use `SortDirection` enum

* changed to `sortDataFrame` to support other datasources than loki

* update tests

* change capitalization

(cherry picked from commit 2076282064)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2023-03-03 10:09:50 -05:00
Ashley Harrison 4ee064da11 Chore: Pass signed user_hash to Intercom via Rudderstack (#63921) (#64145)
* move analytics identifiers to backend

* implement hash function

* grab secret from env

* expose and retrieve intercom secret from config

* concat email with appUrl to ensure uniqueness

* revert to just using email

* Revert "revert to just using email"

This reverts commit 8f10f9b1bc.

* add docstring

(cherry picked from commit d61bcdf4ca)
2023-03-03 10:06:13 -05:00
Grot (@grafanabot) 1548edc40e [v9.4.x] Docs: Meta-monitoring docs for Grafana and Mimir (#64142)
Docs: Meta-monitoring docs for Grafana and Mimir (#63752)

* Docs: (WIP) Meta-monitoring docs for Grafana and Mimir

* Update metrics for Grafana Managed Alerts

* Fix spelling mistake

* Add docs for Alertamanager, including high-availability mode

* Comment undefined metrics

---------

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
(cherry picked from commit fed59b1d43)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-03-03 15:46:19 +01:00
Grot (@grafanabot) aad839e5b9 [v9.4.x] Alerting: Fix client to external Alertmanager to correctly build URL for Mimir Alertmanager (#63684)
Alerting: Fix client to external Alertmanager to correctly build URL for Mimir Alertmanager (#63676)

(cherry picked from commit 98e1aeaebd)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-03-03 09:14:33 -05:00
Grot (@grafanabot) aa60a45f6b [v9.4.x] Docs: Pinning to latest for grafana plugin tools (#64141)
Docs: Pinning to latest for grafana plugin tools (#64140)

Pinning to latest for grafana plugin tools

(cherry picked from commit 92ee03db78)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
2023-03-03 09:11:31 -05:00
Giordano Ricci bdf8b7531b [9.4.x] Correlations: Fix flaky integration tests (#64004) (#64139)
Correlations: Fix flaky integration tests (#64004)

* Correlations: Fix flaky integration tests

* set explore-squad as correlations tests code owners

(cherry picked from commit 4a7fbea7a4)
2023-03-03 14:06:59 +00:00
Grot (@grafanabot) 9ef2e8d7da [v9.4.x] Alerting: Allow downloading alert rules from subpath (#64138)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-03-03 08:44:03 -05:00
Grot (@grafanabot) 79fb770ca5 [v9.4.x] Alerting: Fix UI crashing when selecting custom grouping in alert panel (#64128)
Alerting: Fix UI crashing when selecting custom grouping in alert panel (#64124)

Fix UI crashing when selecting custom grouping in alert panel

(cherry picked from commit 9765c98b3d)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2023-03-03 07:08:12 -05:00
Grot (@grafanabot) b733b4fd5c [v9.4.x] Docker Build: Use tonistiigi/binfmt image for cross compilation (#64117)
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 b42fd92fad)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-03-03 13:19:00 +02:00
Grot (@grafanabot) a2b984cd7e [v9.4.x] docs: Prevent internal docs on setting up plugin spellcheck from appearing on public website (#64118)
docs: Prevent internal docs on setting up plugin spellcheck from appearing on public website (#64113)

(cherry picked from commit ab512fcf88)

Co-authored-by: Andriy <andriy.urbanas@grafana.com>
2023-03-03 10:55:31 +01:00
Grot (@grafanabot) 0d7de2bbda Release: Bump version to 9.4.4 (#64101)
"Release: Updated versions in package to 9.4.4"
2023-03-03 03:17:28 -05:00
Grot (@grafanabot) 1ad9362310 [v9.4.x] Changelog: Updated changelog for 9.4.3 (#64100)
Changelog: Updated changelog for 9.4.3 (#64099)

(cherry picked from commit a7a658ed1b)
2023-03-03 09:10:08 +01:00
Grot (@grafanabot) 8861a8a977 [v9.4.x] SQLStore: Enable clientFoundRows for MySQL connections (#64083)
SQLStore: Enable clientFoundRows for MySQL connections (#64070)

Enable clientFoundRows for MySQL connections

(cherry picked from commit 8ea71d37c2)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-02 17:49:33 -06:00
Grot (@grafanabot) f8df798afd [v9.4.x] NPM: Stop using the folder path before the name path (#64071)
NPM: Stop using the folder path before the name path (#63851)

Stop using the folder path before the name path

(cherry picked from commit 177aa254c5)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-03-02 14:28:45 -06:00
Yuri Tseretyan 25c31c2c7c [v9.4.x] Alerting: Use background context for maintenance function (#64066)
Alerting: Use background context for maintenance function (#64065)

(cherry picked from commit e760f22402)

# Conflicts:
#	pkg/services/ngalert/notifier/alertmanager.go
2023-03-02 14:45:27 -05:00
Grot (@grafanabot) 3fe53ab222 [v9.4.x] StatPanel: Fix issue where sparkline chart was not being shown on resize (#64012) 2023-03-02 12:58:48 +01:00
Emil Tullstedt 4e687dfb6f [v9.4.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891) 2023-03-02 11:53:45 +01:00
Grot (@grafanabot) eab26273d6 [v9.4.x] Docs [Search] update _index.md by replacing dashboardPreviews for panelTitleSearch feature toggle (#64003)
Co-authored-by: beateguia <70489000+beateguia@users.noreply.github.com>
2023-03-02 11:21:56 +01:00
Grot (@grafanabot) 35fe167f0d Release: Bump version to 9.4.3 (#64002)
"Release: Updated versions in package to 9.4.3"
2023-03-02 11:05:48 +01:00
Grot (@grafanabot) 5e48a1ad06 [v9.4.x] Changelog: Updated changelog for 9.4.2 (#64001)
Changelog: Updated changelog for 9.4.2 (#64000)

(cherry picked from commit ae90f73b78)
2023-03-02 10:54:28 +01:00
Grot (@grafanabot) 225128a5d9 [v9.4.x] Fix redirect from /setup-grafana/upgrade-grafana/ to /upgrade-guide/ (#63999)
Fix redirect from /setup-grafana/upgrade-grafana/ to /upgrade-guide/ (#63914)

Additionally fix redirect from `/installation/upgrading/` to
`/setup-grafana/upgrade-grafana/`.

The alias proposed in
https://github.com/grafana/grafana/pull/62402#discussion_r1090526464
was incorrect. It used the `../installation/upgrading/` alias as
reference but I did not check the redirect. As this page itself has
moved from `/setup-grafana/upgrade-grafana/` to `/upgrade-guide/` the
relative alias needed updating also.

To verify that this alias is working as expected:

1. Checkout this branch.
2. Run `make docs`
3. Browse to
http://localhost:3002/docs/grafana/latest/setup-grafana/upgrade-grafana/
4. Verify that you have been redirected to
http://localhost:3002/docs/grafana/latest/upgrade-guide/
5. Browse to
http://localhost:3002/docs/grafana/latest/installation/upgrading/
6. Verify that you have been redirected to
http://localhost:3002/docs/grafana/latest/upgrade-guide/

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit f3e08a3560)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-03-02 04:13:05 -05:00
Grot (@grafanabot) 64412b1195 [v9.4.x] BarChart: Only apply radius to topmost bar segment when stacking (#63986)
BarChart: Only apply radius to topmost bar segment when stacking (#63906)

(cherry picked from commit 9314fe1056)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-03-01 18:28:14 -05:00
Grot (@grafanabot) 0299b18b88 [v9.4.x] Reqcontext: Use err status code instead of always fallback (#63977)
Reqcontext: Use err status code instead of always fallback (#63974)

(cherry picked from commit 8bd4e2cb25)

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
2023-03-01 18:48:33 -03:00
Grot (@grafanabot) 8c483cca31 [v9.4.x] Alerting: Fix migration pauses all alert rules on PostgreSQL (#63968)
Alerting: Fix migration pauses all alert rules on PostgreSQL (#63951)

This commit fixes a serious bug in Grafana 9.4.1 where on upgrade
a migration would pause all existing alert rules and change the
default value of the column to true.

(cherry picked from commit 030f6c948f)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-03-01 18:00:08 +00:00
Grot (@grafanabot) 4c22a2b8fb [v9.4.x] Alerting: Fix boolean default in migration from false to 0 (#63963)
Alerting: Fix boolean default in migration from false to 0 (#63952)

Fix boolean default in migration from false to 0

(cherry picked from commit a05bf41ff9)

Co-authored-by: Alex Moreno <alexander.moreno@grafana.com>
2023-03-01 17:34:53 +00:00
Grot (@grafanabot) 0de3ceb47c [v9.4.x] TimeSeries: Ignore invalid, user-defined log-y-axis min/max limits (#63967)
TimeSeries: Ignore invalid, user-defined log-y-axis min/max limits (#59758)

(cherry picked from commit 5510fdc3ce)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-03-01 12:25:54 -05:00
Grot (@grafanabot) bb25297a9d [v9.4.x] Profile: Fix session table overflowing page layout in mobile (#63965)
Profile: Fix session table overflowing page layout in mobile (#63858)

handle table overflowing in mobile layout

(cherry picked from commit 4f01d55a3c)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-01 12:16:59 -05:00
Ashley Harrison b5135d8144 Command Palette: Sign out link now works correctly (#63742) (#63960)
* pass target to command palette urls so sign out link works correctly

* improve types

(cherry picked from commit a534119c44)
2023-03-01 12:00:22 -05:00
Grot (@grafanabot) 1b0d442ca2 [v9.4.x] Navigation: Fix broken layout at 544px (#63950)
Navigation: Fix broken layout at 544px (#63793)

* ensure media queries transition properly

* fix unit tests

(cherry picked from commit 8e9ccfc66e)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-01 10:40:42 -05:00
Grot (@grafanabot) 38b5dd4486 [v9.4.x] Fix wrong texts in titles when cloning templates (#63944)
Fix wrong texts in titles when cloning templates (#63930)

(cherry picked from commit fa35ed8141)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2023-03-01 09:47:52 -05:00
Grot (@grafanabot) 66b94cd468 [v9.4.x] [DOC] Change APM dashboard to Service Graph view (#63903)
[DOC] Change APM dashboard to Service Graph view (#63818)

* Change APM dashboard to Service View graph

* Apply suggestions from code review

* Update docs/sources/explore/trace-integration.md

* Update docs/sources/explore/trace-integration.md

(cherry picked from commit ac5dbf2632)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2023-02-28 16:37:53 -05:00
Grot (@grafanabot) a7c1598ca6 [v9.4.x] Navigation: reserve horizontal space for img in SectionNavItem to avoid layout shift (#63865)
Navigation: reserve horizontal space for img in SectionNavItem to avoid layout shift (#63722)

(cherry picked from commit 429d693a4a)

Co-authored-by: Uladzimir Dzmitračkoŭ <3773351+going-confetti@users.noreply.github.com>
2023-02-28 16:04:35 +01:00
Grot (@grafanabot) 437cf15105 [v9.4.x] TimeSeries: Fix legend and tooltip colors changing after data refreshes (#63871)
TimeSeries: Fix legend and tooltip colors changing after data refreshes (#63823)

(cherry picked from commit b2c0175777)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-02-28 09:24:51 -05:00
Grot (@grafanabot) 6cab7f956c [v9.4.x] Alerting: Fix width in alerts table columns on EditGroupModal (#63849)
Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Fix width in alerts table columns on EditGroupModal (#63845)
2023-02-28 08:48:50 -05:00
Grot (@grafanabot) b23f3964e9 Release: Bump version to 9.4.2 (#63844)
"Release: Updated versions in package to 9.4.2"
2023-02-28 05:44:19 -05:00
Grot (@grafanabot) 0b98b4d241 [v9.4.x] Changelog: Updated changelog for 9.4.1 (#63843)
Changelog: Updated changelog for 9.4.1 (#63841)

* Changelog: Updated changelog for 9.4.1

---------

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
(cherry picked from commit 71d64f95da)
2023-02-28 05:32:43 -05:00
Grot (@grafanabot) 04a4774d4c [v9.4.x] Changelog: Updated changelog for 9.4.0 (#63839)
Changelog: Updated changelog for 9.4.0 (#63838)

(cherry picked from commit 321e4c0f99)
2023-02-28 11:20:23 +01:00
Grot (@grafanabot) 3c58b2c176 [v9.4.x] TraceView: Add key and url escaping of json tag values (#761)
TraceView: Add key and url escaping of json tag values (#751)

(cherry picked from commit 8b53b448bc24fbfc4492ce1f4e2b1708218f70b7)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
2023-02-28 11:02:22 +01:00
Grot (@grafanabot) a1bceeb1d3 [v9.4.x] Geomap: Sanitize the attribution string (#755)
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>
2023-02-28 11:02:18 +01:00
Grot (@grafanabot) bb7a485dbf [v9.4.x] Alerting: Fix AlertLabelDropdown to be case sensitive (#63832)
Alerting: Fix AlertLabelDropdown to be case sensitive (#63787)

Fix AlertLabelDropdown to be case sensitive

(cherry picked from commit 526cac60e5)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2023-02-28 04:05:09 -05:00
Grot (@grafanabot) b3682d498c [v9.4.x] Alerting: Improve Alertmanager data source docs (#63721)
Alerting: Improve Alertmanager data source docs (#63611)

Improve Alertmanager data source docs

(cherry picked from commit 6e39b7403d)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
2023-02-28 08:29:17 +01:00
Timur Olzhabayev 183f9317c5 fix(dashboard version service): add DashboardUID to query and respons… (#63821)
fix(dashboard version service): add DashboardUID to query and responses (#60800)

* fix(dashboard version service): add DashboardUID to query and responses

The DashboardUID was not populated in the response from Get and ListDashboardVersions. This adds the DashboardUID to the Get query (it was already in List) and populated the DashboardUID in the returned DashboardVersionDTOs.

(cherry picked from commit 42be0e106f)

Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
2023-02-27 23:01:48 +01:00
Grot (@grafanabot) 194dbead83 [v9.4.x] Alerting: Fix available labels in the alert panel groupby dropdown (#63799)
Alerting: Fix available labels in the alert panel groupby dropdown (#63573)

(cherry picked from commit 5f35995cd4)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
2023-02-27 17:58:52 +01:00
Grot (@grafanabot) 53b5cf5288 [v9.4.x] AzureMonitor: Fix template variables in ARG subscription field (#63758)
AzureMonitor: Fix template variables in ARG subscription field (#63731)

Add support for template variables in sub field

(cherry picked from commit 823aaaeb7c)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-02-27 05:56:15 -05:00
Jo 7900e795f1 [9.4.x] Users: Fix org user always getting org id = 1 (#63759)
Users: Fix org user always getting org id = 1 on auto assign false (#63708)

* fix org user always getting org id = 1 on auto assign false

* make tests explicit

* use correct cfg in service accounts

* fix api tests

* fix database test of ac

* fix InsertOrgUser returning affected rows as orgID

(cherry picked from commit c8db771939)
2023-02-27 10:31:53 +01:00
Jack Baldry 0f1f842015 [v9.4.x] fix link to explore with logs and headings (#63665) (#63701)
* [v9.4.x] Logs: Rename dedup to deduplication (#62944)

* fix: rename dedup with deduplication

* docs: update documentation

* fix: update names

(cherry picked from commit 8a94688114)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* [v9.4.x] fix link to explore with logs and headings (#63665)

fixed links and eadings

(cherry picked from commit a0a2181e5a)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Gareth Dawson <gareth.dawson@grafana.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-02-25 07:26:22 +00:00
Alexander Weaver 7e017790d2 Alerting: Instrument outgoing state history requests using weaveworks/common (#63689)
* Alerting: Instrument outgoing state history requests using weaveworks/common (#63600)

* Loki backend and client depend on a requester

* Instrument all requests to loki using weaveworks TimedClient

* Construct collector in metrics package

(cherry picked from commit e77621649d)

* Revert all changes to gomod and gosum
2023-02-24 15:49:36 -06:00
Grot (@grafanabot) 3531683e87 [v9.4.x] CloudMonitor: Add missing logger to TimeSeriesQuery (#63132)
CloudMonitor: Add missing logger to TimeSeriesQuery (#63110)

(cherry picked from commit ac9639daf8)

Co-authored-by: Alyssa Bull <58453566+alyssabull@users.noreply.github.com>
2023-02-24 21:32:06 +00:00
Grot (@grafanabot) b5747d397d [v9.4.x] CloudMonitoring: Fix crash when inspecting data for MQL queries (#63756)
CloudMonitoring: Fix crash when inspecting data for MQL queries (#63747)

CloudMonitoring: Fix missing Field name

This happened for MQL queries that used an [aggregate function][1], e.g.
`sum`.

[1]: https://cloud.google.com/monitoring/mql/reference#aggr-function-group

(cherry picked from commit 3672e44c1c)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
2023-02-24 13:30:38 -05:00