Commit Graph

5657 Commits

Author SHA1 Message Date
Ashley Harrison bee9517d96 [v10.1.x] Release: Deprecate latest.json and replace with api call to grafana.com (#80604)
Release: Deprecate latest.json and replace with api call to grafana.com (#80537)

* remove latest.json and replace with api call to grafana.com

* remove latest.json

* Revert "remove latest.json"

This reverts commit bcff43d898.

* Revert "remove latest.json and replace with api call to grafana.com"

This reverts commit 02b867d84e.

* add deprecation message to latest.json

(cherry picked from commit 127decee1e)
2024-01-16 12:09:36 +00:00
Karl Persson a1408862dc [v10.1.x] Auth: id response header (#78883)
Auth: id response header (#77871)

* Add config options for identity id response header

* Add feature to add identity id response header to all responses

* Use util.SplitString

(cherry picked from commit 21f94c5b78)
2023-12-11 09:38:06 +01:00
gotjosh 8f3cddbf65 [v10.1.x] Alerting: Attempt to retry retryable errors (#79211)
Alerting: Attempt to retry retryable errors (#79161)

* Alerting: Attempt to retry retryable errors

Retrying has been broken for a good while now (at least since version 9.4) - this change attempts to re-introduce them in their simplest and safest form possible.

I first introduced #79095 to make sure we don't disrupt or put additional load on our customer's data sources with this change in a patch release. Paired with this change, retries can now work as expected.

There's two small differences between how retries work now and how they used to work in legacy alerting.

Retries only occur for valid alert definitions - if we suspect that that error comes from a malformed alert definition we skip retrying.
We have added a constant backoff of 1s in between retries.

---------

Signed-off-by: gotjosh <josue.abreu@gmail.com>
(cherry picked from commit c631261681)
2023-12-07 13:32:03 +00:00
Sofia Papagiannaki 5bed94f873 [v10.1.x] Alerting: Fix deleting rules in a folder with matching UID in another organization (#79007)
* Alerting: Fix deleting rules in a folder with matching UID in another organization (#78258)

* Remove usage of obsolete function for deleting alert rules under folder

* Apply suggestion from code review

* Update tests

(cherry picked from commit 6d4625ad52)

* fixup
2023-12-05 13:30:17 +02:00
gotjosh 7a0ee7044b [v10.1.x] Alerting: Only warm alert state cache if execute_alerts=true. (#78944)
Alerting: Only warm alert state cache if execute_alerts=true. (#78895)

* Alerting: Only warm alert state cache if execute_alerts=true.

If the Grafana instance is not executing alerts, then Warm()-ing the state
manager is wasteful and could lead to misleading rule status queries, as the
status returned will be always based on the state loaded from the database at
startup, and not the most recent evaluation state.

* Move Warm() down to shared conditional.

(cherry picked from commit 520c927931)

Co-authored-by: Steve Simpson <steve.simpson@grafana.com>
2023-12-01 14:23:08 +00:00
grafana-delivery-bot[bot] 69daafd37b [v10.1.x] Fix: visualization vs visualisation in feature description (#76992)
Fix: visualization vs visualisation in feature description (#75895)

(cherry picked from commit 965c1de1f2)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
2023-10-23 20:50:41 +03:00
Ieva 2358ab0a85 Provisioning: Ensure that enterprise provisioning runs [10.1.x] (#76686)
revert https://github.com/grafana/grafana/pull/72608

(cherry picked from commit bb3e422365d95aa44a468bc71adfffa423bec65e)
2023-10-17 14:50:28 +01:00
grafana-delivery-bot[bot] 1bb4a7299b [v10.1.x] Alerting: Add support for keep_firing_for field from external rulers (#75257) 2023-09-22 01:02:51 +02:00
grafana-delivery-bot[bot] 8c5cc1a7cc [v10.1.x] LDAP: FIX Enable users on successfull login (#75176)
LDAP: FIX Enable users on successfull login  (#75073)

* LDAP: Enable users on successfull login

* Force enable ldap users on successful login

* Fix tests

* Fix tests

(cherry picked from commit c8149d50f9)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2023-09-20 21:02:41 +02:00
Eric Leijonmarck f3331f8442 [v10.1.x] Auth: Optimize auth token operations (#74833)
Auth: Optimize auth token operations (#74602)

* add token count

* wip

* user count method for tag reporting

* remove non functioning mysql clientFoundRows check

* Update pkg/services/auth/authtest/testing.go

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

* add user ID guard

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
(cherry picked from commit 77e4d477e5)

Co-authored-by: Jo <joao.guerreiro@grafana.com>
2023-09-13 15:04:58 +01:00
grafana-delivery-bot[bot] ff8e88f8c9 [v10.1.x] RBAC: Fix search user permissions (#74837)
RBAC: Fix search user permissions (#74729)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
(cherry picked from commit 729f9a01a0)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2023-09-13 16:31:30 +03:00
Eric Leijonmarck 9e22607231 [v10.1.x] Auth: Refactor for revoking user tokens within last hours (#74820)
Auth: Refactor for revoking user tokens within last hours (#74616)

* fix: revoked tokens within last hours

adds check for unlimited sessions out of index
adds a function for specifing the hours to look back when revoking users tokens, otherwise we "assume" the clean up takes care of them adds a index for the `user_auth_token` - `revoked_at` for faster queries when using `revoked_at`

* fix: sqllite datetime conversion with unixtimestamps

* fix: postgres dialect

* fix: mysql dialect

* fix: mysql dialect missing closing )

* refactor: delete revoked tokens directly

* fix: tests for sqlite

* AuthToken: Simplify DeleteUserRevokedTokens and add test

* fix: linting newline

* Reset get time after test

* fix: test order by revoked

* fix: order by different db

* ascending

* test with seen at

---------

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
(cherry picked from commit b00f3216c1)
2023-09-13 13:22:01 +01:00
grafana-delivery-bot[bot] 01d039b9aa [v10.1.x] Alerting: Do not exit if Redis ping fails when using redis-based Alertmanager clustering (#74399)
Alerting: Do not exit if Redis ping fails when using redis-based Alertmanager clustering (#74144)

Do not fail redis peer construction if ping fails

(cherry picked from commit 5c9aeaef41)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-09-05 11:07:48 -05:00
Eric Leijonmarck 9be1e52ad7 [v10.1.x] Refactor: Move LDAP auth config frontend registration to OSS (#74377)
merge fix
2023-09-05 15:39:09 +03:00
grafana-delivery-bot[bot] 473f1808b4 [v10.1.x] LDAP: Fix user disabling (#74109)
* [LDAP] Disable removed users on login (#74016)

* [LDAP] Disable removed users on login

* Fix tests

* Add test for user disabling

* Add tests for disabling user behind auth proxy

* Linting.

* Rename setup func

* Account for reviews comments

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

---------

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
(cherry picked from commit f900098cc9)

* manual backport of #74016

* LDAP: Fix active sync with large quantities of users (#73834)

* Fix middleware test

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Gabriel MABILLE <gabriel.mabille@grafana.com>
2023-08-30 16:51:25 +02:00
grafana-delivery-bot[bot] 03ae4c7328 [v10.1.x] Alerting: Limit redis pool size to 5 and make configurable (#74059)
Alerting: Limit redis pool size to 5 and make configurable (#74057)

* Limit redis pool size to 5 and expose it in config ini

* Coerce negative pool sizes to the default

(cherry picked from commit dfba94e052)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2023-08-29 15:19:06 -05:00
grafana-delivery-bot[bot] 82d44b41be [v10.1.x] Secrets: Add user_auth.o_auth_id_token column to migrator (#73931)
Secrets: Add user_auth.o_auth_id_token column to migrator (#72239)

(cherry picked from commit 81a639bd1b)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
2023-08-29 15:53:58 +02:00
grafana-delivery-bot[bot] 0ddf9aba9d [v10.1.x] Plugins: Dynamic angular patterns: Add random offset to GCOM API calls, handle HTTP errors (#73897)
* Plugins: Dynamic angular patterns: Add random offset to GCOM API calls, handle HTTP errors (#73494)

* Plugins: Dynamic angular patterns: Return error for != 2xx status code

* Add test for status code check

* Plugins: Dynamic angular patterns: Add random skew to periocic GCOM api calls

* Add test for random skew

* Changed randomSkew signature, ensure it is always positive

(cherry picked from commit 4ef98449ff)

* trigger

---------

Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
Co-authored-by: Giuseppe Guerra <giuseppe@guerra.in>
2023-08-28 15:40:14 +02:00
grafana-delivery-bot[bot] b124a2de3f [v10.1.x] AuthProxy: Fix user retrieval through cache (#73824)
AuthProxy: Fix user retrieval through cache (#73802)

* AuthProxy: Change auth proxy sync cache key

(cherry picked from commit 5d14b6ba19)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2023-08-28 13:24:12 +03:00
grafana-delivery-bot[bot] 47ff0a9eb1 [v10.1.x] DataSourceProxy: Fix url validation error handling (#73322)
* DataSourceProxy: Fix url validation error handling (#73087)

* DataSourceProxy: Fix url validation error handling

* DataSourceProxy: Add unit test for proxyDatasourceRequest

* DataSourceProxy: Fix lint error

(cherry picked from commit 8ec4c1bdc8)

* fix test

* fix test

---------

Co-authored-by: Ricardo Christmann <80476005+ricci2511@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
2023-08-16 18:35:28 +03:00
grafana-delivery-bot[bot] 0fdb3485f6 [v10.1.x] Slug: Combine various slugify fixes for special character handling (#73173)
Slug: Combine various slugify fixes for special character handling (#73164)

* combine various slugify fixes for special character handling

* a couple more test cases

* update more tests

* goimports

(cherry picked from commit dd97038b00)

Co-authored-by: Dan Cech <dcech@grafana.com>
2023-08-11 13:13:29 -04:00
Jo 43a8b2a8c9 [v10.1.x] Auth: Add authed device tagging (#73156)
* Auth: Rename Sessions to Devices in counting (#72432)

* rename session to device

* rename session to device

* Auth: Add authed device tagging (#72442)

* add authed device tagging

* fix config

* implement feedback

* implement feedback

* add reverse untag behavior

* remove duplicate stat

* Update pkg/services/anonymous/anonimpl/impl.go

(cherry picked from commit 3353b1a8aa)
2023-08-10 17:29:13 +02:00
grafana-delivery-bot[bot] d5c79b6c06 [v10.1.x] Logs: Disable query splitting due to conflicts with transformations (#73097)
Logs: Disable query splitting due to conflicts with transformations (#73086)

* disable query splitting for now

* change stage of `lokiQuerySplitting`

(cherry picked from commit 1343c74362)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
2023-08-09 14:00:07 +03:00
grafana-delivery-bot[bot] 13e848b0c3 [v10.1.x] Alerting: Optimize external Loki queries (#73050)
Alerting: Optimize external Loki queries (#73014)

(cherry picked from commit 2c6cf66741)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
2023-08-08 15:42:26 +02:00
grafana-delivery-bot[bot] 197682a43e [v10.1.x] Auth: lock down Grafana admin sync for SAML (#72839)
Auth: lock down Grafana admin sync for SAML (#72828)

lock down Grafana admin sync for SAML

(cherry picked from commit 3a2538c2ca)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2023-08-03 19:14:08 +03:00
grafana-delivery-bot[bot] 2a4a96c86f [v10.1.x] Proxy: Set the proxy information in Grafana for Graphite (#72813)
Proxy: Set the proxy information in Grafana for Graphite (#72777)

(cherry picked from commit 2c949a6a33)

Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
2023-08-03 06:31:16 -06:00
grafana-delivery-bot[bot] 5769d0be49 [v10.1.x] Search v1: Remove unnecessary subqueries (#72710)
Search v1: Remove unnecessary subqueries (#72388)

* Add feature flag

* Introduce interface and dummy implementation

* Add tests for the new filter

* accessControlDashboardPermissionFilterNoFolderSubquery implementation

* join only if it's necessary

* force ordering for tests

* Temporarily enable new query for benchmarks

(cherry picked from commit 2c26a02b82)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-08-03 11:12:14 +03:00
grafana-delivery-bot[bot] c30f9216b1 [v10.1.x] UserSync: Avoid UpdateLastSeenAt with invalid user ids (#72784)
UserSync: Avoid UpdateLastSeenAt with invalid user ids (#72776)

* avoid user zero

* more errors

* more tests

* split

(cherry picked from commit 7431c0ddb1)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
2023-08-03 09:41:22 +03:00
Sofia Papagiannaki be29f3d05f [v10.1.x] Nested folders: Fix search query for empty self-contained permissions (#72733)
Nested folders: Fix search query for empty self-contained permissions (#72727)

* Add tests

* Fix query for nested folders with zero self-contained permissions

* Fix query behind  permissionsFilterRemoveSubquery flag

* Apply suggestion from code review

(cherry picked from commit 8a24e891fe)
2023-08-02 15:06:38 +03:00
Ieva 6b1b34b5f3 [v10.1.x] Auth: Lock down Grafana admin role updates if the role is externally synced (#72691)
merge
2023-08-02 08:54:24 +01:00
Jo 46f971bf48 [v10.1.x] Auth: Fix static test fake (#72627)
Auth: Fix static test fake (#72514)

fix static fake

(cherry picked from commit e04a6fb08e)
2023-08-01 16:41:25 +02:00
grafana-delivery-bot[bot] 2fda52bd5f [v10.1.x] PublicDashboards: Do not return hidden queries (#72605)
PublicDashboards: Do not return hidden queries (#72554)

* PublicDashboards: Do not return hidden queries

* Update pkg/services/publicdashboards/service/query_test.go

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

---------

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit bffd55efd4)

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
2023-07-31 11:47:40 -03:00
grafana-delivery-bot[bot] ad745f90ea [v10.1.x] Chore: Refactor error when retrieving the plugin manifest key (#72493)
Chore: Refactor error when retrieving the plugin manifest key (#72492)

(cherry picked from commit a331c892a0)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2023-07-28 11:38:13 +03:00
grafana-delivery-bot[bot] a8ee1f1b8f [v10.1.x] Provisioning: Fix overwrite SecureJSONData on provisioning (#72455)
Provisioning: Fix overwrite SecureJSONData on provisioning (#72395)

* Overwrite SecureJSONData on provisioning

(cherry picked from commit a912c970e3)

Co-authored-by: Hugo Kiyodi Oshiro <hugo.oshiro@grafana.com>
2023-07-27 15:52:34 +02:00
Yuri Tseretyan c7598cc6fb Alerting: Add ability to control scheduler tick interval via config (#71980)
* add ability to control scheduler interval via config
* add feature flag `configurableSchedulerTick`
2023-07-26 12:44:12 -04:00
Brendan O'Handley 98cb3ce3b6 Prometheus: Config overhaul part two, auth and DataSourceHttpSettings overhaul (#71250)
* build httpsettings overhaul with new auth component

* remove test code

* add connection and advanced http settings components

* use tooltip with link

* add correct styling and spacing

* save option select for sigV4

* fix styles in Azure auth to fit new auth component

* add types in overhaul folder that are not available yet in grafana

* update e2e tests for new connection component

* update e2e tests for new connection component

* update width of azure inputs

* fix non custom auth selects

* add feature toggle

* wrap azure style changes behind the feature flag

* fix feature toggle rebase fix error

* move advanced http setting and wrap everything in the config subsection component to fix font

* fix input width

* use cx for conditional classes

* use cx for conditional class
2023-07-26 12:09:53 -04:00
Yuri Tseretyan 5ba164d92b Alerting: Exclude expression refIDs from NoData state (#72219) 2023-07-26 11:42:04 -04:00
Yuri Tseretyan 78fc3bcdf4 Alerting: Fix state manager to not keep datasource_uid and ref_id labels in state after Error (#72216) 2023-07-26 11:41:46 -04:00
Andre Pereira 89092a1e69 Tempo: Use feature toggle to control TraceQL streaming (#72288)
Rename traceql streaming feature toggle. Remove the manual toggle from Options component and use the feature toggle
2023-07-26 13:33:16 +00:00
Ludovic Viaud f629698876 Toggle transformationsRedesign for prod (#72207)
* Toggle transformationsRedesign for prod
2023-07-26 14:08:46 +02:00
ismail simsek 876f96e5e8 InfluxDB: Change feature toggle stage (#72348)
Change feature toggle stage
2023-07-26 14:06:42 +02:00
Josh Hunt 488eac0e49 Chore: Remove topnav feature flag (#72337)
* Remove topnav feature flag

* Allow deprecated flags to be enabled by default

* change topnav feature flag to deprecated instead

* fix lint
2023-07-26 11:07:18 +00:00
mikkancso 7a97bf7f15 Data Sources: Remove Admin/Data sources page in favour of Connections/Data sources (#72102)
* don't show Admin/Data sources page in navtree

* redirect from admin/datasources to connections/datasources

* update link of DS plugins to connections/datasources

* redirect edit page from datasources to connections

* redirect to new datasource page under connections

* redirect to datasouce dashboard page under connections

* fix navId on datasource dashboards page

* fix datasource dashboard page's nav

* Revert "update link of DS plugins to connections/datasources"

This reverts commit 0ebcb09b03.
2023-07-26 12:23:05 +02:00
Matthew Jacobson d31d175109 Alerting: Fix contact point testing with secure settings (#72235)
* Alerting: Fix contact point testing with secure settings

Fixes double encryption of secure settings during contact point testing and removes code duplication
that helped cause the drift between alertmanager and test endpoint. Also adds integration tests to cover
the regression.

Note: provisioningStore is created to remove cycle and the unnecessary dependency.
2023-07-25 10:04:27 -04:00
Galen Kistler 51847cc797 Prometheus: Turn browser resource cache on by default (#72105)
* turn prometheus browser cache flag on by default
2023-07-25 07:39:56 -05:00
Sofia Papagiannaki 1f742fcf93 Guardian: Split dashboard and folder guardian implementation (#69722)
* Split dashboard and folder guardian implementations

* Replace guardian constructors

* Simplify tests

* Add tests

* Apply suggestion from code review

Differentiate errors for dashboard and folders

* Remove tests for general folder

* Add tests for general scope
2023-07-25 15:31:12 +03:00
Ieva f7c6491f73 Auth: add a feature toggle for locking user roles for users synced through GCom (#72202)
* add a new feature toggle for locking down role sync for users managed by GCom

* protect the frontend and the backend using the new feature toggle

* fix merge
2023-07-25 13:27:02 +01:00
Arati R 20ffbbc41e NestedFolders: Add library panels counting and deletion to folder registry (#69149)
* Expose library element service's folder service
* Register library panels, add count implementation
* Expand folder counts test
* Update registry deletion method interface
* Allow getting library elements from any folder
* Add test for library panel deletion
* Add test for library panel counting
2023-07-25 13:05:53 +02:00
Ieva e9ba6922c0 Auth: Lock organization roles for users who are managed through an external auth provider (#72204)
remove onlyExternalOrgRoleSync feature flag
2023-07-25 10:51:47 +01:00
github-actions[bot] 24872370b5 Alerting: Update Swagger spec (#72177)
chore: update alerting swagger spec

Co-authored-by: rwwiv <rwwiv@users.noreply.github.com>
2023-07-25 11:34:00 +02:00