Commit Graph

40895 Commits

Author SHA1 Message Date
Grot (@grafanabot) 1b8d220d96 [v9.4.x] Alerting: Add "backend" label to state history writes metrics (#65453)
Alerting: Add "backend" label to state history writes metrics (#65395)

* Add backend label to state history writes metrics

* Update test expectations

(cherry picked from commit dd04757fc9)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-28 17:06:57 +03:00
Grot (@grafanabot) 8fad42fa6f [v9.4.x] DateTimePicker: Can now select time correctly (#65431) 2023-03-28 13:11:52 +02:00
Grot (@grafanabot) 9d00d07a6a [v9.4.x] Alerting: Fix wrong text in step4 (#65348)
Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
Fix wrong text in step4 (#65279)
2023-03-28 13:04:32 +02:00
Grot (@grafanabot) 7b874aa327 [v9.4.x] Increase coverage of 'Grafana Cloud' labels (#64752)
Increase coverage of 'Grafana Cloud' labels (#64646)

* Add 'Grafana Cloud' label to content

All pages are applicable to both 'Open source' and 'Grafana Cloud'

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

* Add 'Grafana Cloud' label to administration content with some exceptions

- Enterprise licensing is 'Open source' and 'Enterprise'.
- 'Manage Organizations', 'Provision Grafana', and 'Stats and License' are 'Open source' only.

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

* Remove OSS from enterprise-licensing content

* Apply suggestions from code review

---------

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

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-03-28 11:51:36 +01:00
Will Browne 0d7efc076c [v9.4.x] Plugins: Markdown fetch retry with lowercase (#65388)
cherry pick
2023-03-28 12:19:20 +02:00
Grot (@grafanabot) d14faf3cc0 [v9.4.x] Docs: Add 'tenant_id' for Loki clients (Auditing & Analytics) (#65401)
Docs: Add 'tenant_id' for Loki clients (Auditing & Analytics) (#63098)

* Docs: Add 'tenant_id' for Loki clients (Auditing & Analytics)

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>

---------

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

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
2023-03-27 23:49:19 +03:00
Sofia Papagiannaki 67dd929f5e [v9.4.x]: Upgrade golang.org/x/net to 0.7.0 (#65337)
* go mod tidy

* go get golang.org/x/net@v0.7.0
2023-03-27 17:57:49 +03:00
Grot (@grafanabot) 72dad41413 [v9.4.x] Navigation: Sanitize homeUrl (#65365)
Navigation: Sanitize homeUrl (#65293)

sanitize homeUrl

(cherry picked from commit f948482386)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-27 15:41:32 +01:00
Dimitris Sotirakis 84e9267612 [v9.4.x] CI: Cleanup unnecessary grabpl dependencies (#65330) (#65347)
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:23 +03:00
Virginia Cepeda 9bafdcb72a Alerting: Improve showing nextEvaluationDate for rules (#65205) (#65227)
* 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:32:20 -03:00
Grot (@grafanabot) bb3e08a0a1 [v9.4.x] Alerting: Fix stats that display alert count when using unified alerting (#64951)
* Alerting: Fix stats that display alert count when using unified alerting (#64852)

* Alerting: Fix stats when using unified alerting

(cherry picked from commit 02a8f62021)

* bundle services is not needed for 9.4.x

---------

Co-authored-by: gotjosh <josue.abreu@gmail.com>
2023-03-27 14:30:27 +01:00
Grot (@grafanabot) 0680231781 [v9.4.x] Database: Don't sleep 10ms before every request (#65334)
Database: Don't sleep 10ms before every request (#64832)

Previously every DB operation would wait 10ms before even trying.
Now we try first, and defer creating the ticker until we need it.

(cherry picked from commit f4a5f91496)

Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
2023-03-27 12:30:50 +03:00
Grot (@grafanabot) 8288d962ef [v9.4.x] Docs: Use correct function in labels and annotations docs (#65253)
Docs: Use correct function in labels and annotations docs (#65032)

Use correct function in labels and annotations docs

(cherry picked from commit 0464aebc8e)

Co-authored-by: Martin Beentjes <martinbeentjes@users.noreply.github.com>
2023-03-27 11:10:12 +02:00
Dimitris Sotirakis bd37c60b50 [v9.4.x] CI: Remove grabpl dependency from publish-packages steps (#65329) (#65333)
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:29:02 +03:00
Jack Baldry e37fb197b2 [v9.4.x] Add @imatwawana to CODEOWNERS for her area of responsibility (#65158)
Add @imatwawana to CODEOWNERS for her area of responsibility (#64963)


(cherry picked from commit 8941ca813c)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-03-26 10:42:44 +01:00
Grot (@grafanabot) 0f87c31a2c [v9.4.x] Changelog: Updated changelog for 9.4.7 (#65296)
Changelog: Updated changelog for 9.4.7 (#65292)

(cherry picked from commit a02a28f229)
2023-03-23 12:52:45 -05:00
Grot (@grafanabot) 97fc76da27 [v9.4.x] Docs/updates amazon cloudwatch (#65282)
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:50:55 -07:00
Gilles De Mey 54fe185e80 Alerting: Paginate result previews (#65257) (#65273)
Co-authored-by: konrad147 <konradlalik@gmail.com>
Co-authored-by: Sonia Aguilar <soniaaguilarpeiron@gmail.com>
2023-03-23 16:01:52 +01:00
Grot (@grafanabot) 96d1d9981d [v9.4.x] Changelog: Updated changelog for 9.4.7 (#65269)
Changelog: Updated changelog for 9.4.7 (#65268)

(cherry picked from commit da97139489)
2023-03-23 14:28:25 +01:00
Grot (@grafanabot) f54cf0865a [v9.4.x] Expressions: More robust expression check (#65177)
Expressions: More robust expression check (#65006)

More robust expression check

(cherry picked from commit 1328878ace)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2023-03-22 20:57:17 +01:00
Dimitris Sotirakis ffe9b71a27 [v9.4.x] CD: Remove fetch-images dependency from AWS marketplace automation (#65173) (#65197)
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:56:03 +02:00
Grot (@grafanabot) 4a825cad7b [v9.4.x] Changelog: Updated changelog for 9.4.7 (#65209)
Changelog: Updated changelog for 9.4.7 (#65208)

(cherry picked from commit adcdf190bb)
2023-03-22 17:47:28 +01:00
ismail simsek ca91072d5b [v9.4.x] Fix xss in Graphite functions tooltip (#805)
Fix xss in Graphite functions tooltip (#804)

(cherry picked from commit 87aad3f11836f810ee1fdfee27827e746ef36055)

Co-authored-by: Ludovic Viaud <ludovic.viaud@gmail.com>
2023-03-22 17:41:54 +01:00
Grot (@grafanabot) b1c73a9984 [v9.4.x] SQL Datasources: Prevent Call Stack Overflows with Large Numbers of Values for Variable (#65182)
SQL Datasources: Prevent Call Stack Overflows with Large Numbers of Values for Variable (#64937)

* Push values with every map call to avoid hitting the maximum call stack size.

* Add test and refactor to for of

* Use native fill instead of lodash

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit bf687fff45)

Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>
2023-03-22 15:17:47 +01:00
Konrad Lalik 721605af13 Alerting: Prometheus-compatible Alertmanager timings editor (#64526) (#65124)
* Alerting: Prometheus-compatible Alertmanager timings editor (#64526)

* Change Alertmanager timings editor

* Update timing inputs for default policy editor

* Switch prom duration inputs in notification policy form

* Fix a11y issues

* Fix validation

* Add timings forms tests

* Fix default policy form and add more tests

* Add notification policy form tests

* Add todo item

* Remove unused code

* Use default timings object to fill placeholder values

(cherry picked from commit d8e32cc929)

* Adjust code and tests to v.9.4 codebase

* Remove unused code, remove TODO item
2023-03-22 13:26:14 +01:00
Grot (@grafanabot) 950b15d0aa [v9.4.x] Alerting: Fix attachment of external labels to Loki state history log streams (#65142)
Alerting: Fix attachment of external labels to Loki state history log streams (#65140)

Fix attachment of external labels, add tests

(cherry picked from commit 07368dec74)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-22 09:15:44 +02:00
Alexander Weaver 788dc25416 Alerting: Switch to snappy-compressed-protobuf for outgoing push requests to Loki (#65137)
* Alerting: Switch to snappy-compressed-protobuf for outgoing push requests to Loki (#65077)

* Encode with snappy, always

* JSON encoder type

* Headers

* Copy labels formatter from promtail

* Implement snappy-proto encoding

* Create encoder interface, test both encoders, choose snappy-proto by default

* Make encoder configurable at the LokiCfg level

* Export both encoders

* Touch up comment and tests

* Drop unnecessary conversions after move to plain strings to appease linter

(cherry picked from commit bf54f2672e)

* Sample fields got renamed between 9.4 and main
2023-03-21 16:42:01 -05:00
Alexander Weaver 744c1164e7 Alerting: Fix ambiguous handling of equals in labels when bucketing Loki state history streams (#65135)
Alerting: Fix ambiguous handling of equals in labels when bucketing Loki state history streams (#65013)

* Use JSON instead of data.Labels string format as label repr

* Drop debug log line

(cherry picked from commit cc7e5ce62e)
2023-03-21 19:59:57 +02:00
Brendan O'Handley 2c6ad8867f Prometheus: Feedback link for metric encyclopedia plus performance im… (#64773)
Prometheus: Feedback link for metric encyclopedia plus performance improvements (#64576)

* add filtered results

* add feedback link

* correctly debounce fuzzy search thank you leon

* reduce calls to filterMetrics()in letter search

* clean up the alphabet type

* bug fix, filter type should be subtractive

* each filter is don;t explicitly, subtracting from the results of each

* Revert "each filter is don;t explicitly, subtracting from the results of each"

This reverts commit 5648788451.

* each filter is filtered explicitly, one after the other, subtracting from the results of each

(cherry picked from commit 2e4b134743)
2023-03-21 11:56:49 -04:00
Grot (@grafanabot) 4b6a015256 [v9.4.x] Alerting: Elide requests to Loki if nothing should be recorded (#65118)
Alerting: Elide requests to Loki if nothing should be recorded (#65011)

Exit early if no log streams or annotations

(cherry picked from commit e39d7f44c9)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-21 16:50:47 +02:00
Grot (@grafanabot) 4452c15714 [v9.4.x] Fix x-value being formatted as time when not necessary (#65114)
Fix x-value being formatted as time when not necessary (#65095)

(cherry picked from commit 24ecc7d0dc)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
2023-03-21 16:13:14 +02:00
Grot (@grafanabot) 4b95a36e82 [v9.4.x] Docs: fix numbering and rename topic (#65107)
Docs: fix numbering and rename topic (#65093)

* Docs: fix numbering and rename topic

* fixes typo

* removes full stops

* deletes :

(cherry picked from commit 89c65e22d3)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-03-21 14:14:04 +01:00
Dimitris Sotirakis 612edc2665 [v9.4.x] CI: Update grabpl to 3.0.30 (#65028) (#65091)
CI: Update `grabpl` to `3.0.30` (#65028)

Update grabpl

(cherry picked from commit 4a80233bed)

# Conflicts:
#	.drone.yml
2023-03-21 12:14:17 +02:00
Grot (@grafanabot) fa2a8b2bd5 [v9.4.x] Docs: Add documentation on how to debug backend plugins (#65088)
Docs: Add documentation on how to debug backend plugins (#64814)

* Docs: Add documentation on how to debug backend plugins

* Changes from PR reviews

* PR review changes

(cherry picked from commit 41b0c17aae)

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
2023-03-21 10:43:03 +01:00
Horst Gutmann 29d69eb16f [v9.4.x] Update CODEOWNERship for grafana-delivery team (#64973) (#65018)
Update CODEOWNERship for grafana-delivery team (#64973)

(cherry picked from commit 2897ee37bf)
2023-03-21 11:27:45 +02:00
Grot (@grafanabot) 553b90d1e7 [v9.4.x] CloudWatch Logs: Revert "Queries in an expression should run synchronously (#64443)" (#65067)
CloudWatch Logs: Revert "Queries in an expression should run synchronously (#64443)" (#65036)

Revert "CloudWatch Logs: Queries in an expression should run synchronously (#64443)"

This reverts commit 74436d31de.

(cherry picked from commit 972e611f76)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
2023-03-20 19:51:38 +01:00
Grot (@grafanabot) 50952f0a7a [v9.4.x] [Docs] - Add Warning about Version Downgrade and Alerting to Grafana … (#65062)
[Docs] - Add Warning about Version Downgrade and Alerting to Grafana … (#64896)

* [Docs] - Add Warning about Version Downgrade and Alerting to Grafana v9.4 Upgrade Instructions

Add Warning about Version Downgrade and Alerting to Grafana v9.4 Upgrade Instructions

* Update docs/sources/upgrade-guide/upgrade-v9.4/index.md

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

* Update docs/sources/upgrade-guide/upgrade-v9.4/index.md

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

* makes prettier

---------

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

Co-authored-by: SeamusGrafana <102023327+SeamusGrafana@users.noreply.github.com>
2023-03-20 13:03:28 -05:00
Grot (@grafanabot) bc4e9e3215 [v9.4.x] Information about SQLite limitations (#65066)
Information about SQLite limitations (#64990)

* Update _index.md

I am creating this PR to add more content about the SQLite (the default database for Grafana) limitations. SQLite is fine for small environments but not suitable when monitoring many Dashboards and sending lots of alerts frequently.

For e.g. this issue is just from this week and then got followed up by 3-4 more similar issues (all related to SQLite and are linked with this issue)

Closes #64664

By adding more information, will have less frequency of such issues reported by users.

Also, once this PR get submitted, will also create a new PR about the possible workaround to not get the error message "database locked" while using SQLite.

* Update docs/sources/setup-grafana/installation/_index.md

Thank you. Also, can you please add this link to the High Availablity text as hyperlink.

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

* Update docs/sources/setup-grafana/installation/_index.md

* Update docs/sources/setup-grafana/installation/_index.md

---------

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

Co-authored-by: Usman Ahmad <69509548+usmangt@users.noreply.github.com>
2023-03-20 12:06:09 -05:00
Grot (@grafanabot) 6a1d736f03 [v9.4.x] KVStore: Include database field in migration (#65037)
KVStore: Include database field in migration (#62790)

(cherry picked from commit b0213a4877)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
2023-03-20 12:44:03 +01:00
Konrad Lalik bf3422740b Alerting: Fix notification policies matcher filter (#64967) 2023-03-20 07:55:50 +01:00
Grot (@grafanabot) 231cb2b835 [v9.4.x] AzureMonitor: Fix query variable migration (#64982)
AzureMonitor: Fix query variable migration (#63991)

* AzureMonitor: Fix query variable migration

Somehow the query object becomes "unwriteable" post 9.4. To workaround
this I clone the query object before doing any migrations which removes
the immutability and allows the migrations to function as they did.

Fixes #63943

* refactor deepClone out to keep object the same

(cherry picked from commit 3498785184)

Co-authored-by: Adam Simpson <adam@adamsimpson.net>
2023-03-18 21:21:40 +02:00
Grot (@grafanabot) a440178397 [v9.4.x] Vendor errors.Join from Go standard library to avoid version incompatibilities (#64986)
Vendor errors.Join from Go standard library to avoid version incompatibilities (#64985)

Vendor errors.Join from std lib

(cherry picked from commit 40c5713cbd)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-17 14:42:31 -05:00
Grot (@grafanabot) 85c794d932 [v9.4.x] Alerting: Create new state history "fanout" backend that dispatches to multiple other backends at once (#64983)
Alerting: Create new state history "fanout" backend that dispatches to multiple other backends at once (#64774)

* Rename RecordStatesAsync to Record

* Rename QueryStates to Query

* Implement fanout writes

* Implement primary queries

* Simplify error joining

* Add test for query path

* Add tests for writes and error propagation

* Allow fanout backend to be configured

* Touch up log messages and config validation

* Consistent documentation for all backend structs

* Parse and normalize backend names more consistently against an enum

* Touch-ups to documentation

* Improve clarity around multi-record blocking

* Keep primary and secondaries more distinct

* Rename fanout backend to multiple backend

* Simplify config keys for multi backend mode

(cherry picked from commit a31672fa40)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-17 20:13:12 +02:00
Grot (@grafanabot) 1f498f9ff7 [v9.4.x] AzureMonitor: Increase wait for credentials to be ready in E2E test (#64980)
AzureMonitor: Increase wait for credentials to be ready in E2E test (#64969)

Increase wait for credentials to be ready

(cherry picked from commit edc47964b6)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-03-17 16:56:12 +00:00
Grot (@grafanabot) 7e5e3d78d0 [v9.4.x] SQLStore: Fix setting query retries for integration tests (#64972)
SQLStore: Fix setting query tries for integration tests (#64944)

* SQLStore: Pass testinfra database configuration to the test database

* Add test

* Bypass gocyclo check for initTestDB

(cherry picked from commit f5cb8c660e)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-03-17 18:05:30 +02:00
Grot (@grafanabot) c5f4ef6c3e [v9.4.x] Alerting: Handful of small adjustments to log levels and parameters (#64954)
Alerting: Handful of small adjustments to log levels and parameters (#64572)

Calculate duration earlier in scheduler

(cherry picked from commit 9bcf8819d3)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-03-17 14:33:55 +02:00
Grot (@grafanabot) 69a7d5d6a6 [v9.4.x] SQLStore: Fix SQLite error propagation if query retries are disabled (#64948)
SQLStore: Fix SQLite error propagation if query retries are disabled (#64904)

* SQLStore: Add test when query retrying is disabled

* Fix condition

* Add test cases for sqlite3.ErrLocked

(cherry picked from commit 41843464d1)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-03-17 13:33:37 +02:00
Grot (@grafanabot) 3d1085c6ad [v9.4.x] Navigation: handle case when there is no alerting node at all (#64950)
Navigation: handle case when there is no alerting node at all (#64941)

* handle case when there is no alerting node at all

* update backend tests

(cherry picked from commit f4c62a5c5d)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-17 13:27:40 +02:00
Grot (@grafanabot) 5d6a6677a2 [v9.4.x] Alerting: QoL improvements to the unified alerting multi-replica devenv (#64939)
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:59:13 +00:00
Grot (@grafanabot) b5c092f03e [v9.4.x] Navigation: Correctly create Alerts and incidents section when using legacy alerting (#64926)
Navigation: Correctly create `Alerts and incidents` section when using legacy alerting (#64924)

check for legacy alerting node as well

(cherry picked from commit 54dd8943ca)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-03-16 20:17:48 +02:00