public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,607 Commits 655 Branches 650 Tags
bddcefe5170b853b283788f3f736c1acd138b032
Commit Graph
76 Commits
Author SHA1 Message Date
IevaKarl PerssondsotirakisjguerGrotGeorge RobinsonKevin MinehartDimitris Sotirakis
 		b8eb142e85 Security: Fixes for CVE-2022-31107 and CVE-2022-31097 (#52236) 
* Fix XSS in runbook URL (#383)

* "Release: Updated versions in package to 8.3.8" (#385)

* Fix: Choose Lookup params per auth module v8.3.x (#401)

* Fix: Choose Lookup params per auth module

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Use only login for lookup in LDAP

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: use user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

fix remaining test

fix nit picks

* update lock

* fix integration tests

* [v8.3.x] Merge 'release-8.3.9` branch (#404)

* Fix: Choose Lookup params per auth module

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Prefer pointer to struct in lookup

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: Use only login for lookup in LDAP

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

Fix: use user email for ldap

Co-authored-by: Karl Persson <kalle.persson@grafana.com>

fix remaining test

fix nit picks

(cherry picked from commit 09ca54d4665583b5648fea5726a19e0b58df4ec0)

* fix integration tests

(cherry picked from commit 16c3077bb39f41acacbef4b13c65c7c907c54de7)

* Release: Bump version to 8.3.9 (#403)

* Change bump-version.yml

* "Release: Updated versions in package to 8.3.9"

Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>

* Update yarn.lock

Co-authored-by: jguer <joao.guerreiro@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>

* "Release: Updated versions in package to 8.3.10" (#409)

* Update grabpl

* update grabpl

* CI: Update `grabpl` version - remove `--no-pull-enterprise` flag (#47013)

* Update grabpl version

* Sign drone

* Remove --no-pull-enterprise flag

* Sign drone

* Update grabpl

* update drone, cherry-pick some ci updates

* update PR pipeline

Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
 2022-07-15 15:23:55 +00:00
Dimitris Sotirakis be27409c4c [v8.3.x] CI: Sync CI changes (#46085) 
* CI: Introduce `build-frontend-packages` step (#45824)

* Split frontend build

* Fix command name

* Update grabpl

(cherry picked from commit 2f6c827f5d)

* CI: Add docs pipeline for `main` pipelines (#45740)

* Add docs pipeline for main

* Extract trigger docs

* Change trigger for main

(cherry picked from commit ea3e41ea62)

* CI: Add more checks to standalone docs pipeline (#46449)

* Add build frontend package step

* Reorder dependencies

* Add codespell and prettier checks

(cherry picked from commit 82b436afee)

* Update golang (#46458)

(cherry picked from commit a29159f362)
 2022-04-05 12:54:48 +03:00
Dimitris Sotirakis 6e75734bd5 DockerHub: Use grafana(-oss)-image-tags to push to grafana(-oss)-dev DockerHub repo (#45708) (#45711) 
* Revert back changes - changes are done on grabpl

* Sync drone

(cherry picked from commit 3db331402d)
 2022-02-28 12:25:46 +02:00
Dimitris Sotirakis b688a9dede CI: Introduce docs pipeline (#45454) (#45670) 2022-02-21 16:50:16 +02:00
Dimitris Sotirakis b48b55dc14 Update grabpl (#45520) (#45526) 
(cherry picked from commit af1691dbfb)
 2022-02-18 11:51:40 +02:00
Dimitris Sotirakis 3bcf3f50b7 CI: Remove manual gcloud authentication (#44986) (#45445) 
* Remove manual gcloud auth from store-packages

* Update grabpl

(cherry picked from commit 163b570f5d)
 2022-02-16 09:54:30 +01:00
Dimitris Sotirakis 2adf2a1584 [v8.3.x] Bug: Update upload-cdn command args (#44979) 
* CI: Update `GCP_GRAFANA_UPLOAD_KEY` var name (#44303)

* Update GCP_KEY var name

* Rename GCP_GRAFANA_UPLOAD_KEY for upload-packages

* Update grabpl

(cherry picked from commit f96a6c10c5)

* Update upload-cdn command args (#44966)

(cherry picked from commit 67225d9cfc)
 2022-02-15 12:07:07 +00:00
Dimitris Sotirakis 027e345231 CI: Remove grafana/drone-grafana-docker image (#44983) (#45091) 
* 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

(cherry picked from commit 5543ad883d)

* Sign drone
 2022-02-15 12:04:12 +02:00
malcolmholmes 85edf78a46 Build: only specify github-token when needed (#45326) (#45329) 
(cherry picked from commit 9a7438c720)
 2022-02-11 16:25:31 +00:00
Carl Bergquistandmalcolmholmes 588dc422ab make drone (#45318) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
 2022-02-11 15:59:08 +01:00
Dimitris Sotirakis 2c033a6540 CI: Make e2e tests depend on binary builds (#44647) (#44833) 
* Make e2e test depend on binary builds

* Search for binary in the correct folders

* Remove package file var

* Add ARCH var

(cherry picked from commit 7bb5a5b318)
 2022-02-04 10:08:19 +02:00
Dimitris Sotirakis e80194610c Update grabpl version (#44410) (#44412) 
(cherry picked from commit ef35cb5318)
 2022-01-25 10:00:06 +01:00
Dimitris Sotirakis 918cb580e8 E2E: Rename end-to-end-tests-server to grafana-server (#44249) (#44282) 
* Rename to grafana-server / move scripts into new directory

* Change grafana-server step command

* Change scripts paths

* Use test grabpl version

* Update run-suite script

* Further name updates

* Update grabpl version

* Update contribute/style-guides/e2e-core.md

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
(cherry picked from commit 22eb2df602)
 2022-01-21 11:09:31 +02:00
Dimitris Sotirakis bce40bfcf1 [v8.3.x] Remove test-release pipelines (#44220) (#44228) 
* Remove test-release pipelines (#44220)

(cherry picked from commit 27fbe82bf1)

* Remove accidentally added lines upon cherry-picking

* Remove unused var
 2022-01-20 00:02:56 +02:00
Dimitris Sotirakis 67a3609cb8 [v8.3.x] CI: Release automations fixes (#44194) 
* Change bucket

* Make publish-packages depend on publish-artifacts pipeline

* Change bucket for windows .msi installers
 2022-01-19 15:13:16 +02:00
Dimitris Sotirakis db94117d84 Replace docker-puppeteer with the one in grafana dockerhub repo (#44145) (#44147) 
(cherry picked from commit 118cc0d735)
 2022-01-18 11:43:05 +00:00
Dimitris Sotirakis 139cd1d9fc [v8.3.x] Update grabpl version to 2.8.4 - modify commands (#43996) (#43999) 
* Update grabpl version to 2.8.3 - modify commands (#43996)

(cherry picked from commit 787d55fb2d)

* Update grabpl to 2.8.4

* Sign drone
 2022-01-17 13:43:04 +00:00
Dimitris SotirakisandTimur Olzhabayev 3878ff9324 [v8.3.x] chore(drone): switch to using cypress built image for e2e tests (#44050) 
* chore(drone): switch to using cypress built image for e2e tests

(cherry picked from commit ec9d6b9ca9)

* Remove volumes - downgrade cypress version

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
 2022-01-14 16:51:46 +02:00
Dimitris Sotirakis ac031acdbe Update grabpl version to 2.8.2 (#43949) (#43954) 
(cherry picked from commit 634ce4a98e)
 2022-01-12 12:25:27 +01:00
Dimitris Sotirakis 6217739bc9 CI: Automate Grafana releases (#43897) (#43911) 
* CI: Automate releases

* Update grabpl version

(cherry picked from commit 4f47832bac)
 2022-01-12 10:40:11 +01:00
Dimitris Sotirakis a4c660ca0e Update grabpl version to 2.8.1 (#43902) (#43917) 
(cherry picked from commit ee0a30c8c2)
 2022-01-11 20:42:38 +01:00
Dimitris Sotirakis 7e5bce7a91 Chore: Split release pipelines (#43419) (#43893) 
* Split release pipelines

* Re-add pr and main pipelines

(cherry picked from commit f60a2e8152)
 2022-01-11 10:54:32 +00:00
idafurjes 433f0570cf Chore: Upgrade go and alpine (#43801) (#43846) 
* Upgrade go and alpine

* Bump grabpl version

* Bump alpine version

* Fix version of grabpl

* Bump alpine version

* Bump alpine in Dockerfiles

(cherry picked from commit 3ca58c0e0c)
 2022-01-10 11:30:07 +01:00
Dimitris Sotirakis 51f516e16d Chore: Replace publish keyword with store (#43340) (#43814) 2022-01-10 10:24:01 +01:00
Carl Bergquistandmalcolmholmes ebcab2136c Publish enterprise2 to correct bucket (#43115) (#43119) 
(cherry picked from commit 198f947d0b)

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
 2021-12-14 19:01:47 +01:00
malcolmholmes fe9b5e0739 Build: correctly identify upload bucket for CDN assets (#43099) 2021-12-14 14:53:44 +01:00
Carl Bergquistandmalcolmholmes 92859ce0e5 Publish non-release CDN assets (#43087) (#43091) 
(cherry picked from commit 555f5a49ce)

Co-authored-by: malcolmholmes <42545407+malcolmholmes@users.noreply.github.com>
 2021-12-14 13:26:50 +01:00
malcolmholmes b0152ff2f2 Build: Still auto-publish non-release artifacts (#43021) (#43074) 
* Still auto-publish non-release artifacts

* Add version to prerelease bucket path

(cherry picked from commit 4a4d076bb1)
 2021-12-14 10:00:44 +00:00
malcolmholmes 6828df7a93 Build: allow building releases from other repositories (#42914) (#42926) 
* Allow building from other repositories

* Upgrade grabpl

* Update drone.yml

(cherry picked from commit de6148e5f1)
 2021-12-09 14:23:33 +00:00
Dimitris Sotirakis 5f7ac314fd Remove e2e tests on enterprise2 (#42640) (#42649) 2021-12-02 14:52:00 +01:00
malcolmholmes 57b7c16bc9 Backport 42218 to v8.3.x (#42515) 
* Package release before publishing (#42218)

* Package separately to publish

* Fix interpolation

* Windows format envvars

* More descriptive msg

* Won't publish from here

* Resolve docker issues in PR build

* Rename package docker step

* Correct npm release JSON structure

(cherry picked from commit 9c0a2a19fd)

* Use existing grabpl

* Update drone.yml
 2021-11-30 13:31:45 +02:00
Marcus Andersson 739cac1ea0 Build: Increased the memory for the node process in the frontend build. (#42499) (#42508) 
(cherry picked from commit 2a50c029b2)
 2021-11-30 11:27:34 +01:00
ying-jeanneYing WANGidafurjes
 		88aec5dff9 Upgrade build-container to version 1.4.8 (#42373) (#42426) 
* Upgrade build-container to version 1.4.8 (#42373)

* Upgrade build-container to version 1.4.8

* disable lint of mixin

Co-authored-by: Ying WANG <ying.wang@grafana.com>

* change signature

Co-authored-by: idafurjes <36131195+idafurjes@users.noreply.github.com>
 2021-11-29 12:44:26 +01:00
Marcus Efraimsson 8d74cc3576 Chore: Temporary set backend test timeout to 30 min (#42321) 2021-11-25 16:56:26 +01:00
Dimitris Sotirakis e8c9179f1a [v8.3.x] CI: Run e2e tests in parallel using multiple suites (#41748) (#42215) 
* CI: Run e2e tests in parallel using multiple suites (#41748)

* Add missing slash
 2021-11-24 15:42:54 +01:00
idafurjes 33ebb859bd Bump grabpl version to 2.7.1 (#42089) (#42154) 
(cherry picked from commit 5ac1dc1008)
 2021-11-23 23:33:23 +01:00
Dimitris SotirakisandDave Henderson 80945956aa Dockerfile: Bump Go and Alpine versions (#42063) 
Co-authored-by: Dave Henderson <dhenderson@gmail.com>
 2021-11-22 14:53:48 +01:00
Dimitris Sotirakis c782f3031a Make integration tests depend on initialize for enterprise-release-* branches (#42004) (#42027) 2021-11-22 08:48:35 +01:00
Dimitris Sotirakis 5e0900609b Refactor drone yaml (#41969) 2021-11-19 14:46:00 +01:00
Grot (@grafanabot)andDimitris Sotirakis 94023f10a3 Make initialize depend on clone, only on enterprise pipelines (#41909) (#41910) 
(cherry picked from commit 7dcc5ca199)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 18:11:43 +02:00
Grot (@grafanabot)andDimitris Sotirakis a6ce53136c Run integration tests after initialize (#41906) (#41908) 
(cherry picked from commit e8a2a82d5c)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 18:00:35 +02:00
Grot (@grafanabot)andDimitris Sotirakis fe082e2210 Update grabpl version to 2.6.1 (#41892) (#41896) 
(cherry picked from commit c82a15eafb)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
 2021-11-18 16:01:05 +01:00
Joan López de la Franca BeltranandDan Cech d49230d291 Grafana CLI Wire Runner (#41012) 
* Set up Wire build graph

* Remove enterprise Wire set

* Move runner package outside commands

* Update Makefile (gen-go path)

* Minor prettier fix

* Include new Wire enterprise file into .gitignore

* Update Wire deps

* Update the grabpl version

Co-authored-by: Dan Cech <dcech@grafana.com>
 2021-11-17 20:43:09 +01:00
Dimitris Sotirakis b8dd9fdd4a CI: Make build, test and integration tests steps run in parallel (#40794) 
* Make build and test steps run in parallel

* Make tests and builds run on different pipelines

* Make test-backend depend on initialize

* Rename

* Create standalone integration tests pipeline (#41730)

* Remove unused variables
 2021-11-17 11:25:55 +02:00
Hugo Häggmark b4faee786f Chore: re-enable pa11y-ci for PRs (#41723) 
* Chore: re-enable pa11y-ci for PRs

* Chore: update signature

* Chore: revert wait times

* Chore: use same hash as docker image
 2021-11-17 06:03:09 +01:00
Dimitris Sotirakis 99900cbdd8 CI: Make grabpl and lint-drone standalone steps (#41644) 
* Extract grabpl download as separate step

* Change image to alpine

* Change image to curlimage

* Change image to alpine-curl

* Extract lint-drone step

* Add lint-drone to release and main pipelines

* Rename lint_drone to lint_drone_step

* Sign drone
 2021-11-15 17:14:33 +00:00
Hugo Häggmarkanddsotirakis 16578b0af0 Chore: Fix broken pa11y-ci (#41597) 
* Chore: Fix broken pa11y-ci

* Chore: using npx instead

* Chore: testing with prebuilt image

* Chore: testing bin path

* Chore: trying

* Chore: another try

* Update puppeteer image

* Chore: updating image

* Chore: removes yarn version printout

* Chore: removes yarn version printout

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
 2021-11-15 08:49:39 +01:00
Hugo Häggmark 0e12293971 Chore: Removes pa11y-ci as dependency and use dlx instead (#41591) 2021-11-11 12:54:08 +01:00
Ashley HarrisondsotirakisDimitris Sotirakiskay delaney
 		ed030f9c21 Chore: Set min node version in package.json to 16 (#41423) 
* Update package.json

* Update build-container version

* Sign drone

* Update developer-guide

* kick drone

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: kay delaney <kay@grafana.com>
 2021-11-10 14:23:10 +00:00
dsotirakis a3f6982476 Merge test a11y steps on starlark files 2021-11-10 14:35:03 +02:00