Commit Graph

11096 Commits

Author SHA1 Message Date
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] 75923bf476 [v10.1.x] Chore: Fix Random Walk scenario for Grafana DS (#73894)
Chore: Fix Random Walk scenario for Grafana DS (#73889)

(cherry picked from commit aa0d4b3e45)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
2023-08-28 13:20:56 +03:00
grafana-delivery-bot[bot] 94f8af7568 [v10.1.x] Kinds: Reconcile verify-kinds.go with kind-registry changes (#73694)
Kinds: Reconcile verify-kinds.go with kind-registry changes (#73689)

* Kinds: Reconcile verify-kinds.go with kind-registry changes

* Remove handwritten value specific for manual test

* Update grafana/kindsys dep

* Revert "Update grafana/kindsys dep"

This reverts commit e437e1879e.

* Fix generated code

(cherry picked from commit fb0165ab87)

Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>
2023-08-23 17:06:36 +02:00
grafana-delivery-bot[bot] 663bfe762a [v10.1.x] Whitelabeling: Add a config option to hide the Grafana edition from the footer (#73491) 2023-08-21 10:50:43 +01:00
grafana-delivery-bot[bot] 201b9fc95f [v10.1.x] CI: Improve error handling in gcloud copy operations (#73539)
CI: Improve error handling in gcloud copy operations (#73474)

(cherry picked from commit 220ea869be)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
2023-08-21 09:21:46 +03:00
grafana-delivery-bot[bot] 4d90697bf9 [v10.1.x] ClientTokenRotation: Don't rotate session cookie for authproxy (#73381)
ClientTokenRotation: Don't rotate session cookie for authproxy (#72496)

* ClientTokenRotation: Don't rotate session cookie for authproxy

* Account for config option auth.proxy enable_login_token

* Limit amount of changes on devenv

* Fix tests by moving authenticatedBy up

* Uncomment nginx conf

(cherry picked from commit 4c7b97cdb0)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2023-08-17 12:46:01 +02:00
grafana-delivery-bot[bot] c6a309f2ad [v10.1.x] Grafana versioning: Remove pre suffix from Grafana version (#73367)
Grafana versioning: Remove `pre` suffix from Grafana version (#73357)

* Remove pre suffix from version

* Fix tests

(cherry picked from commit 0aba319ea0)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-08-17 11:24:46 +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
grafana-delivery-bot[bot] d9836d0a35 [v10.1.x] AzureMonitor: Allow serviceTags and tags to be empty for trace results (#73197)
AzureMonitor: Allow `serviceTags` and `tags` to be empty for trace results (#73145)

Allow serviceTags and tags to be empty

(cherry picked from commit 95546551bc)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
2023-08-11 16:02:32 +01: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] 4cd3909b63 [v10.1.x] Auth: prevent auto_login redirect if user is already authenticated (#73081)
Auth: prevent auto_login redirect if user is already authenticated (#72477)

* Auth: prevent auto_login redirect if user is already authenticated

Before attempting an auto-login for OAuth, verifies if current context has already been
authenticated.

Fixes: #72476

Co-authored-by: Karl Persson <kalle.persson92@gmail.com>
(cherry picked from commit d9c232b331)

Co-authored-by: Maksym Revutskyi <maksym.revutskyi@gmail.com>
2023-08-09 10:44:02 +02: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] 91770cd97c [v10.1.x] InfluxDB: Fix handling flux response with no time and value column (#73047)
InfluxDB: Fix handling flux response with no time and value column (#72833)

* Upgrade the influxdb-client-go version

* Handle flux response with no time and value column

(cherry picked from commit 1ac9e7eaab)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
2023-08-08 16:13:36 +03:00
Christopher Moyer 351694891e [Docs 10.1.x] Manual backport - Docs/k8s install update (#72567) (#72953)
* Docs/k8s install update (#72567)

* added before you begin section

* just syncing up

* added namespace and yaml mainfest sections

* started the managed k8s section

* added external-ip section

* added minikube instructions

* added deployment rollout section

* added rolling update section

* added rollback stratgety section

* added the logging section

* fixed many typos

* Update docs/sources/setup-grafana/installation/kubernetes/index.md

* Update docs/sources/setup-grafana/installation/kubernetes/index.md

* Update docs/sources/setup-grafana/installation/kubernetes/index.md

* Update docs/sources/setup-grafana/installation/kubernetes/index.md

* Update docs/sources/setup-grafana/installation/kubernetes/index.md

* adjust codeblock spacing

* adjusts steps

* copy edit throughout

* Apply suggestions from code review

* more copy edit, updates links

* fixed minor typos

* Apply suggestions from code review

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

* explained the dry-run example

* Move .codespellignore out of Drone so that technical writers can modify it

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

* Fix spelling errors

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

* Add .codespellignore CODEOWNER

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

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit b1fd399c10)

* Update Drone signature

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

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Usman Ahmad <usman.ahmad@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-08-04 15:31:10 -05:00
grafana-delivery-bot[bot] 87c21987ea [v10.1.x] Auth: OAuth sets skip_org_role_sync = true for auth.google by default (#72924)
Auth: OAuth sets `skip_org_role_sync = true` for auth.google by default (#72819)

* sets skip_org_role_sync to true for google

* add google skiporgrolesync and sets to true always

* add field

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

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

* add AKS to words

* script back to mina

---------

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

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2023-08-04 16:33:23 +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] e5db5bcec7 [v10.1.x] Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72818)
Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72752)

* add missing cfg for skiporgrolesync

* add google skiporgrolesync

* removed google skip

* update docs to reflect google

* remove docs update for google

(cherry picked from commit 27f57fe112)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
2023-08-03 15:13:09 +02: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] fbb0466765 [v10.1.x] Usage stats: Tune collector execution startup and interval (#72790)
Usage stats: Tune collector execution startup and interval (#72688)

* Do not update statistics at service collector startup

* Configurable collector interval

* Introduce initial random delay

* Prevent reporting metrics until the stats have been collected

* Apply suggestion from code review

(cherry picked from commit afb59af79b)

Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
2023-08-03 11:39:51 +03: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
Kyle Brandt ceb694f165 SSE: (Instrumentation/Chore) Add datasource_type label to grafana_sse (#72370)
SSE: (Instrumentation/Chore) Add datasource_type label to the grafana_sse_ds_queries_total metric
2023-07-26 10:51:02 -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
Jo e4649e7099 Auth: Add azure warning for conflicting settings (#72289)
* add conflicting option debug warning

* add warning for Grafana Admin sync in auth config
2023-07-25 18:07:16 +02:00
Jo 348233bddb Auth: Gitlab Improve group fetching when using read_api (#72277)
* improve group fetching when using read api

* add constant for access level
2023-07-25 18:05:12 +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
Alexander Weaver 8c8b3ecb5b Alerting: Add dashboardUID and panelID query parameters for loki state history (#72119)
* read query parameters

* Generate loki query from params
2023-07-24 23:46:46 -05:00
Matthew Jacobson cfb1656968 Alerting: Add notification policy provisioning file export (#70009)
* Alerting: Add notification policy provisioning file export

- Add provisioning API endpoint for exporting notification policies.
- Add option in notification policy view ellipsis dropdown for exporting.
- Update various provisioning documentation.
2023-07-24 17:56:53 -04:00