public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,526 Commits 655 Branches 650 Tags
7fd39889fa322bad02ba4c69cf5810ee82ba9901
Commit Graph
32526 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andAndres Martinez Gotor 7fd39889fa AzureMonitor: Allow template variables in the subscription field (#44312) (#44331) 
(cherry picked from commit addeba7f05)

Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
 2022-01-21 17:02:49 +01:00
Grot (@grafanabot)andJM 64fc2ecb0e Docs: add API pages to HTTP API list (#42997) (#44328) 
* add API pages to HTTP API list

* fix capitalization of page names

(cherry picked from commit 8a21385481)

Co-authored-by: JM <justintmai@gmail.com>
 2022-01-21 10:31:55 -05:00
Grot (@grafanabot)andJean-Philippe Quéméner 42668a5e89 Alerting: recognize Cortex datasources correctly in the frontend (#44316) (#44325) 
* Alerting: always use msg field for user facing errors

* fix: revert front-end Cortex detection

Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
(cherry picked from commit 8ee3f59cd4)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-01-21 16:03:55 +01:00
Armand GrilletandYuriy Tseretyan c335538765 Create only one folder per dashboard with ACL (#44317) 
Co-authored-by: Yuriy Tseretyan <yuriy.tseretyan@grafana.com>
 2022-01-21 14:59:18 +01:00
Grot (@grafanabot)andAshley Harrison 3d453a6104 Only modify table spacing (#44313) (#44320) 
(cherry picked from commit e1af78954f)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-01-21 14:52:47 +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
Dominik Prokop 6863f49bd0 [v8.3.x] Cursor sync: Apply the settings without saving the dashboard (#44270) (#44279) 
* Cursor sync: Apply the settings without saving the dashboard

* Remove unnecessary code

* Lint god damn

(cherry picked from commit 7bf25f62e1)
 2022-01-21 09:27:15 +01:00
Grot (@grafanabot)andkay delaney 2c502f4b36 MixedDatasource: Fixes infinite loop with empty query panel (#44265) (#44268) 
* MixedDatasource: Fixes infinite loop with empty query panel

(cherry picked from commit a728e9b4dd)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-01-20 13:49:05 +00:00
Grot (@grafanabot)andDominik Prokop 05ccdac63a TablePanel: Makes footer not overlap table content (#44210) (#44247) 
(cherry picked from commit 9f0889c402)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2022-01-20 01:37:44 -08:00
Grot (@grafanabot)andJosh Hunt 5ab2ebade3 DashboardSettings: Prevent Dashboard permissions from linking to folder permissions when user does not have sufficient permissions (#44212) (#44223) 
* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* user essentials mob! 🔱

* add tests

* fix up

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
(cherry picked from commit 9f97f05fcc)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
 2022-01-20 09:29:35 +00: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
Grot (@grafanabot)andkosssi 5bc1a0ad06 docs: Move password information on password smtp section (#42370) (#44229) 
*What this PR does / why we need it:*

The password information is on [enabled section](https://grafana.com/docs/grafana/latest/administration/configuration/#enabled), I move it on [password section](https://grafana.com/docs/grafana/latest/administration/configuration/#password-1).

(cherry picked from commit f6b385f0ca)

Co-authored-by: kosssi <github@fafaru.com>
 2022-01-19 14:29:05 -05:00
Grot (@grafanabot)andAshley Harrison a23bacc3e2 Dashboard: Prevent Mixed datasources using the test datasource crashing (#44128) (#44215) 
* Special case mixed datasources... :/

* Revert "Special case mixed datasources... :/"

This reverts commit dd0e3ea4a8.

* Ensure testdata persists datasource when switching scenario

* Add a unit test to prevent regressions

* kick drone

(cherry picked from commit d4d306d825)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-01-19 14:19:45 +01: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
Gleb Goncharov f63ec0f43d Fix WebSockets configuration for Nginx (#44148) 2022-01-19 15:47:01 +03:00
Dimitris SotirakisandGrot 42bffe2310 [v8.3.x] Update changelog and lockfile for 8.3.4 (#44168) 
* ReleaseNotes: Updated changelog and release notes for 8.3.4 (#218)

(cherry picked from commit d5a5360328)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit de38ed8d67985c2da189007d44eaa17769c772ab)
(cherry picked from commit c39413645f)

* "Release: Updated versions in package to 8.3.4" (#216)

(cherry picked from commit 39d66dcc8af875313c99beda2f46fb9c6d5443fb)
(cherry picked from commit 82a2acf00b)

* Update lockfile

(cherry picked from commit a551d74b11)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
 2022-01-18 17:09:27 +01:00
Dimitris SotirakisandKevin Minehart d3756d38ee [v8.3.x] GetUserInfo: return an error if no user was found (#211) (#44166) 
* return an error if no user was found

* update condition

(cherry picked from commit ec87405543fe8032a0c2769d3ec97536b7a749ef)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
 2022-01-18 16:53:03 +01: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
Grot (@grafanabot)andJavier Palomo 2b967ad8ec Circleci: remove unused config (#44136) (#44141) 
CircleCI is being triggered but there are no workflows being executed.
CI is driven by Drone.

(cherry picked from commit bc74d44cee)

Co-authored-by: Javier Palomo <javier.palomo@grafana.com>
 2022-01-18 09:18:15 +00:00
Grot (@grafanabot)andJack Westbrook 5681f348c4 Plugins: Add notices to docs to prevent NPX commands from hanging (#44043) (#44119) 
* docs(plugins): add notice about npm 7 flag to prevent commands from hanging

* Apply suggestions from code review

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 e888a40531)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
 2022-01-17 15:47:27 +00:00
Grot (@grafanabot)andGabi Davar cbede52ef6 Fix issue link (#42891) (#44123) 
(cherry picked from commit c4b345cfc4)

Co-authored-by: Gabi Davar <grizzly.nyo@gmail.com>
 2022-01-17 15:44:25 +00:00
Grot (@grafanabot)andErik Sundell 75b2a92c63 Azure Monitor: Improved error messages for variable queries (#43213) (#44117) 
(cherry picked from commit 5ae5a2e0d0)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
 2022-01-17 16:21:33 +01:00
Grot (@grafanabot)andPiotr Jamróz 410d9a96cf Elastic: Allow using long/int as date field for alerts (#44027) (#44115) 
* Use integers for time range filter

Previously it was passed as a string which is automatically converted by Elastic to a number only if the field type is "date". For other types (e.g. "long") such conversion doesn't work. In theory "date" could be passed as a formatted string but we don't use it this way and always pass it as a number so it is safe to always pass numbers, not strings.

* Fix time_series_query_test

* Retrigger build

(cherry picked from commit 9fb8339f87)

Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
 2022-01-17 16:19:50 +01:00
Grot (@grafanabot)andErik Sundell 0a8f4cff3e CloudMonitoring: Fixes broken variable queries that use group bys (#43914) (#44116) 
(cherry picked from commit 715166baf3)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
 2022-01-17 16:04:06 +01:00
Grot (@grafanabot)andIvana Huckova 4ed62247f0 Prometheus: Fix interpolation of $__rate_interval variable (#44035) (#44114) 
* Name fields based on targets length

* Remove rounding in rate interval variable replacing

* Refactor and fix edge  case when interval and time duration would be rate interval

* Add tests

* Remove , from test

* Revert "Name fields based on targets length"

This reverts commit 5dcb34a765.

(cherry picked from commit e704110f74)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-01-17 15:44:56 +01:00
Grot (@grafanabot)andHugo Häggmark 1851cf38d5 Variables: Fix for migrating legacy data source properties (#43263) (#44106) 
(cherry picked from commit aa47cac69f)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
 2022-01-17 15:18:29 +01:00
Grot (@grafanabot)andConnor Lindsey 8ae06767a8 Tempo: Provide tag value completion items consistently (#43773) (#43863) 
(cherry picked from commit 3d6e9076c9)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-01-17 15:13:56 +01:00
Grot (@grafanabot)andGilles De Mey 16dc72e3c6 Alerting: show deleted datasource (#43891) (#44105) 
(cherry picked from commit bd9df4f829)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-01-17 14:48:56 +01: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
Gilles De Mey 575d7ed5d5 Alerting: remove dead code (#43956) (#44103) 
(cherry picked from commit 55ec05b560)
 2022-01-17 14:29:34 +01:00
Grot (@grafanabot)andAshley Harrison e77602a3b9 Export: Fix error being thrown when exporting dashboards using query variables that reference the default datasource (#44034) (#44093) 
* handle undefined datasources, add unit test

* slightly nicer

(cherry picked from commit c618339482)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-01-17 11:40:50 +01:00
Grot (@grafanabot)andToTheMax cea53ca70a Fixed broken links in documentation (#44044) (#44054) 
* Fixed broken link

* Fixed broken contribute documentation link

* Consistent relative contribute-folder url

(cherry picked from commit bd8791aced)

Co-authored-by: ToTheMax <21971014+ToTheMax@users.noreply.github.com>
 2022-01-14 10:49:45 -05: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
Grot (@grafanabot)andGiordano Ricci 3aab445245 [v8.3.x] Elasticsearch: Fix handling multiple datalinks for a single field (#44049) 
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
 2022-01-14 15:23:31 +01:00
Grot (@grafanabot)andHugo Häggmark e801e20c7d Variables: Handle variable cancellations better (#43987) (#44032) 
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: kay delaney <kay@grafana.com>
Co-authored-by: Alexandra Vargas <alexa1866@gmail.com>>
(cherry picked from commit 7ffefc069f)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
 2022-01-14 11:33:58 +01:00
Grot (@grafanabot)andJ Guerreiro 16a8902593 Usage stats: Count API keys (#42883) (#44025) 
* Stats: add api key count to usage stats

* Chore: correctly capitalize struct member

(cherry picked from commit a1b8b5d123)

Co-authored-by: J Guerreiro <joao.guerreiro@grafana.com>
 2022-01-14 10:28:02 +01:00
Grot (@grafanabot)andGábor Farkas 37bb5f17f2 prometheus: fix auto-inserting null-timestamps at the end (#44022) (#44024) 
(cherry picked from commit bedc5cccaa)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2022-01-14 10:05:58 +01:00
Grot (@grafanabot)andGábor Farkas c76acbadd6 Prometheus: add tests covering the prometheus-response to dataframes conversion (#43892) (#44023) 
* prometheus: add tests covering prometheus_response to grafana_dataframes

* fixed variable name

* added comment

* removed not-helping function call

(cherry picked from commit 4a88b8f66c)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
 2022-01-14 09:47:08 +01:00
Konrad Lalik 5a5050df32 Alerting: Fix the silence url's matcher parameters (#43898) (#44002) 
* Split silence matchers parameter into a separate entry for each label

* Unify the silence link creation

* Remove duplicated matchers when parsing to/from query params

* Add tests for matchers

* Add a comment with a duplication removal explanation

* Improve label duplication comment

* Remove redundant code

* Use uniqBy to simplify the code. Rename matchers parameter

* Fix Silence test data

(cherry picked from commit c829535f14)
 2022-01-13 14:45:06 +01:00
Andres Martinez Gotor 3ac80e696c [v8.3.x] Allow to bypass modal focus trap (#44001) 2022-01-13 13:58:07 +01:00
Grot (@grafanabot)andAgnès Toulet 425b9f5bd4 Docs: clean up image renderer dependencies and add ones for CentOS 8 (#41862) (#43993) 
* Docs: clean up image renderer dependencies and add ones for CentOS 8

* apply PR review feedback

(cherry picked from commit a9dfd3a487)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2022-01-13 11:55:01 +01:00
Grot (@grafanabot)andAshley Harrison 646bc54d09 only push default datasources to the list if they're not undefined (#43966) (#43990) 
(cherry picked from commit 8f1468df6a)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-01-13 10:43:12 +01:00
Nate Walters d4a1fad604 Chore: fix docs typo (#43980) 2022-01-12 22:03:32 -08:00
Grot (@grafanabot)andVictor Marin 5bd12321ca Postgres/MySQL/MSSQL: Cancel in-flight SQL query if user cancels query in grafana (#43890) (#43965) 
(cherry picked from commit f881fd1637)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
 2022-01-12 15:43:21 +01:00
Gilles De Mey 59c2ffec0b Alerting: manual backport of #43367 2022-01-12 14:16:51 +01: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
Grot (@grafanabot)andHugo Häggmark 6fe27c5274 Variables: Fix so data source variables are added to adhoc configuration (#43881) (#43953) 
(cherry picked from commit 7f8f9eb814)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
 2022-01-12 12:19:56 +01:00
Grot (@grafanabot)andIvana Huckova 63064facdb Name fields based on targets length (#43832) (#43943) 
(cherry picked from commit c8ef541c02)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-01-12 11:22:07 +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
Travis Patterson c45313a268 Propagate all headers (#43812) (#43922) 
* Propagate all headers

* stable header order

(cherry picked from commit 9eb82f9fff)
 2022-01-11 14:39:52 -07:00