Commit Graph

32324 Commits

Author SHA1 Message Date
Hugo Häggmark
df22828d7d
TextPanel: Fix suggestions for existing panels (#42195)
Closes #42118

Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Josh Hunt <josh@trtr.co>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
2021-11-24 11:20:36 +01:00
Dimitris Sotirakis
db122e9b2c
CI: Run e2e tests in parallel using multiple suites (#41748)
* Split suite1 to multiple e2e test suites

* Update drone yaml

* Add missing arg

* Extract cypress install step

* Change image on e2e tests step

* Sync with main

* Add cypress cache volume

* Try with grafana/ci-e2e:12.19.0-1 image

* Update grabpl version to 2.7.2

* Revert a11y failure back to 'always'
2021-11-24 11:20:11 +01:00
Leonard Gram
d624230b5d
Packaging: removes an unused dependency (#42071)
* Packaging: removes an unused dependency

libfontconfig1 was used by phantomjs but we aren't using phantomjs
anymore

* Packaging: removes further libfontconfig1 references
2021-11-24 10:45:29 +01:00
Gabriel MABILLE
a93e649af5
AccessControl: Document orgs roles and orgs endpoints (#42171)
* AccessControl: Document `orgs` roles and `orgs` endpoints

* Use maintainer instead of manager
2021-11-24 10:08:55 +01:00
Gabriel MABILLE
eea0e6a6c0
AccessControl: Renamed orgs roles, removed fixed:orgs:reader introduced in beta1 (#42049)
* AccessControl: Rework Orgs roles

* Increase version for name migration

* Update pkg/api/roles.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Use maintainer instead of manager

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2021-11-24 10:08:42 +01:00
Alexander Emelin
7b95c86821
up plugin sdk to v0.118.0 (#42167) 2021-11-24 12:03:19 +03:00
Eric Leijonmarck
9c11040c3e
Serviceaccounts: Filtering service accounts from user queries (#41410)
* Add extra fields to OSS types to support enterprise

* WIP service accounts

* Update public/app/features/api-keys/ApiKeysForm.tsx

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* Create a service account at the same time as the API key

* Use service account credentials when accessing API with APIkey

* Throw better error

* Use Boolean for "create service account button"

* Add GetRole to service, merge RoleDTO and Role structs

This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons:

1.  Makes switching between OSS and Enterprise easier
2.  Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise

* Start work cloning permissions onto service account

* If API key is not linked to a service account, continue login as usual

* Fallback to old auth if no service account linked to key

* Commented

* Add CloneUserToServiceAccount

* Update mock.go

* Put graphical bits behind a feature toggle

* Start adding LinkAPIKeyToServiceAccount

* Update pkg/models/user.go

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>

* Update pkg/api/apikey.go

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>

* Update pkg/api/apikey.go

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>

* Finish LinkAPIKeyToServiceAccount

* Update comment

* Handle api key link error

* Update pkg/services/sqlstore/apikey.go

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Feature toggle

* Update pkg/services/accesscontrol/accesscontrol.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

* Not needed (yet)

* Better error messages for OSS accesscontrol

* Set an invalid user id as default

* ServiceAccountId should be string

* Re-arrange field names

* ServiceAccountId is integer

* Update ossaccesscontrol.go

* Linter

* Remove fronend edits

* Remove console log

* Update ApiKeysForm.tsx

* feat: add serviceaccount deletion

* feat: make sure we do not accidently delete serviceaccount

* feat: ServiceAccount Type

* refactor: userDeletions function

* refactor: serviceaccount deletions\

* refactor: error name and removed attribute for userDeletecommand

* refactor:: remove serviceaccount type for now

* WIP

* add mocked function

* Remove unnecessary db query, move to right place

* Update pkg/services/accesscontrol/mock/mock.go

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

* Update pkg/services/accesscontrol/mock/mock.go

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

* Update pkg/services/accesscontrol/mock/mock.go

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

* Better error messages

* Better and correcter error messages

* add mocked function

* refactor: move function call, add error msg

* add IsServiceAccount and fix table

* add service accounts package

* WIP

* WIP

* working serviceaccountsapi registration

* WIP tests

* test

* test working

* test running for service

* moved the error out of the models package

* fixed own review

* linting errors

* Update pkg/services/serviceaccounts/database/database.go

Co-authored-by: Jeremy Price <Jeremy.price@grafana.com>

* tests running for api

* WIP

* WIP

* removed unused secrets background svc

* removed background svc for serviceaccount infavor or wire.go

* serviceaccounts manager tests

* wip

* Filtering service accounts from the user queries in frontend

* clean up

* Update pkg/services/sqlstore/org_test.go

* methods on same type should have same receiver

* _ unused variable and comment

* add additional join for results query

* remove unused code

* remove error fmt

* refactor: change to only have false

* no new variable to the left hand side

* refactor: create serviceaccount cmd

* dialect fix

Co-authored-by: Jeremy Price <jeremy.price@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2021-11-23 23:06:40 +00:00
Tania B
3af36b7e23
Encryption: Add settings to ini files (#42057)
* Encryption: Add settings to ini files

* Rename a setting
2021-11-23 20:29:35 +02:00
gotjosh
a5b29aed29
Alerting: Document Alertmanager/Prometheus versions we support (#42160)
* Alerting: Document Prometheus/Alertmanagers versions we support

* Illustrate with an example
2021-11-23 18:41:48 +01:00
Agnès Toulet
934e4ad3af
Docs: update auditing documentation with new logs (#41722)
* Add detailed info on audit log contents

* Apply suggestions from code review

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Docs: update auditing documentation with new logs

* add back remove datasource permission

* improve formatting

* fix incorrect action

* clean formatting

* formatting

Co-authored-by: Jesse Weaver <jesse.weaver@grafana.com>
Co-authored-by: Jesse Weaver <pianohacker@gmail.com>
2021-11-23 18:13:00 +01:00
Ashley Harrison
993025c478
Update .pa11yci-pr.conf.js (#42148) 2021-11-23 16:43:37 +00:00
nikki-kiga
92e1883845
Geomap: Add rotation option for markers layer (#41992)
* add rotation option for markers layer

* add ScalerDimensionEditor
2021-11-23 08:23:43 -08:00
Will Browne
0921037f32
Plugins: Move logs from globals to fields (#42141)
* move logs from globals to fields

* fix test
2021-11-23 17:09:52 +01:00
renovate[bot]
0ab4afa2b7
Update sentry-javascript monorepo to v6 (#41991)
* Update sentry-javascript monorepo to v6

* Pass fetch implementation to FetchTransport and stub in unit tests

* kick drone

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2021-11-23 15:59:32 +00:00
Will Browne
96b1776856
Chore: Fix pass context for SetAlertStateCommand (#42135)
* fix pass ctx for SetAlertStateCommand

* fix integration test
2021-11-23 16:40:09 +01:00
Jean-Philippe Quéméner
cec2d965ec
Alerting: validate mute timings in the alertmanager configuration (#42125)
* Alerting: check for uniqueness of mutetime names

* add some testing

* add name validation

* add root route validation

* add tests for validation

* add check for root route mute_time_intervals

* add duplicate test

* remove useless yaml test

* refactor table test
2021-11-23 16:25:20 +01:00
Gilles De Mey
3e16abc939
Timeseries Panel: render threshold at either top or bottom of graph when it is out… (#41649) 2021-11-23 16:18:07 +01:00
Ashley Harrison
20e1457a78
Select: use findBy and make these tests async to avoid act() errors (#42134) 2021-11-23 14:53:10 +00:00
Dominik Prokop
d2d38c978f
grafana/ui: Export types and utils required by grafana/experimental (#42133)
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
2021-11-23 15:41:51 +01:00
Jack Westbrook
694600ed04
Catalog: Provide default tab fallback in Plugin Details page (#41979)
* feat(catalog): introduce defaultTab to usePluginDetailsTabs hook

* feat(catalog): use defaultTab as fallback tab for PluginDetails

* chore(catalog): remove hardcoded page query param in list items

* refactor(catalog): prefer let over react ref when setting default tab in PluginDetails

* refactor(catalog): pass pageId to plugin details body rather than duplicate logic

* test(catalog): remove query param from List item test hrefs

* test(catalog): introduce a test for default app config page for installed app plugins
2021-11-23 15:38:08 +01:00
Ivana Huckova
aefb2659ec
Tracing: Show start time of trace with milliseconds precision (#42132)
* Tracing header: Add setting to show start time with ms

* Add test

* Update test
2021-11-23 15:28:18 +01:00
Gilles De Mey
ca7a62682e
fix: use better type assertion for initialAsyncRequestState (#42087) 2021-11-23 15:14:59 +01:00
Stephanie Closson
8b95746f63
Jaeger: Make tags templateable (#42005)
* make tags templateable

* cleanup files I didn't want to modify
2021-11-23 10:02:07 -04:00
kay delaney
e3ef82203e
CodeEditor: Prevent suggestions from being clipped (#42120)
Closes #40792

Co-authored-by: Josh Hunt <josh@trtr.co>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
2021-11-23 12:18:17 +00:00
Victor Marin
410044fa05
annotations editor menu should not appear if annotations are disabled (#42068) 2021-11-23 14:16:11 +02:00
renovate[bot]
035e676cad
Update dependency react-select to v5 (#41604)
* Update dependency react-select to v5

* Remove @types/react-select and update types accordingly

* Fix all unit tests

* Add @ts-expect-error to individual errors, remove prefix as it doesn't seem to exist?

* Another minor typescript fix

* Apply fixes from torkel's PR

* Fix last typescript error

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2021-11-23 12:11:26 +00:00
Marcus Efraimsson
6b79393ccc
Chore: Split nightly docker image scan into separate pipelines (#42097)
Split the nightly Docker scan job into separate pipelines, one for each 
image, to easier understand which images fails/includes high/critical 
vulnerabilities.
2021-11-23 11:43:00 +01:00
Jack Westbrook
8b3725b9f2
Chore: Bump versions to 8.4.0-pre (#42116) 2021-11-23 11:23:02 +01:00
Zoltán Bedi
271a941a29
Update latest.json (#42115) 2021-11-23 11:10:57 +01:00
Piotr Jamróz
4db4dc2ce9
Loki: Pass log volume hint as a request header (#42108) 2021-11-23 11:08:37 +01:00
Grot (@grafanabot)
f186575693
ReleaseNotes: Updated changelog and release notes for 8.3.0-beta1 (#42044) 2021-11-23 11:05:27 +01:00
Dimitris Sotirakis
e3bb53b64d
CI: Remove Linux grabpl step dependency from Windows builds (#42069)
* Remove Linux grabpl download step from Windows oss builds

* Remove Linux grabpl download step from Windows enterprise builds
2021-11-23 09:57:16 +01:00
Ivana Huckova
d7e4f303c4
Logs: Fix requesting of older logs when flipped order (#41966)
* Logs: Fix requesting of older logs wehn flipped order

* Fix index change when requesting logs
2021-11-23 09:56:06 +01:00
achatterjee-grafana
c4b21f7b51
Removed packahes_api relrefs. (#42017) 2021-11-22 16:58:51 -05:00
renovate[bot]
68ce617f07
Ignore react-icons bump for now (#41537)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2021-11-22 17:32:31 +00:00
idafurjes
5ac1dc1008
Bump grabpl version to 2.7.1 (#42089) 2021-11-22 17:37:51 +01:00
Alexander Zobnin
da2c99a2e1
Access control: use delegatable flag to check if role can be granted (#42070)
* Access control: use delegatable flag to check if role can be granted or not

* Fix naming
2021-11-22 17:44:03 +03:00
Giordano Ricci
e7e5c54148
Elasticsearch: Display custom values in version select (#42051)
* Elasticsearch: Display custom values in version select

* Update public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.tsx

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
2021-11-22 15:14:11 +01:00
Petros Kolyvas
3340d7ad44
Docs: Whats new 8.3 - Preliminary (#41930)
* Initial placeholder docs for candlestick panel

* Initial What's new for 8.3

* Delete candlestick.md

Removing this file as it's part of another branch/pr

* Oops forgot to hit save in VSCODE. Rookie mistake
2021-11-22 14:46:57 +01:00
Alexander Zobnin
6f8cfc6def
Role picker: extend width to prevent menu being out of page (#42047) 2021-11-22 16:30:24 +03:00
Gábor Farkas
037fd9cc8c
Loki: alerting: adjust step-calculation to be the same as in frontend (#42033)
* loki: alerting: adjust step-calculation to be the same as in frontend

* loki: simplified test

* lint fix
2021-11-22 14:28:51 +01:00
renovate[bot]
d11ae6dc3f
Update dependency @types/react-dom to v17 (#42045)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-22 13:24:40 +00:00
renovate[bot]
2f0f45e7aa
Update typescript-eslint monorepo to v5 (#42046)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-22 13:57:19 +01:00
Ivana Huckova
d4ddd2373b
Tracing: Fix incorrect indentations due to reoccurring spanIDs (#41919)
* Create unique keys for trace rows

* Add tests

* Fix tests

* Update public/app/features/explore/TraceView/TraceView.test.tsx

* Trigger Build
2021-11-22 13:18:50 +01:00
kay delaney
47a7477cff
A11y/DashList: Make star button tab-navigable (#41479) 2021-11-22 13:03:50 +01:00
George Robinson
9122e7f647
Alerting: Check for nil model.Settings and models.SecureSettings (#37738) 2021-11-22 11:56:18 +00:00
Dimitris Sotirakis
4b2c90b834
Add deployment_tools_config.json to git and eslint ignore (#42053)
(cherry picked from commit 15a603dae0)
2021-11-22 12:36:21 +01:00
Ivana Huckova
9efd85a241
Tracing: Make query editors available in dashboard for Tempo and Zipkin (#41974)
* Tempo: Set query editor

* Zipkin: Set query editor

* Set metrics to true so the data source as shown in dashboard data source list
2021-11-22 12:07:38 +01:00
Ashley Harrison
b6b75e919b
Select: Select menus now properly scroll during keyboard navigation (#41917)
* Select: Select menus now properly scroll when navigating with the keyboard

* Remove this unnecessary children declaration in the interface

* Guard this with an if statement to avoid the nullish coalescing

* Don't need the optional chaining if we're guarding with an if
2021-11-22 10:57:44 +00:00
renovate[bot]
f97b7858b4
Update dependency @types/react to v17 (#42035)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-22 11:27:33 +01:00