public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,362 Commits 655 Branches 650 Tags
3179d548bb2fabdc5b9dcc2b7b2ae2d6ee18ca10
Commit Graph

33362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot) 3179d548bb Alerting: Fix updating notification channels in legacy (#45302) (#45331) 
The problem here is that without the orgID we ignore the lookup of the existing notification channel just before updating and end up failing the update because there is no channel available.

(cherry picked from commit 8bf2e642aa)

Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2022-02-16 13:35:39 +00:00
Grot (@grafanabot) 5b73b4e070 Analytics: Collect information about queries reordering (#45392) (#45465) 
(cherry picked from commit 8bb3de3037)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2022-02-16 14:30:35 +01:00
Grot (@grafanabot) 122f8b257d remove whitespace from ${__value.raw } (#44928) (#45176) 
(cherry picked from commit 7ef43fb959)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
 2022-02-16 14:13:06 +01:00
Grot (@grafanabot) 48e5624095 Loki: Use explore query field unless new query builder feature toggle is enabled (#44858) (#44901) 
* Loki: Fix using of Explore editor in Explore

* Add test and remove Explore fields in module

* Update tests

(cherry picked from commit e7a0e69153)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-02-16 14:04:39 +01:00
Grot (@grafanabot) 7c079483eb Update changelog for 8.3.5 and 7.5.15 (#45078) (#45084) 
(cherry picked from commit b2a8487684)

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
 2022-02-16 13:53:17 +01:00
Grot (@grafanabot) 2932cc8ec8 [docs] Clarify legacy alerting deprecation (#44759) (#44817) 
* Clarify legacy alerting deprecation

* Lint Markdown

(cherry picked from commit 8c6a5f043a)

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
 2022-02-16 13:51:37 +01:00
Grot (@grafanabot) c630e0ce4f Update docs library element http api (#44493) (#44812) 
(cherry picked from commit 16f0c6617a)

Co-authored-by: JM <justintmai@gmail.com>
 2022-02-16 13:51:08 +01:00
Grot (@grafanabot) 1308e19197 Explore: avoid locking timepicker when range is inverted (#44790) (#44841) 
* Explore: avoid locking timepicker when range is inverted

* Explore: prevent time picker to lock if from & to search parameters are present

(cherry picked from commit 6415b9a54d)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
 2022-02-16 13:48:47 +01:00
Grot (@grafanabot) a682943b24 QueryEditor: Fix setting panel state to done if query had no error (#45453) (#45456) 
(cherry picked from commit da91c93f4a)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-02-16 11:59:55 +01:00
Grot (@grafanabot) fd83e14400 QueryEditor: Fix crash in angular panels when query have error (#45422) (#45448) 
(cherry picked from commit befb2afccc)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-02-16 11:44:48 +01:00
Grot (@grafanabot) 19a88b3e6f Fix notification routes editing when filters are applied (#45380) (#45450) 
* Fix route editing when filters are applied

* Fix route delete operation, reset expanded item when filters change

* Refactor edit and delete functions, add tests

* Fix comment

(cherry picked from commit 1886a59a12)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-02-16 11:37:25 +01:00
Sofia Papagiannaki 3d2fbcba2d [8.4.x]: SQLStore: Prevent concurrent migrations (#44101) (#45447) 
* SQLStore: Prevent concurrent migrations (#44101)

* SQLStore: Prevent concurrent migrations

* Hide behind a feature toggle

* Configurable locking attempt timeout

* Update docs/sources/administration/configuration.md

Co-authored-by: Igor Suleymanov <radiohead@users.noreply.github.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit d718ee1918)

* Resolve dependency cycle (#45427)

(cherry picked from commit 6a38ce2307)
 2022-02-16 11:23:54 +02:00
Dimitris Sotirakis e43e5c3c42 CI: Remove manual gcloud authentication (#44986) (#45444) 
* Remove manual gcloud auth from store-packages

* Update grabpl

(cherry picked from commit 163b570f5d)
 2022-02-16 09:45:50 +01:00
Jack Westbrook 67fc8ecbe3 Toolkit: Bump react-dev-utils to 12.0.0 (#44696) (#45408) 
* chore: bump react-dev-utils due to vulnerbility reports

* chore(yarn): update checksum, remove react-dev-utils packageExtensions

(cherry picked from commit b409811005)
 2022-02-16 10:30:08 +02:00
Grot (@grafanabot) 709b49fdc8 Highlights: fix RS event name (#45436) (#45441) 
(cherry picked from commit 39797e33ae)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2022-02-16 09:03:10 +01:00
Ieva 6fdb1d0440 merge (#45413) 2022-02-15 18:27:11 +01:00
Grot (@grafanabot) f0f4348aa5 AccessControl: Enable empty list New button based on user permissions (#45398) (#45402) 
(cherry picked from commit d11f6a95a4)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-02-15 16:36:51 +01:00
Grot (@grafanabot) eeab540874 CloudWatch: Add tests to annotations query (#45337) (#45391) 
(cherry picked from commit 1c1a45a880)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
 2022-02-15 15:47:45 +01:00
Grot (@grafanabot) 47c3f21c26 Tempo: Update service graph linked queries to use rate_interval and group histogram (#45248) (#45403) 
(cherry picked from commit 3da0434e64)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-02-15 15:32:40 +01:00
Grot (@grafanabot) b00b61f565 AccessControl: Trigger permission reload with team removal (#45383) (#45397) 
(cherry picked from commit 91dd0563c9)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-02-15 14:35:37 +01:00
Grot (@grafanabot) f5c43af76a Alerting: do not unescape external AM label values (#45334) (#45394) 
(cherry picked from commit 651bb773db)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-02-15 14:08:18 +01:00
Grot (@grafanabot) 382600c9eb Init node item (#45218) (#45323) 
(cherry picked from commit 574f609550)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
 2022-02-12 11:21:59 +02:00
Grot (@grafanabot) 099e6ee22d Documentation for teams with FGAC (#45321) (#45336) 
* docs for teams with FGAC

* Update docs/sources/enterprise/access-control/fine-grained-access-control-references.md

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
(cherry picked from commit 9ac4843df1)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-02-11 18:11:28 +01:00
Ieva 3a04080972 merge (#45335) 
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-02-11 18:02:50 +01:00
Grot (@grafanabot) 16870af3e8 Docs: Update whats new in 8.4 (#45289) (#45316) 
Changed the swagger ui feature flag to the actual feature flag.

(cherry picked from commit 77a0a71929)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-02-11 09:41:55 -05:00
Grot (@grafanabot) 3af0331022 Update access_controls.md: Add global to documented query parameter for deleting custom roles. (#40167) (#45270) 
* Update access_controls.md

Update the parameter table for deleting custom roles to make it explicit that the `global` query parameter is handled by this endpoint/should be specified when deleting a globally-scoped role.

* Update docs/sources/http_api/access_control.md

Co-authored-by: Karl Persson <kalle.persson92@gmail.com>
Co-authored-by: achatterjee-grafana <aparajita.chatterjee@grafana.com>
(cherry picked from commit 1239911b5b)

Co-authored-by: Roberto Acevedo <rxacevedo@users.noreply.github.com>
 2022-02-11 08:48:16 -05:00
Grot (@grafanabot) 1edb8f0a5d Postgres/MySQL/MSSQL: Remove usage of legacy timeSrv (#45241) (#45293) 
(cherry picked from commit 0e8a5407d1)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-02-11 13:47:46 +01:00
Grot (@grafanabot) 18056a148c Alerting: support ok state in alert migration (#45264) (#45267) 
(cherry picked from commit c59567a236)

Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2022-02-11 13:39:37 +01:00
Grot (@grafanabot) a7f0fb5052 Angular: Add AngularJS plugin support deprecation plan to docs site (#45149) (#45287) 
* Angular: Add AngularJS plugin support deprecation plan to docs site

* Updated wording

* Update

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/developers/angular_deprecation.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit fed112ef3b)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2022-02-11 12:46:47 +01:00
Grot (@grafanabot) 32ce82b874 loki: add logs-volume documentation (#45283) (#45285) 
(cherry picked from commit 29d48a503c)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2022-02-11 12:20:07 +01:00
Grot (@grafanabot) 0a9406b26c loki: enable-by-default the full-range-logs-volume feature (try2) (#45246) (#45280) 
* loki: enable-by-default the full-range-logs-volume feature

* add explanation comment

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* fixed invalid code

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 4a7cc3e0f0)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2022-02-11 12:13:11 +01:00
Grot (@grafanabot) 527e5bb6f8 LibraryPanels: Prevent long descriptions and names from obscuring the delete button (#45190) (#45284) 
* fix library panel description wrapping

* make panel name wrap

(cherry picked from commit 8c47373d74)

Co-authored-by: matt abrams <37156449+zuchka@users.noreply.github.com>
 2022-02-11 12:09:47 +01:00
Grot (@grafanabot) 3e351914fd Cloudwatch: Remove unused parameters (#45237) (#45251) 
* Remove unused parameters

* Remove unused context

* Make plugin context first parameter

(cherry picked from commit 89a0c0fc37)

Co-authored-by: Shirley <4163034+fridgepoet@users.noreply.github.com>
 2022-02-11 11:20:29 +01:00
Grot (@grafanabot) f5212e4d5a Access control: team UI improvements with FGAC (#45255) (#45277) 
* show teams page for user who can't list teams but can create teams

* Fixing buttons and routes

* Small refactor

Co-authored-by: gamab <gabi.mabs@gmail.com>
(cherry picked from commit 6fb3aac2e1)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-02-11 11:09:54 +01:00
Grot (@grafanabot) 6c0652989f TablePanel: Do not prefix columns with frame name if multiple frames and override active (#45174) (#45276) 
* Fix bug where table panel shows column names prefixed with frame name

* simplify && fix tests

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
(cherry picked from commit a12f2e1d19)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
 2022-02-11 11:00:12 +01:00
Grot (@grafanabot) a5637bd2ac Fix issue with undo history in query field when suggestion inserted (#28656) (#39114) (#45272) 
(cherry picked from commit 4d0a37baed)

Co-authored-by: Alexander Kubyshkin <i.am.glint@gmail.com>
 2022-02-11 09:46:04 +01:00
Grot (@grafanabot) 162466cad4 Update geomap.md (#43527) (#45269) 
(cherry picked from commit d97e74d80f)

Co-authored-by: JJgitGit <JJgitGit@users.noreply.github.com>
 2022-02-10 17:51:03 -05:00
Grot (@grafanabot) c897372237 Thresholds: fix crash when trying to render zero-height base thresholds (#45256) (#45258) 
(cherry picked from commit 586b89f776)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-02-10 19:00:44 +01:00
Grot (@grafanabot) 843c1c71d9 Fetch: parse JSON off-main-thread (async) based on response Content-Type (#45188) (#45257) 
(cherry picked from commit 9af6202a7f)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
 2022-02-10 18:57:26 +01:00
Grot (@grafanabot) 8d60ca53c5 Access control: Support uids for resource permissions (#45226) (#45254) 
* add middleware to solve uid -> id for requests

(cherry picked from commit d2b9da9dde)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2022-02-10 18:05:15 +01:00
Grot (@grafanabot) 0aac670de0 order subscriptions by name (#45228) (#45234) 
(cherry picked from commit 57ecabf319)

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
 2022-02-10 16:14:52 +01:00
Grot (@grafanabot) 57fa05501b add the permission to read org users to team creator (#45224) (#45245) 
(cherry picked from commit 9fafbfc87e)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-02-10 15:02:16 +00:00
Grot (@grafanabot) 232fdd195a Unescape regex string (#45137) (#45244) 
(cherry picked from commit ec48b81388)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-02-10 15:57:56 +01:00
Gabriel MABILLE e6d0f5367f AccessControl: Implement SQL filters for team members filtering (#44898) (#45219) 
* AccessControl: Filter team members

* Modify GetTeamMembersByUser comment

* Fix postgres failing test due to quoting

* Rename GetTeamMembersByUser to GetUserTeamMemberships

* Update TeamStore interface

(cherry picked from commit 78fc0258b1)
 2022-02-10 15:49:02 +01:00
Grot (@grafanabot) 82fc75cacc test (#45240) (#45243) 
(cherry picked from commit fd5e968bc1)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2022-02-10 15:35:51 +01:00
Grot (@grafanabot) ef9779c4c3 Popovers: Improve contrast by darkening shadow and changing border to medium (#45136) (#45229) 
* Popovers: Improve contrast by darkening shadow and changing border to medium

* Updated sass theme

* Revert back to weak border

(cherry picked from commit 374681b546)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2022-02-10 15:14:05 +01:00
Grot (@grafanabot) bab2f84155 Logging: Fix server hangs when using log.WithSuffix (#45213) (#45223) 
Fixes a problem where server hangs if setting
GF_DATABASE_LOG_QUERIES=true.

Ref #44925

(cherry picked from commit ca311bf94f)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-02-10 13:02:47 +01:00
Grot (@grafanabot) 0ff1be7ccc Adjust menu positioning (#45217) (#45222) 
(cherry picked from commit e48baefd32)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-02-10 13:02:15 +01:00
Grot (@grafanabot) 3fda778e6d Chore: Remove menuShouldPortal deprecation warning (#45211) (#45221) 
* Chore: Remove Select deprecation

* remove unused import

* Update lockfile

(cherry picked from commit 947b8b8d3b)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-02-10 12:58:19 +01:00
Gabriel MABILLE 4c55c450c3 AccessControl: SQL filters for team search (#44557) (#45200) 
* AccessControl: SQL filters for team search

Set test config

* Remove userIdFilter when FGAC is on

(cherry picked from commit 01b88adb3a)
 2022-02-10 10:45:40 +01:00