Commit Graph
39419 Commits
Author SHA1 Message Date
Dimitris Sotirakis 4098978273 [v9.3.x] CI: Cleanup unnecessary grabpl dependencies (#65330) (#65346)
CI: Cleanup unnecessary `grabpl` dependencies (#65330)

* Remove unnecessary grabpl dependencies

* Revert test-frontend change

(cherry picked from commit 89d642e001)

# Conflicts:
#	.drone.yml
2023-03-27 16:41:27 +03:00
Virginia Cepeda 7847651f0c Alerting: Improve showing nextEvaluationDate for rules (#65205) (#65223)
* Improve showing nextEvaluationDate for rules

Co-Authored-By: Konrad Lalik <konradlalik@gmail.com>

* Improve imports and comments

---------

Co-authored-by: Konrad Lalik <konradlalik@gmail.com>
(cherry picked from commit b90aed4fd7)
2023-03-27 10:31:42 -03:00
Dimitris Sotirakis dc6c3783f1 [v9.3.x] CI: Remove grabpl dependency from publish-packages steps (#65329) (#65332)
CI: Remove `grabpl` dependency from `publish-packages` steps (#65329)

Remove grabpl dependency from publish packages

(cherry picked from commit 3b00d2c273)

# Conflicts:
#	.drone.yml
2023-03-27 11:22:54 +03:00
Grot (@grafanabot)andlwandz13 4d03b21958 [v9.3.x] Docs/updates amazon cloudwatch (#65281)
Docs/updates amazon cloudwatch (#64987)

* updated AWS to Amazon in the index file

* edited query editor index file -AWS with Amazon

(cherry picked from commit 0975e53fc0)

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-03-23 08:51:31 -07:00
ismail simsek 138f2fef8d [v9.3.x] Expressions: More robust expression check (#65230)
* Expressions: More robust expression check (#65006)

More robust expression check

(cherry picked from commit 1328878ace)

* Fix import

* Fix tests
2023-03-23 00:51:24 +02:00
Dimitris Sotirakis 91fe6eb1b7 [v9.3.x] CD: Remove fetch-images dependency from AWS marketplace automation (#65173) (#65194)
CD: Remove `fetch-images` dependency from AWS marketplace automation (#65173)

* Remove fetch-images dependency

* Fix starlark link

(cherry picked from commit d0be9610f0)

# Conflicts:
#	.drone.yml
2023-03-22 18:55:59 +02:00
Grot (@grafanabot) b98d0cf461 Release: Bump version to 9.3.12 (#65207)
"Release: Updated versions in package to 9.3.12"
2023-03-22 18:52:16 +02:00
Horst GutmannandGrot dc2f72da0a [v9.3.x] Changelog: Updated changelog for 9.3.11 (#65204) (#65206)
Changelog: Updated changelog for 9.3.11 (#65204)

(cherry picked from commit f0c716a447)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2023-03-22 17:38:50 +01:00
ismail simsekandLudovic Viaud 3ac7f32ace [v9.3.x] Fix xss in Graphite functions tooltip (#806)
Fix xss in Graphite functions tooltip (#804)

(cherry picked from commit 87aad3f11836f810ee1fdfee27827e746ef36055)

Co-authored-by: Ludovic Viaud <ludovic.viaud@gmail.com>
2023-03-22 13:39:55 +01:00
Konrad Lalik fa21dba89e Alerting: Fix notification policies matcher filter (#64967) (#65031)
(cherry picked from commit bf3422740b)
2023-03-21 13:36:06 +01:00
Dimitris Sotirakis 30ef59ec6c [v9.3.x] CI: Update grabpl to 3.0.30 (#65028) (#65090)
CI: Update `grabpl` to `3.0.30` (#65028)

Update grabpl

(cherry picked from commit 4a80233bed)

# Conflicts:
#	.drone.yml
#	scripts/drone/steps/lib.star
2023-03-21 12:14:41 +02:00
Horst Gutmann 2b971a4167 Update CODEOWNERship for grafana-delivery team (#64973) (#65019)
(cherry picked from commit 2897ee37bf)
2023-03-21 11:28:02 +02:00
Grot (@grafanabot)andOscar Kilhed 9a4c18c02a [v9.3.x] Table Panel: Fix image of image cell overflowing table cell when a data link is added. (#61617)
Table Panel: Fix image of image cell overflowing table cell when a data link is added. (#59392)

* TablePanel: fix image of image cell overflowing table cell when a data link is added

* Fix image cell and gauge panel in respective places instead

(cherry picked from commit 004705a10b)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
2023-03-21 09:25:49 +01:00
ismail simsek 4399288f9d [v9.3.x] Alerting: Rule viewer expression view fix (#65007)
Fix rule viewer
2023-03-20 12:48:50 +01:00
Grot (@grafanabot)andGilles De Mey 43f61622b3 [v9.3.x] Alerting: Fix queries not being previewed in detail view (#64949)
Alerting: Fix queries not being previewed in detail view (#64198)

(cherry picked from commit 4e81aab60a)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-03-17 13:36:38 +02:00
Grot (@grafanabot)andgotjosh 9422a52802 [v9.3.x] Alerting: QoL improvements to the unified alerting multi-replica devenv (#64938)
Alerting: QoL improvements to the unified alerting multi-replica devenv (#64907)

(cherry picked from commit 406431df4e)

Co-authored-by: gotjosh <josue.abreu@gmail.com>
2023-03-17 10:58:45 +00:00
George Robinson 5f94620d7c Alerting: Revert "Fix DedupStage" in Alertmanager (#64799)
This commit reverts "Fix DedupStage to stop pipeline if event in
notification log is from the future" from v9.3.x.
2023-03-15 10:15:46 +00:00
Yuri Tseretyan 3a22eba17f Chore: Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b (#64784) 2023-03-14 20:29:22 -04:00
Yuri Tseretyan 2b00a15709 Alerting: Update scheduler to receive rule updates only from database (#64662)
Alerting: Update scheduler to get updates only from database (#64635)

* stop using the scheduler's Update and Delete methods all communication must be via the database
* update scheduler's registry to calculate diff before re-setting the cache
* update fetcher to return the diff generated by registry
* update processTick to update rule eval routine if the rule was updated and it is not going to be evaluated at this tick.
* remove references to the scheduler from api package
* remove unused methods in the scheduler

(cherry picked from commit 85a954cd81)

# Conflicts:
#	pkg/services/ngalert/api/api_ruler.go
#	pkg/services/ngalert/ngalert.go
#	pkg/services/ngalert/ngalert_test.go
#	pkg/services/ngalert/schedule/schedule.go
#	pkg/services/ngalert/schedule/schedule_mock.go
#	pkg/services/ngalert/schedule/schedule_unit_test.go
2023-03-14 18:51:26 -04:00
Virginia Cepeda f854430ca6 Alerting: Display last & next rule eval date plus eval duration (#64767) (#64771)
* Display last & next rule eval date plus eval duration

* Show next evaluation date in a humanized format

Full date still visible on hover

* Only show next evaluation column is group has an interval

(cherry picked from commit 6b95b3f8aa)
2023-03-14 22:48:54 +01:00
2047786936 Backport 59615 to v9.3.x (#62458)
* Build: Streamline and sync dockerfiles (#58101)

---------

Co-authored-by: gotjosh <josue.abreu@gmail.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2023-03-14 22:36:02 +02:00
Grot (@grafanabot)andDimitris Sotirakis e057471d95 [v9.3.x] CI: Add PrereleaseBucket field in versions.go (#64523)
CI: Add `PrereleaseBucket` field in `versions.go` (#64519)

Add PrereleaseBucket in versions.go

(cherry picked from commit 29b3f3fbf4)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-03-09 11:05:17 -05:00
Horst Gutmann 8c1aa4e50b [9.3.x] CI: Move some build settings (#64491) (#64516)
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 4b241804b4)
2023-03-09 08:35:08 -05:00
Armand Grillet 4deceb0aa7 Revert "[v9.3.x] Alerting: Update Prometheus Alertmanager (#64447)" (#64505)
This reverts commit 42665ac87f.
2023-03-09 14:34:41 +01:00
Armand GrilletandAlex Weaver 42665ac87f [v9.3.x] Alerting: Update Prometheus Alertmanager (#64447)
* Alerting: Update Prometheus Alertmanager

* Move to TruncateInRunes

* Use updated FromGlobs signature

* Avoid indirection around InhibitRule based on 61810

* Work around new API for nflog

* One more template FromGlobs api change

* One more FromGlobs change in test files. Searched for them all...

* Missing line from cherrypicked change

* Run maintenance on correct state object

---------

Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>
2023-03-08 14:26:25 -06:00
Grot (@grafanabot)andStephanie Hingtgen ac56c21aad [v9.3.x] Plugins: Fix bug with copying grafanaData (#64453)
Plugins: Fix bug with copying grafanaData (#64446)

(cherry picked from commit 39a4634ae9)

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
2023-03-08 13:37:21 -05:00
Grot (@grafanabot)andGalen Kistler f7892a41d1 [v9.3.x] TimeSeries: Fix overflowing exemplar modals causing content shifts (#64252)
TimeSeries: Fix overflowing exemplar modals causing content shifts (#64037)

*  fix overflowing exemplar modals causing content shifts

(cherry picked from commit b9ebd5757a)

Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
2023-03-06 12:18:00 -06:00
Dimitris Sotirakis b3edba4a37 [v9.3.x] Chore: Bump alpine version to 3.17.1 (#63252) (#63265)
Chore: Bump alpine version to `3.17.1` (#63252)

Bump alpine version to 3.17.1

(cherry picked from commit 24c60486f6)
2023-03-06 04:38:35 -05:00
Grot (@grafanabot)andJimmie Han 4f4921ad01 [v9.3.x] build: fix corss build (#63262)
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:27 -06:00
Grot (@grafanabot)andDimitris Sotirakis 587bbf20d3 [v9.3.x] Docker Build: Use tonistiigi/binfmt image for cross compilation (#64116)
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 06:38:42 -05:00
Grot (@grafanabot)andLeon Sorokin 6636a56199 [v9.3.x] TimeSeries: Fix legend and tooltip colors changing after data refreshes (#63870)
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:28:34 -05:00
Grot (@grafanabot)andDimitris Sotirakis d30dc44312 [v9.3.x] NPM: Stop using the folder path before the name path (#63860)
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-02-28 08:13:21 -05:00
Horst GutmannandGrot 72999ff49a Changelog: Updated changelog for 9.3.8 (#63854) (#63859)
* Changelog: Updated changelog for 9.3.8

* Add header for 9.3.8 release to changelog

---------

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
(cherry picked from commit a81a665f43)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2023-02-28 13:53:19 +01:00
Grot (@grafanabot) cf157c123c Release: Bump version to 9.3.9 (#63857)
"Release: Updated versions in package to 9.3.9"
2023-02-28 13:53:01 +01:00
Horst GutmannandGrot abe5ae6834 [v9.3.x] Changelog: Updated changelog for 9.3.7 (#63853) (#63855)
Changelog: Updated changelog for 9.3.7 (#63853)

* Changelog: Updated changelog for 9.3.7

* Correct date for 9.3.7

---------

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
(cherry picked from commit e8d8c98723)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2023-02-28 13:47:06 +01:00
Ryan McKinley dda21296dd 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)
2023-02-27 11:43:02 +01:00
Andrej Ocenas 73091fa92e Cherry pick 8b53b44 2023-02-27 11:43:01 +01:00
Jo f6f22b95c1 Auth: Update saml go.mod (missing query sig verification) [9.3.x] (#712)
* update saml go.mod (missing query sig verification)

(cherry picked from commit 1e1dbd1a06455a451d722856dc619b2a7c78e2c0)

* fix sync
2023-02-27 11:43:00 +01:00
Misiandlinoman 9ba26bd359 [v9.3.x] Update grafana/saml library (#690)
SAML: update grafana/saml

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-02-27 11:42:56 +01:00
Grot (@grafanabot)andzsrv bbcc5bdd93 [v9.3.x] Docs: Disambiguate auto_assign_org_role configuration option descriptions (#63680)
Docs: Disambiguate auto_assign_org_role configuration option descriptions (#61827)

(cherry picked from commit 5687d23b52)

Co-authored-by: zsrv <95176387+zsrv@users.noreply.github.com>
2023-02-23 13:35:38 -05:00
Grot (@grafanabot)andzsrv 36fa2841d6 [v9.3.x] Docs: Update old default values for configuration options (#63677)
Docs: Update old default values for configuration options (#61826)

(cherry picked from commit 0481c12bd5)

Co-authored-by: zsrv <95176387+zsrv@users.noreply.github.com>
2023-02-23 13:01:38 -05:00
Grot (@grafanabot)andzsrv 93982e4e6a [v9.3.x] Docs: Update default value for geomaps enable_custom_baselayers option (#63674)
Docs: Update default value for geomaps enable_custom_baselayers option (#61880)

Docs: Update default value for geomaps disable_custom_baselayers option

The `disable_custom_baselayers` configuration option name and default
value were inverted in commit e604e69d93,
but the update to the description in the documentation was missed.

(cherry picked from commit 22f51602ba)

Co-authored-by: zsrv <95176387+zsrv@users.noreply.github.com>
2023-02-23 12:45:46 -05:00
Isabel abfd8792e5 [9.3.x] docs: fixed headings and link to explore with logs (#63670)
fixed headings and link to explore with logs
2023-02-23 17:32:48 +00:00
Grot (@grafanabot)andKyle Cunningham 27e188c48c [v9.3.x] MSSQL Datasource: Revert functions within macros change (#63597)
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 356e2e1933)

Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
2023-02-22 16:20:07 -05:00
Jack Baldry 7ec3928392 [v9.3.x] Add --init to all podman invocations to ensure ^C works on MacOS (#61745) (#63557)
(cherry picked from commit 5f5f51b3bf)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-02-22 16:37:29 +00:00
Grot (@grafanabot)andGeorge Robinson 30a521aade [v9.3.x] Alerting: Fix incorrect comment in eval.go (#63512)
Alerting: Fix incorrect comment in eval.go (#63510)

This commit fixes an incorrect comment in the Result struct in eval.go
that I had written some time ago. The comment now documents the
actual behaviour and content of this field.

(cherry picked from commit f93a9c794d)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-02-21 10:57:03 -05:00
George Robinson 299618ebe6 Backport 63346 to v9.3.x (#63439)
Alerting: Fix confusing comment about screenshots in default.ini and docs (#63346)

(cherry picked from commit 005f5ca1df)
2023-02-20 11:37:59 +00:00
Grot (@grafanabot)andGilles De Mey 7883f9b001 [v9.3.x] Alerting: Use optional chaining for accessing frames (#63417)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-02-19 07:25:18 -05:00
Grot (@grafanabot) 403ad6923a [v9.3.x] Loki Query Builder: Fix bug parsing range params (#61690) 2023-02-18 10:02:22 +01:00
George Robinson e663f6c35e [v9.3.x] Alerting: Fix a bug taking screenshots with Dashboard UID (#63226)
Alerting: Fix a bug taking screenshots with Dashboard UID (#63220)

This commit fixes a bug where Grafana would fail to take a screenshot if
the same Dashboard UID was present across two or more different orgs.

(cherry picked from commit 1f984409a2)
2023-02-09 17:29:09 -05:00