Commit Graph
35 Commits
Author SHA1 Message Date
Dimitris Sotirakis af1691dbfb Update grabpl (#45520) 2022-02-17 14:26:38 +01:00
Dimitris Sotirakis 163b570f5d CI: Remove manual gcloud authentication (#44986)
* Remove manual gcloud auth from store-packages

* Update grabpl
2022-02-15 16:45:37 +02:00
605d056136 Security: Sync security changes on main (#45083)
* * Teams: Appropriately apply user id filter in /api/teams/:id and /api/teams/search
* Teams: Ensure that users searching for teams are only able see teams they have access to
* Teams: Require teamGuardian admin privileges to list team members
* Teams: Prevent org viewers from administering teams
* Teams: Add org_id condition to team count query
* Teams: clarify permission requirements in teams api docs
* Teams: expand scenarios for team search tests
* Teams: mock teamGuardian in tests

Co-authored-by: Dan Cech <dcech@grafana.com>

* remove duplicate WHERE statement

* Fix for CVE-2022-21702

(cherry picked from commit 202d7c190082c094bc1dc13f7fe9464746c37f9e)

* Lint and test fixes

(cherry picked from commit 3e6b67d5504abf4a1d7b8d621f04d062c048e981)

* check content type properly

(cherry picked from commit 70b4458892bf2f776302720c10d24c9ff34edd98)

* basic csrf origin check

(cherry picked from commit 3adaa5ff39832364f6390881fb5b42ad47df92e1)

* compare origin to host

(cherry picked from commit 5443892699e8ed42836bb2b9a44744ff3e970f42)

* simplify url parsing

(cherry picked from commit b2ffbc9513fed75468628370a48b929d30af2b1d)

* check csrf for GET requests, only compare origin

(cherry picked from commit 8b81dc12d8f8a1f07852809c5b4d44f0f0b1d709)

* parse content type properly

(cherry picked from commit 16f76f4902e6f2188bea9606c68b551af186bdc0)

* mentioned get in the comment

(cherry picked from commit a7e61811ef8ae558ce721e2e3fed04ce7a5a5345)

* add content-type: application/json to test HTTP requests

* fix pluginproxy test

* Fix linter when comparing errors

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dan Cech <dcech@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
Co-authored-by: Vardan Torosyan <vardants@gmail.com>
2022-02-09 13:44:38 +01:00
Dimitris Sotirakis b2a8487684 Update changelog for 8.3.5 and 7.5.15 (#45078) 2022-02-08 15:52:53 +01:00
Dimitris Sotirakis 5543ad883d CI: Remove grafana/drone-grafana-docker image (#44983)
* Remove grafana/drone-grafana-docker image

* Rename step

* Remove manual gcloud authentication

(cherry picked from commit 329b1a1ef3903c7e2c3ec1f286f9b0f00fcd023e)

* Add publish command for main

* Fix TAG variable parsing

* Remove shouldSave from main builds

* Reorder dependencies

* Update grabpl version
2022-02-07 18:30:41 +01:00
Dimitris Sotirakis 67225d9cfc Update upload-cdn command args (#44966) 2022-02-07 10:56:05 +01:00
Dimitris Sotirakis f96a6c10c5 CI: Update GCP_GRAFANA_UPLOAD_KEY var name (#44303)
* Update GCP_KEY var name

* Rename GCP_GRAFANA_UPLOAD_KEY for upload-packages

* Update grabpl
2022-02-07 10:11:27 +01:00
dsotirakis a3f6982476 Merge test a11y steps on starlark files 2021-11-10 14:35:03 +02:00
dsotirakis 778c860b3c Revert: Remove FocusConvey check 2021-11-01 20:07:28 +02:00
dsotirakis 96541cf8d6 Remove FocusConvey check 2021-11-01 20:02:02 +02:00
Dimitris SotirakisandMarcus Efraimsson 258578766b Alerting: Add checks for non supported units - disable defaulting to seconds (#32477)
* Add error handling for unknown units

* Fix test cases

* Add case for empty string

* Changed tests from convey to testify

* Fix lints

* Move regex vars

* Add regex as ng-patterns on alert_tab.html

* Update public/app/features/alerting/partials/alert_tab.html

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Update public/app/features/alerting/partials/alert_tab.html

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Make zero and empty string not throw errors

* Updated validation error comments

* Frequency should allow zero or empty strings

* use checkFrequency instead of ng-pattern

checkFrequency is not triggered if ng-pattern is defined.

* Extract getForValue func - add tests

* Fix linting

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-04-12 15:53:51 +03:00
Dimitris SotirakisandMarcus Efraimsson b867ceda9b Generic OAuth: Prevent adding duplicated users (#32286)
* Add special check for generic oauth case

* Converted from Convey to testify

* Fix according to reviewer's comments

* More changes according to reviewer's comments

* Handle error if user is not found

* Move generic oauth test from user_test.go to user_auth_test.go

* Update pkg/services/sqlstore/user_auth_test.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Created genericOAuthModule const

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-04-09 13:28:35 +02:00
Dimitris Sotirakis 71a8579412 Fix broken gtime tests (#32582) 2021-04-01 09:14:06 +02:00
Dimitris SotirakisandArve Knudsen d42bfedd9e Add ability to override config variables with env variables (#32554)
* Add ability to override config variables with env variables

* Inline checkForOverrides

* Update pkg/plugins/backendplugin/manager/plugin_settings.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2021-03-31 18:51:16 +02:00
Dimitris Sotirakis 270a255c08 Add dash / and at @ signs escapes in regex (#32495) 2021-03-30 15:56:15 +03:00
Dimitris Sotirakis 814db3d28e Chore: Change from double to single quotes (#32430) 2021-03-29 17:40:26 +03:00
Dimitris Sotirakis f15882f507 Update logger message to be more generic (#32403) 2021-03-29 11:45:03 +03:00
Dimitris Sotirakis 2a5279911f Add legend name to dataframes config (#32356) 2021-03-26 16:20:46 +02:00
Dimitris Sotirakis 95de48261b Chore: Move away from convey - introduce testify (#32295)
* Generic OAuth: Prevent adding duplicated users

* Chore: Move away from convey - introduce testify

* Revert commits from another branch

* Fix formatting
2021-03-24 17:32:16 +01:00
Dimitris Sotirakis fdaac2b8fb Notifications: InfluxDB - Fix regex to include metrics with hyphen in aliases (#32224)
* Notifications: InfluxDB - fix regex to include metrics with hyphen

* Add hyphen check in tests
2021-03-23 13:14:21 +02:00
Dimitris Sotirakis ffd924fc28 Chore: Modify observability-squad code ownership (#32242)
* Chore: Add observability-squad as code owners on InfluxDB backend code

* Add more packages to observability-squad ownership
2021-03-23 10:49:29 +01:00
Dimitris Sotirakis 2d72b4e69e Prometheus: Convert Prometheus query response to dataframes (#31948)
* Convert Prometheus query response to dataframes

* Add parseResponse tests

* Fixed lint imports

* Force use UTC as timezone in timeVector

* Updated test to check timezone
2021-03-18 08:40:26 +02:00
Dimitris Sotirakis 3a841ebe00 Downgrade to node:14.16.0-alpine3.13 (#32065) 2021-03-17 17:07:39 +02:00
Dimitris Sotirakis f917c2ab0f Bug: Update react-use-measure dependency to fix docker-build-full f… (#31802)
* Bug: Update `react-use-measure` dependency to fix docker-build-full failure

* Add #remove-cjs-export to point to the correct branch

* Add git package - update js-builder version
2021-03-12 12:28:54 +02:00
Dimitris Sotirakis d59574ec1e Update scripts and Dockerfiles to use Go 1.16.1 (#31881)
* Update scripts and Dockerfiles to use Go 1.16.1

* Update build-container image version to 1.4.1

* Update node version to 14.16.0-1nodesource1

* Updated drone configuration
2021-03-11 12:55:04 +02:00
Dimitris Sotirakis 57f3de74c6 Chore: Update testing field in latest.json to 7.5.0-beta1 (#31689) 2021-03-04 16:45:51 +01:00
Dimitris Sotirakis 31887c6bda Docs: Add 7.5.0-beta1 release notes link (#31687) 2021-03-04 15:53:14 +01:00
Dimitris Sotirakis a1e227638c Fix whatsNewUrl version to 7.5 (#31667)
* Fix whatsNewUrl version

* Update package.json
2021-03-04 11:08:52 +01:00
Dimitris Sotirakis 08f500ed06 Remove pkill gpg-agent (#31169) 2021-03-03 17:28:47 +02:00
Dimitris Sotirakis 554055e39d Convert annotations to dataframes (#31400)
* Stop using transformation to tables

* Update datasource.ts to parse from dataframes

* Add test on transformToDataframe func

* Remove parseResponse and do the work inside parseToAnnotations method

* Name the dataframe after the RefID

* Small fix when mapping to annotation

* Add tests in annotation_query_test.go class

* Small fix in loop iteration

* Change for loop signature
2021-02-25 18:29:17 +02:00
Dimitris Sotirakis c86eeae132 Remove tidy-check script (#31423)
* Remove tidy-check script

* Update grabpl version to 0.5.43
2021-02-23 17:53:30 +02:00
Dimitris Sotirakis 19ab83d6ed Update grabpl from 0.5.38 to 0.5.42 version (#31419)
* Update grabpl from 0.5.41 to 0.5.42 version
2021-02-23 16:28:39 +02:00
Dimitris Sotirakis d1cee1ad02 Add --tries 3 arg when triggering e2e-tests upon releasing (#31285)
* Add ``--tries 3` arg when triggering e2e-tests

* Make e2e-tests retry 3 times only for release pipelines
2021-02-18 10:16:49 +02:00
Dimitris Sotirakis d1937408bd Replace PR with Commit truncated hash when build fails (#31177)
* Replace PR with Commit truncated hash when build fails

* Make commit literal lower case
2021-02-12 18:36:15 +02:00
Dimitris Sotirakis a18e4d8d64 Add author name and pr number in drone pipeline notifications (#31124)
* Add author name and pr number in drone pipeline notifications
2021-02-11 17:18:13 +02:00