Commit Graph
39488 Commits
Author SHA1 Message Date
Dimitris Sotirakis 3c2af5c4b0 [v9.3.x] G10: Post docker pull commands for local testing (#67489) (#68683)
G10: Post `docker pull` commands for local testing (#67489)

* Add grabpl publish images

Update grabpl - add github pr token

* Replace github_pr_token with gh app

# Conflicts:
#	.drone.yml
#	scripts/drone/vault.star

# Conflicts:
#	.drone.yml

# Conflicts:
#	.drone.yml

* Lint starlark

Add forgotten secrets

Lint starlark

Change secrets

* Update grabpl to v3.0.35

* Lint starlark

* Remove unnecessary secrets

(cherry picked from commit 26bacf6d4c)

# Conflicts:
#	.drone.yml
2023-05-18 11:23:25 -03:00
Dimitris Sotirakis a235642c77 [v9.3.x] CI: Add delivery bot secrets to publish images step (#68467) (#68470)
CI: Add delivery bot secrets to publish images step (#68467)

Add delivery bot secrets

(cherry picked from commit 55622615de)

# Conflicts:
#	.drone.yml
#	scripts/drone/vault.star
2023-05-15 17:00:01 +02:00
Horst Gutmann 13b1cfc1a8 [v9.3.x] CI: Update grabpl to 3.0.34 (#68456) (#68465)
* CI: Port of init-enterprise fix from 9.4.10

* CI: Update grabpl to 3.0.34

(cherry picked from commit 35ccfa6131)

Backport of https://github.com/grafana/grafana/pull/68456
2023-05-15 16:27:20 +03:00
Grot (@grafanabot)andJoseph Perez 118ac32208 [v9.3.x] Plugins doc review chunk 2 (#68410)
Plugins doc review chunk 2 (#67691)

* Doc style edit for 7 topics

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Proofread topics

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Prettier

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Doc fix

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Update docs/sources/developers/plugins/add-query-editor-help.md

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>

* Doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Changes from doc review

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* Incorporate review feedback

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

* More doc fixes

Signed-off-by: Joe Perez <joseph.perez@grafana.com>

---------

Signed-off-by: Joe Perez <joseph.perez@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
(cherry picked from commit 49a18bc8e2)

Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
2023-05-12 14:00:32 -05:00
Grot (@grafanabot)andcolinedwardwood 8da106cfc1 [v9.3.x] Wording changes to improve clarity. (#68398)
Wording changes to improve clarity. (#66045)

* Wording changes to improve clarity.

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* Update docs/sources/setup-grafana/set-up-for-high-availability.md

* ran doc validator, make corrections

---------

Co-authored-by: Eve Meelan <81647476+Eve832@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 fd83b17b7f)

Co-authored-by: colinedwardwood <colin.wood@grafana.com>
2023-05-12 11:19:37 -05:00
Dimitris Sotirakis 65159a20c3 [v9.3.x] CI: Add .drone.yml in pathschanged trigger for lint_backend pipeline (#68348) (#68366)
CI: Add `.drone.yml` in pathschanged trigger for `lint_backend` pipeline (#68348)

Add .drone.yml in pathschanged for lint_backend

(cherry picked from commit b7b13067a5)

# Conflicts:
#	.drone.yml
2023-05-12 13:24:57 +01:00
Grot (@grafanabot)andClayton Cornell 59526fa6f5 [v9.3.x] Docs: Correct capitalization of openSUSE (#68334)
Docs: Correct capitalization of openSUSE (#67567)

Correct capitalization of openSUSE

(cherry picked from commit 7e0031ec36)

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
2023-05-11 15:27:30 -05:00
Grot (@grafanabot) 9efc8faf02 Release: Bump version to 9.3.15 (#68265)
"Release: Updated versions in package to 9.3.15"
2023-05-10 15:46:54 -05:00
Kevin MinehartandGrot 33b4cfee51 Changelog: Updated changelog for 9.3.14 (#68261) (#68264)
(cherry picked from commit f5ac49687a)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2023-05-10 15:42:44 -05:00
Jack Baldry 85eb7be953 [v9.3.x] Use expected types for admonition (#68177)
All types are declared lowercased.


(cherry picked from commit 356eabc24c)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-05-10 21:10:19 +01:00
Horst Gutmann f64a005279 [v9.3.x] CI: Move windows-tests into promotion pipeline (#68218) (#68234)
(cherry picked from commit acd02e8a48)

Backport of https://github.com/grafana/grafana/pull/68218
2023-05-10 17:57:57 +03:00
Horst Gutmann e03b8d6d37 [v9.3.x] CI: Remove windows backend tests from release pipelines (#68166) (#68204)
Remove windows backend tests from release pipelines

These are run in other places so there is no benefit to also include
them here.

(cherry picked from commit 1e8cad625b)

Backport of https://github.com/grafana/grafana/pull/68166
2023-05-10 15:16:31 +03:00
Grot (@grafanabot)andAndriy 5d8043ea07 [v9.3.x] Fix Enterprise Datasources link on Grafana Enterprise page (#68115)
Fix Enterprise Datasources link on Grafana Enterprise page (#67962)

fix-enterprise-datasources-link

(cherry picked from commit 18d4fda613)

Co-authored-by: Andriy <andriy.urbanas@grafana.com>
2023-05-09 10:34:05 -05:00
Dimitris Sotirakis 5350d735c9 [v9.3.x] CI: Remove custom enterprise2 pipelines (#68056) (#68060)
CI: Remove custom enterprise2 pipelines (#68056)

Remove custom enterprise2 pipelines

(cherry picked from commit 6ae952c7c5)
2023-05-09 12:34:56 +03:00
Galen Kistler b1e51ffefd [v9.3.x] Prometheus: bug in creating autocomplete queries with labels (#68029)
Prometheus: bug in creating autocomplete queries with labels (#68003)

Fix bug formatting multiple prometheus labels when doing metric query

(cherry picked from commit a1bc1bd368)
2023-05-08 13:30:28 -05:00
Horst Gutmann 29a8ed190e [v9.3.x] CI: Add Windows backend tests in more places (#66438) (#68009)
* CI: Add Windows backend tests in more places

* CI: Add promotion pipeline for publishing new windows-test-images

* CI: Ignore windows backend-test failures for now

* CI: Fix linting issue in ci_images.star file

(cherry picked from commit b2fc285a5d)

Backport of https://github.com/grafana/grafana/pull/66438
2023-05-08 10:24:02 -04:00
Christopher Moyerandsamu6851 9598cc9f4a [Docs v9.3]: Manual backport - Link to config exemplars leads goes to top of page (#67687) (#67841)
Link to config exemplars leads goes to top of page (#67687)

* Link to config exemplars leads goes to top of page

The link to the configure exemplars in a Prometheus datasource leads to the top of the page.  I have referenced the correct link that would take it to the right section.

https://grafana.com/docs/grafana/latest/datasources/prometheus/#configure-exemplars

* Update docs/sources/fundamentals/exemplars/index.md

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 681925fb63)

Co-authored-by: samu6851 <samuel.oswalt@grafana.com>
2023-05-04 11:52:50 -05:00
Grot (@grafanabot)andChristopher Moyer c28a7d25a8 [v9.3.x] docs: Updates installation instruction for Debian/Ubuntu (#67777)
docs: Updates installation instruction for Debian/Ubuntu (#64232)

* draft changes

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* reworks debian/ubuntu instructions, updates start server topic

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* incorporates feedback; restructures to align with writers toolkit guidelines

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* tweaks structure of server topic; renames directory, corrects relrefs

* corrects spelling

* Apply suggestions from code review

Co-authored-by: Dan Cech <dcech@grafana.com>

* removed web parameter

* removes unnecessary word

* incorporates feedback from internal reviewer

* updates alias

* updates alias

* adjust alias

---------

Co-authored-by: Dan Cech <dcech@grafana.com>
(cherry picked from commit 13af5afaf3)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-05-04 11:29:56 -05:00
Isabel 3c573006dd [v9.3.x] docs: fix create dashboard steps (#67855)
fixed merge conflict for backport
2023-05-04 12:15:00 -04:00
Sofia Papagiannaki 360a357508 [v9.3.x] Chore: Upgrade Go to 1.20.4 (#67762)
Chore: Upgrade Go to 1.20.4
2023-05-04 10:53:37 +03:00
Jack BaldryandIsabel 4cfdfe2e8b [v9.3.x] docs: add semi relative time ranges (#67759)
docs: add semi relative time ranges (#67559)

* add semi-relative time range section

* added second example and reworded

* formatting fixes

* added alerting note and fixed formatting

* wording fix

(cherry picked from commit 0271a1d094)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-05-03 11:55:34 -04:00
Grot (@grafanabot)andNabeel Saad cab9822569 [v9.3.x] Update index.md (#67726)
Update index.md (#67172)

Clarified some of the intro text and added JSON outer element to make the samples clearer

(cherry picked from commit 66ad704292)

Co-authored-by: Nabeel Saad <saadnabs@hotmail.com>
2023-05-03 08:47:01 -05:00
Grot (@grafanabot)andIsabel b0d7648338 [v9.3.x] docs: move misplaced Configure legend page (#67669)
docs: move misplaced Configure legend page (#67597)

* move configure legend page and add alias

* updated page weight and tried fixing alias

* fixed alias

* add preemptive alias for current page location

* apply suggestion from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 688459f25c)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-05-02 11:55:09 -04:00
Grot (@grafanabot)andIsabel bf400280a9 [v9.3.x] docs: move misplaced Configure legend page (#67669)
docs: move misplaced Configure legend page (#67597)

* move configure legend page and add alias

* updated page weight and tried fixing alias

* fixed alias

* add preemptive alias for current page location

* apply suggestion from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

* apply suggestions from review

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 688459f25c)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-05-02 11:54:42 -04:00
Isabel 2f9ec82dd1 [9.3.x] docs: reverse what's new order in TOC (#67607)
fixed merge conflict for backport
2023-05-01 23:08:45 -04:00
Grot (@grafanabot)andRon D 4d755afe5d [v9.3.x] Add Grafana Free as supporting Enterprise features (#67599)
Add Grafana Free as supporting Enterprise features (#67568)

Per https://docs.google.com/document/d/14aOVLPq0FNqQKN4axTTEvjraY_OafhiDM_2NYSHF33A/edit#heading=h.lo4c6e71q7vo Grafana Cloud Free will include all the features of Grafana Advanced in Q2

(cherry picked from commit 999a2ce92d)

Co-authored-by: Ron D <106610617+rgnvldr@users.noreply.github.com>
2023-05-01 15:11:38 -05:00
Isabelandsarah-spang fddb032916 [v9.3.x] docs: fixing merge conflict for backport (#67563)
fixing merge conflict for backport

Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>
2023-04-28 17:03:16 -04:00
Grot (@grafanabot)andDimitris Sotirakis 4f7110ed94 [v9.3.x] Grafana Cloud: Put cloud artifacts to */release dir (#67533)
Grafana Cloud: Put cloud artifacts to `*/release` dir (#66168)

Put cloud artifacts to */release dir

(cherry picked from commit a2634495e5)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-04-28 15:35:12 +00:00
Grot (@grafanabot)andDimitris Sotirakis bd3b48d2ef [v9.3.x] Grafana Cloud: Add VariantLinuxAmd64 in build variants (#67525)
Grafana Cloud: Add `VariantLinuxAmd64` in build variants (#66167)

Add VariantLinuxAmd64 in build variants

(cherry picked from commit 8dd87a79f7)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-04-28 18:23:08 +03:00
Grot (@grafanabot)andBrendan O'Handley 45660c94af [v9.3.x] Influxdb: Handle legacy Influxdb influxql annotations with target in migration (#67502)
Influxdb: Handle legacy Influxdb influxql annotations with target in migration (#63225)

* handle legacy influxdb annotations with target in migration

* add types

* don't check tags that are empty strings and give annotation a type

(cherry picked from commit 7a3f7e26ce)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
2023-04-28 08:54:02 -04:00
Grot (@grafanabot)andMattiasSegerdahl e121ee769f [v9.3.x] docs: update dashboard settings page (#67429)
docs: update dashboard settings page (#67359)

Update index.md

(cherry picked from commit 55c36b04ca)

Co-authored-by: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
2023-04-27 13:43:53 -04:00
Christopher MoyerandMattiasSegerdahl 3098e85662 [v9.3] Update configure tracing (#67163) (#67411)
Update configure tracing (#67163)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 97ddfa631b)

Co-authored-by: MattiasSegerdahl <102952046+MattiasSegerdahl@users.noreply.github.com>
2023-04-27 11:56:57 -05:00
Grot (@grafanabot)andEric Wang f6eeb484fb [v9.3.x] Docs: Fix broken links to section on Variable syntax page (#67408)
Docs: Fix broken links to section on Variable syntax page (#67340)

These links have a trailing slash which don't work when linking to a
specific element.

(cherry picked from commit 278a8fccc9)

Co-authored-by: Eric Wang <2069450+ericdwang@users.noreply.github.com>
2023-04-27 12:07:58 -04:00
a9873db0f9 [v9.3.x] Chore: Update SAML lib (#844)
* AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x]  (#826)

* fix JWT query param leak

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* skip broken test

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* Update SAML lib

* Replace golang.org/x/net with v0.7.0

* Revert "Replace golang.org/x/net with v0.7.0"

This reverts commit d17e6bc4226bb7b3ef82c99541d68cace43dfa2e.

---------

Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
2023-04-27 14:37:04 +03:00
77bb24bc9e AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x] (#843)
* fix JWT query param leak

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* skip broken test

---------

Co-authored-by: jguer <me@jguer.space>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
2023-04-27 14:37:04 +03:00
Grot (@grafanabot) 73d0526572 Release: Bump version to 9.3.14 (#67256)
"Release: Updated versions in package to 9.3.14"
2023-04-26 11:57:14 +03:00
Grot (@grafanabot)andoneoneonepig db12eb4644 [v9.3.x] Doc: Fix typo (#67241)
Doc: Fix typo (#66929)

Update index.md

(cherry picked from commit ff61772218)

Co-authored-by: oneoneonepig <oneoneonepig@users.noreply.github.com>
2023-04-25 14:28:20 -05:00
Grot (@grafanabot)andbrendamuir 79f1b9266d [v9.3.x] Docs: adds legacy wording to api docs (#66940)
Docs: adds legacy wording to api docs (#66937)

adds legacy wording to api docs

(cherry picked from commit 9b529ef0cd)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-04-20 07:12:33 -04:00
Grot (@grafanabot)andIsabel 08fef79869 [v9.3.x] [docs] remove auth/saml alias from team sync page (#66854)
[docs] remove auth/saml alias from team sync page (#66796)

removed auth/saml alias from team sync page

(cherry picked from commit 60e6ff1038)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-04-19 10:02:20 -04:00
Emil Tullstedt 6604ea1fbb Chore: Upgrade Go to 1.20.3 (#66840)
Backport of #66264
2023-04-19 14:01:08 +02:00
Grot (@grafanabot)andIsabel fbbc5b4ff7 [v9.3.x] docs: add missing alias (#66674)
docs: add missing alias (#66621)

added missing alias

(cherry picked from commit 2b7f41f4df)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-04-17 10:10:15 -04:00
Grot (@grafanabot)andlwandz13 208c3a0c2f [v9.3.x] removed duplicate query data source section (#66680)
removed duplicate query data source section (#66605)

(cherry picked from commit 1e53b29eee)

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-04-17 06:45:59 -07:00
Isabel 02cb3a0751 [v9.3.x]docs: update broken link (#66528)
backport PR to fix broken link
2023-04-17 09:15:39 +01:00
Grot (@grafanabot)andismail simsek 23007843e1 [v9.3.x] Prometheus: Fix missing abs operation to query builder (#63461)
Prometheus: Fix missing abs operation to query builder (#63139)

Add abs operator to prometheus query builder

(cherry picked from commit 80292d3d1e)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2023-04-16 01:20:26 +03:00
Grot (@grafanabot)andYuri Tseretyan 5a35850514 [v9.3.x] Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#66592)
* Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#65577)

* extract function

* use context logger

* put alert to general folder if folder is missing

* move folderHelper init

* add test

* Update pkg/services/sqlstore/migrations/ualert/ualert.go

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>

---------

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
(cherry picked from commit 7b2f44762e)

* rename ID to Id and dashboards.Dashboard to models.Dashboard

---------

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-04-15 08:09:15 +02:00
Isabelandsamu6851 bf1d57d97c [v9.3.x] docs: put the numbers before dashboard elements (#66610)
resolving merge conflict for backport PR

Co-authored-by: samu6851 <samuel.oswalt@grafana.com>
2023-04-14 13:39:52 -04:00
Dimitris SotirakisandAndreas Christou a807c04177 [v9.3.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891) (#66455)
* CI: Split  subcommand (#66005)

* Update e2e package

- Ensure health request is monitored for addDatasource flow
- Add custom timeout to configurePanel flow

(cherry picked from commit 155fcae4aa)

* Make health check optional

(cherry picked from commit 91f66d61e1)

---------

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-04-13 16:57:19 +03:00
Dimitris Sotirakis b34f9779fd [v9.3.x] CI: Split /bin/build artifacts * subcommand (#66005) (#66341)
CI: Split `/bin/build artifacts *` subcommand (#66005)

* Split go files

* Modify publishartifacts.go

* Split main

* FIXME: Temp add GCSCopy to gcloud/storage

* Fix lint

* Exported flags

* Update starlark - make drone

* Further backend lint fixes

* Add fallback_test.go

* Fix go imports order

* make drone

* Remove GCSCopy from static assets

* Remove GCSCopy from storybook

* Fix lint

* Remove GCSCopy

* Remove success logline

* drone yaml cleanup

* Add artifacts-editions flag

* Fix starlark

* Add default sting slice in artifacts packages command

(cherry picked from commit 24d348f804)

# Conflicts:
#	.drone.yml
2023-04-12 12:19:51 +03:00
Jack Baldry fc88c0b597 [v9.3.x] Fix website build errors (#66116)
* Fix reference to Grafana CLI

- Make relref for relative permalink
- Use relative path for unambiguous resolution

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

* Remove reference to non-existent shared page

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

* Fix reference to Grafana Cloud

- Make relref for relative permalink
- Use absolute resolution

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Fix reference to Alertmanager page

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-04-08 09:23:28 +01:00
Grot (@grafanabot)andlwandz13 e9a649bf8f [v9.3.x] fixed broken links (#66177)
fixed broken links (#66153)

(cherry picked from commit ce00465d9b)

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-04-07 19:06:03 +03:00