Commit Graph
39434 Commits
Author SHA1 Message Date
Grot (@grafanabot)andGuilherme Caulada 1d0c19ff5c [v9.3.x] Build: Add CloudMode to build versions (#65988)
Build: Add CloudMode to build versions (#65651)

* Add CloudMode to build versions

* Use linux-amd64 variant without musl for cloud mode

* Add cloud mode to version folder on package upload

* Use musl variant for CloudMode

* Only sign rpm packages if there's any to sign

* Remove trailing whitespace

(cherry picked from commit 8f282b8a6e)

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
2023-04-05 11:38:14 +03:00
Dimitris Sotirakis c9882623f5 [v9.3.x] Backport #65797 and #65806 to v9.3.x (#65856)
* CI: Make `init-enterprise` depend on `grabpl` (#65797)

Make init-enterprise depend on grabpl

# Conflicts:
#	.drone.yml

(cherry picked from commit 821633c796)

# Conflicts:
#	.drone.yml

* CI: Exclude cloud related tags from tag events  (#65806)

* Exclude cloud related tags

* Fix starlark lint errors

(cherry picked from commit a18ea77aac)

# Conflicts:
#	.drone.yml
2023-04-04 08:36:42 +02:00
Grot (@grafanabot)andannelaurefroment 1bf4a3e2b1 [v9.3.x] update enhanced-ldap (#65866)
update enhanced-ldap (#65687)

* update enhanced-ldap

documenting a potential issue with ldap active sync, when search filter and username attributes do not match.

* Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md

* formats example

* Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit 99ac39f0d2)

Co-authored-by: annelaurefroment <49911675+annelaurefroment@users.noreply.github.com>
2023-04-03 11:23:17 -05:00
Grot (@grafanabot)andChristine Wang b0f55819a1 [v9.3.x] Docs: Add transformations doc link for What's New v9.2 (#65849)
Docs: Add transformations doc link for What's New v9.2 (#65673)

* Add transformations doc link

Add transformations doc link to `Transformations: INNER JOINs` section.

Related issue: https://github.com/grafana/grafana/issues/65671

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

---------

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

Co-authored-by: Christine Wang <wang.christiney@gmail.com>
2023-04-03 11:17:23 -05:00
Horst Gutmann 94cbd9dba2 [v9.3.x] CI: Move release integration pipeline to standalone promotion pipeline (#65787) (#65802)
CI: Move release integration pipeline to standalone promotion pipeline (#65787)

(cherry picked from commit e9aef20eb4)
2023-04-03 14:13:21 +03:00
Grot (@grafanabot)andYuri Tseretyan 87ca6d206d [v9.3.x] Alerting: Fix integration test for creating silences (#65791)
Alerting: Fix integration test for creating silences (#65722)

* fix integration test for creating silences

to create correct silence with endsAt in the future

* Update api_alertmanager_test.go

(cherry picked from commit ed8628e39d)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-04-03 12:47:15 +03:00
Grot (@grafanabot)andsarah-spang 7e1690b5af [v9.3.x] Docs: Fix markup for URL (#65648)
Docs: Fix markup for URL (#65576)

* Docs: Fix markup for URL

* updates absolute URL to a relref

---------

Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit 940768cf76)

Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>
2023-03-30 14:03:42 -05:00
Grot (@grafanabot)andsarah-spang 0bf04f6095 [v9.3.x] Docs: Fix Nightly Builds URL (#65569)
Docs: Fix Nightly Builds URL (#65552)

Update _index.md

URL for Nightly Builds leads to standard download page.
- Updated to direct to correct Nightly Downloads page: https://grafana.com/grafana/download/nightly?edition=oss

(cherry picked from commit 8717cd0761)

Co-authored-by: sarah-spang <86264026+sarah-spang@users.noreply.github.com>
2023-03-29 16:39:29 -05:00
Christopher Moyerandmallettjared aeea456a0e [v9.3]: Remove redundant content or delete this page entirely (#65446) (#65543)
Remove redundant content or delete this page entirely (#65446)

* Remove redundant content or delete this page entirely

The top of the page has redundant content pitching Grafana Cloud.

"You can also configure the MS SQL Server data source on a Grafana Cloud instance without having to host Grafana yourself."  Which is directly under the highlighted area explaining the same thing.  The same content is floating in the right side of all the pages as well.

Removed "> **Note:** You must install Grafana 5.1+ in order to use the integrated MS SQL data source."

Wait, why does this page exist if the data source page has the relevant updated content?  https://grafana.com/docs/grafana/latest/datasources/mssql/

* makes prettier

---------

Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit 2b73f8cfd5)

Co-authored-by: mallettjared <110853992+mallettjared@users.noreply.github.com>
2023-03-29 13:33:43 -05:00
Grot (@grafanabot)andDavid Allen 5441a02f94 [v9.3.x] configure HTTPS documentation (#65559)
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-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-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-https.md

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

* errata

* make prettier

* Apply suggestions from code review

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit 4839f1543a)

Co-authored-by: David Allen <david.allen@grafana.com>
2023-03-29 13:32:53 -05:00
Horst Gutmann 64f074ca8d [v9.3.x] CI: Update golangci-lint to 1.51.2 for Go 1.20 compatibility (#65506)
[v9.3.x] Update golangci-lint to 1.51.2 for Go 1.20 compatibility
2023-03-29 10:42:59 +02:00
Grot (@grafanabot)andIsabel 972a9c5957 [v9.3.x] docs: fix enhanced ldap alias (#65484)
docs: fix enhanced ldap alias (#65478)

fixed alias

(cherry picked from commit 4b29b1d741)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-03-28 14:43:49 -05:00
Grot (@grafanabot)andIsabel 3e2bdb3396 [v9.3.x] docs: update elasticsearch grafana play link (#65479)
docs: update elasticsearch grafana play link (#65280)

(cherry picked from commit 0d3e0e7cc4)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-03-28 14:30:08 -05:00
Grot (@grafanabot)andHorst Gutmann 678847d250 [v9.3.x] CI: Allow overwriting of existing GitHub release assets (#65458)
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 4ab3bd6f7e)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
2023-03-28 19:22:31 +02:00
d6d924b62a [v9.3.x] Update doc-validator to latest release (#62224)
* Update doc-validator to latest release (#62170)

* Update doc-validator to latest release

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

* Skip image validation

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

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

* Chore: Move to node 18 again (#62079)

move to node 18 again

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

---------

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-28 14:43:11 +01:00
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