public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
11072 Commits
Author SHA1 Message Date
Andrej Ocenas 00ffe1a4fd TraceView: Allow span links defined on dataFrame (#40563) 
* Align range to seconds in log queries

* Use default display processor if there is none in FieldDisplayProxy

* Allow links defined in dataframe

* Remove debug log

* Fix typings for span links

* Lint go

* Fix tests

* Update tests

* Add test for the display proxy

* Streamline the fallback for diplayProcessor
 2021-10-27 18:40:40 +02:00
Serge Zaitsev 995afa2221 Chore: Refactor GoConvey in auth package (#40850) 
* refactor goconvey in auth package

* make linter happy
 2021-10-27 16:08:21 +02:00
Selene 37cbed4b48 Rendering: Check if default image exists to avoid breaking reports if it's moved (#40930) 2021-10-27 16:08:03 +02:00
Will Browne 67449b95e9 dispatch with context where missing (#40810) 2021-10-27 15:57:06 +02:00
Serge Zaitsev 690849cfd6 Chore: Refactor GoConvey in services dashboards package (#40895) 2021-10-27 08:17:50 -05:00
Serge Zaitsev 00da702970 Chore: Refactor GoConvey in the guardian package (#40898) 2021-10-27 07:45:20 -05:00
Gabriel MABILLEKarl PerssonIeva
 		f6a9132975 AccessControl: Add FGAC to orgs endpoints (#39579) 
* AccessControl: Add FGAC to orgs endpoints

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2021-10-27 13:13:59 +02:00
Serge Zaitsev 35432b1183 Chore: Refactor GoConvey in tsdb package (#40847) 2021-10-27 11:56:34 +02:00
Gabriel MABILLEEmil TullstedtUrsula Kallio
 		a127e106db AccessControl: Create FGAC roles for orgs (#40526) 
* AccessControl: Create FGAC roles for orgs

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2021-10-27 11:01:21 +02:00
Serge Zaitsev 24a74cd06e Chore: Refactor GoConvey tests in alerting/conditions (#40843) 
* refactor goconvery tests

* use more meaningful assertion

* use more meaningful assertions
 2021-10-26 23:24:58 +02:00
SkyegotjoshMarcus Efraimsson
 		bce1011361 Alerting: Option for Discord notifier to use webhook name (#40463) 
* Added an option to discord notifier to use discord's webhook name (useful for customizing notifications).

* Support ngalert system with discord username toggle

* Added ngalert discord test

* Apply suggestions from code review

Co-authored-by: gotjosh <josue.abreu@gmail.com>

* Docs updated with discord username setting

* Fix api integration test

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2021-10-26 14:55:10 -04:00
Yuriy Tseretyan 6709359148 Alerting: Tests for rule evaluation routine (#40646) 
* add fake stores to record queries
 2021-10-26 13:22:07 -04:00
Serge Zaitsev 125e284da2 Chore: Refactor GoConvey in notification service package (#40897) 
* refactor goconvey in notification service package

* avoid return after t.skip
 2021-10-26 18:08:04 +02:00
Serge Zaitsevandying-jeanne 1f1162f1d8 Chore: Refactor GoConvey in teamguardian package (#40896) 
* refactor goconvey in teamguardian package

* use proper order of parameters in equality assertion

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
 2021-10-26 17:59:37 +02:00
ying-jeanne 681218275e remove crit and trace (#40320) 2021-10-26 17:36:24 +02:00
Isabella Siu 8ee3afa4c3 CloudMonitoring: switch from ApplyRoute to AuthMiddleware (#40787) 2021-10-26 10:17:12 -04:00
Ivana Huckova 92cd44940a Prometheus: Refactor backend for scalability for other query types (#40921) 
* Prometheus: Refactor backend for scalability for other query types

* Fix linting
 2021-10-26 14:47:40 +02:00
Serge Zaitsev 22b428836e Chore: Refactor GoConvey in setting package (#40861) 2021-10-26 13:19:07 +02:00
Serge Zaitsev 16046f6d43 Chore: Refactor GoConvey tests in mssql package (#40859) 2021-10-26 13:18:43 +02:00
Serge Zaitsev 249856e527 Chore: Refactor GoConvey in mysql package tests (#40855) 2021-10-26 13:18:17 +02:00
Serge Zaitsev a45861298f Chore: Refactor GoConvey in tsdb/es/client (#40846) 2021-10-26 13:15:47 +02:00
Serge Zaitsev 5409c88fb8 Chore: Refactor GoConvey in alerting tests (#40845) 2021-10-26 13:15:09 +02:00
Serge Zaitsev a97e4d28a4 Chore: Refactor GoConvey in azuremonitor package (#40878) 2021-10-25 17:08:24 +02:00
Jean-Philippe Quéméner d1aefa1792 Alerting: fix ngalert alertmanager SQL Syntax Errors (#40827) 
* test kvstore in intregration tests with different databases

* escape 'key' in delete query

* export quote and use it in kvstore
 2021-10-25 11:53:41 +02:00
Marcus Efraimsson 889d4683a1 Datasources: Set response size metric based on actual bytes read (#40303) 
Fixes #33372
 2021-10-25 11:49:49 +02:00
Ryan McKinley 4680a8454f Live: add rule for datasource (#40738) 2021-10-22 08:56:16 -07:00
SantiagoandArmand Grillet 1095f69740 Fix slack contact point panic (code review changes) (#40770) 
* panic when unexpected Slack response fixed, tests added

* fix linting errors, add test

* Code review changes

* Apply PR comments

Co-authored-by: Armand Grillet <armand.grillet@outlook.com>
 2021-10-22 17:23:22 +02:00
Igor Suleymanov 3f5dcbfdb5 Refactor Prometheus response handling and reduce allocations (#40765) 
Signed-off-by: Igor Suleymanov <igor.suleymanov@grafana.com>
 2021-10-22 12:34:21 +02:00
gotjosh 74fb491b6a Alerting: Validate contact point configuration during migration to Unified Alerting (#40717) 
* Alerting: Validate contact point configuration during the migration

This minimises the chances of generating broken configuration as part of the migration. Originally, we wanted to generate it and not produce a hard stop in Grafana but this strategy has the chance to avoid delivering notifications for our users.

We now think it's better to hard stop the migration and let the user take care of resolving the configuration manually.
 2021-10-22 10:11:06 +01:00
Hugo Häggmark c70cfe9125 LibraryElements: fixes flaky tests (#40791) 2021-10-22 09:19:25 +02:00
Yuriy Tseretyan a5501b7845 escape reserved word (#40788) 2021-10-22 08:58:01 +02:00
Isabella Siu 97df4a57f4 GoogleCloudMonitoring: use grafana-google-sdk-go for auth (#40490) 2021-10-21 16:29:56 -04:00
Serge Zaitsev 76e30c5e97 Chore: Refactor alerting notifier tests to remove goconvey (#40758) 2021-10-21 17:04:43 +02:00
Karl PerssonGabriel MABILLEMitch Seaman
 		740444680c Access Control: Add fgac to datasource query endpoints (#40294) 
* Protect datasource tsdb and proxy endpoints with access control

* Add datasource query permissions to fixed admin role

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
 2021-10-21 15:41:40 +02:00
Ivana HuckovaandRyan McKinley ba90b57b66 Prometheus: Transform NaN values from matrix response to null on backend (#40757) 
* avoid duplicate allocations

* set labels

* Replace NaN in matrix with null

* Refactor and add test

* Update test

* Append response only if no error

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-10-21 15:01:14 +02:00
George Robinson 967721068e Alerting: Support custom annotations and labels when testing contact points 
Support custom annotations and labels when testing contact points
 2021-10-21 13:47:06 +01:00
Serge Zaitsev 2f0fe16759 Chore: Remove GoConvey from sqlstore package (#40753) 
* refactor login attempt test

* refactor tags saving test

* refactor transaction tests

* refactor temporary user tests

* refactor dashboard version tests

* refactor dashboard provisioning tests

* refactor alert notification test

* refactor alert tests

* refactor acl tests
 2021-10-21 14:09:19 +02:00
Sofia Papagiannaki 2c28aea654 Hide Grafana 8 alerts for disabled org (#40687) 2021-10-21 11:04:41 +03:00
Santiago e54fe220e5 Fix panic when Slack API sends unexpected response (#40721) 
* panic when unexpected Slack response fixed, tests added

* fix linting errors, add test
 2021-10-21 08:12:15 +02:00
Gabriel MABILLE 6a3ce8bd38 AccessControl: tidy scope resolution (#40677) 
* AccessControl: tidy scope resolution
 2021-10-20 17:11:22 +02:00
Ivana Huckova 3718494b35 Prometheus: Send errors from backend in response (#40674) 
* Prometheus: Send errors in response

* Remove debugging placeholder

* Add debugging logs
 2021-10-20 16:50:34 +02:00
Serge Zaitsev e47d7532e5 Chore: Goconvey migration for cleanup package (#40547) 2021-10-20 21:14:48 +08:00
Serge Zaitsev 7bad00118a Chore: Replace goconvey in multildap package (#40681) 2021-10-20 15:07:37 +02:00
Jeremy PriceHugo HäggmarkEric LeijonmarckEmil TullstedtIevaGabriel MABILLE
 		6dbb6408d4 Access Control: Add service accounts (#38994) 
* Add extra fields to OSS types to support enterprise

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

* Use service account credentials when accessing API with APIkey

* 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

* 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

* Add CloneUserToServiceAccount

* Adding LinkAPIKeyToServiceAccount

* Handle api key link error

* Better error messages for OSS accesscontrol

* Set an invalid user id as default

* Re-arrange field names

* ServiceAccountId is integer

* Better error messages

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.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-10-20 14:36:11 +02:00
Yuriy Tseretyan 36e12e2b26 Remove flakiness of google chat tests (#40592) 2021-10-19 16:18:44 -04:00
Ivana Huckova 6ec2c54c5b Interval: Use gtime for parsing of time string to duration (#40624) 2021-10-19 14:56:57 +02:00
Gabriel MABILLE fbc6febb0e AccessControl: keyword scope resolution (#40229) 2021-10-19 14:40:21 +02:00
An f4e78ea27b Live: Test Converter tab (#40536) 2021-10-19 09:50:17 +02:00
Kevin Minehart 9c2d70ce0f Packaging: Dependency updates (#40534) 
* update loki

* install openssl from alpine's edge repository

* extracttraceid moved to tracing package

* remove exit if warning limit is exceeded

* disable flaky libraryelements test
 2021-10-18 19:50:10 +02:00
Will Browne e4297006f6 Chore: Propagate context for data source provisioning (#40235) 
* context all the things

* apply feedback

* rollback some alerting changes

* rollback some alerting changes #2

* more rollbacks

* more rollbacks #2

* more rollbacks #3

* more rollbacks #4

* fix integration test

* add missing context

* add missing and remove incorrect dispatch
 2021-10-18 17:06:19 +02:00