public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,879 Commits 655 Branches 650 Tags
df367b06348f594ef8ab4f084aa44c618f64511c
Commit Graph
26879 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andZoltán Bedi df367b0634 Prometheus: don't override displayName property (#29441) (#29488) 
* Prometheus: don't override displayName property

* Rename displayName to displayNameFromDS for consistency

(cherry picked from commit 207831fa39)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2020-12-01 10:57:46 +01:00
Will Browne 2069630cb3 resolve conflicts (#29415) 2020-11-26 15:40:43 +01:00
Arve Knudsen a578cdf18c Drone: Upgrade build pipeline tool (#29365) (#29368) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 5773929953)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-25 11:22:15 +01:00
Grot (@grafanabot)andArve Knudsen 81e18c85bf Drone: Upload artifacts for release branch builds (#29297) (#29364) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 5cec4095b2)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-25 09:49:05 +01:00
Grot (@grafanabot)andArve Knudsen d7208411cc Drone: Execute artifact publishing for both editions in parallel during release (#29362) (#29363) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit f7567f2266)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-25 09:28:13 +01:00
Grot (@grafanabot)andArve Knudsen 14c494085e Drone: Publish NPM packages after Storybook to avoid race condition (#29340) (#29343) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 7d8cb6869a)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
v7.3.4 		2020-11-24 15:17:31 +01:00
Grot (@grafanabot)andMarcus Efraimsson 3a50fc8db0 Docs: Fix editor role and alert notification channel description (#29301) (#29337) 
* Docs: Fix editor role and alert notification channel description

* Update docs/sources/permissions/organization_roles.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
(cherry picked from commit 27b4390484)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-11-24 11:52:49 +01:00
Grot (@grafanabot) 7472e37cf9 "Release: Updated versions in package to 7.3.4" (#29336) 2020-11-24 11:20:38 +01:00
Grot (@grafanabot)andWill Browne be6425d461 Security: Fixes minor security issue with alert notification webhooks that allowed GET & DELETE requests #29330 (#29335) 
(cherry picked from commit d796c61946)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2020-11-24 10:45:09 +01:00
Torkel Ödegaard f34fecbca0 Backport of InfluxDB: update flux library and support boolean label values #29333 2020-11-24 10:41:15 +01:00
Torkel Ödegaard 509174df31 ReleaseNotes: Update link in package.json (#29328) 2020-11-24 10:24:03 +01:00
Grot (@grafanabot)andTorkel Ödegaard 6ada37b445 Login: Fixes redirect url encoding issues of # %23 being unencoded after login (#29299) (#29323) 
(cherry picked from commit 763e958d9d)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-11-24 07:52:04 +01:00
Grot (@grafanabot)andArve Knudsen 6d79790397 Drone: Upgrade build pipeline tool (#29308) (#29309) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit e293dd40b0)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-23 17:36:01 +01:00
Grot (@grafanabot)andMarcus Andersson 089c636acf Annotations: fixing so when changing annotations query links submenu will be updated. (#28990) (#29285) 
* fixing so changes to annotations query links will update submenu.

* Refactored so we dont use the events to trigger a refresh but instead recreating the annotations list instead of mutating the existing list.

* updated snapshot.

* uppdates according to feedback.

* fixed so it also works to update a annotation.

(cherry picked from commit 81859880d3)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
 2020-11-21 17:26:57 +01:00
Grot (@grafanabot)andTorkel Ödegaard fcd66eef29 Dashboard: Fixes kiosk state after being redirected to login page and back (#29273) (#29278) 
* Login: Fixes issue where url parameters where modified by golang url code

* Add tests

* Fix test cases

* Update pkg/middleware/auth_test.go

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* fixed formatting

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
(cherry picked from commit 1076f47509)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-11-20 20:40:11 +01:00
Grot (@grafanabot)andDominik Prokop cffb1cd98d Increase search limit on team add user and improve placeholder (#29258) (#29261) 
(cherry picked from commit a312f1ae80)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2020-11-20 13:17:59 +01:00
Arve Knudsen 881a595651 Drone: Sync with master (#29205) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-18 16:00:58 +01:00
Arve Knudsen 004104717c Drone: Fix publish-packages invocation (#29179) (#29184) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-18 10:12:34 +01:00
Arve Knudsen b345e28a2d Chore: Upgrade grafana/build-ci-deploy image to latest Go (#29171) (#29180) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-18 09:13:12 +01:00
Grot (@grafanabot)andDominik Prokop fa1db4dc12 Table: Fix incorrect condtition for rendering table filter (#29165) (#29181) 
(cherry picked from commit f28ba27ca2)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2020-11-18 09:05:14 +01:00
Grot (@grafanabot)andMarcus Andersson 9a3fbb8782 DashboardLinks: will only refresh dashboard search when changing tags for link. (#29040) (#29177) 
* fixing so we dont run multiple dashboard links searches when changing variables.

* changed so we fetch the list when open the dashboard links dropdown.

* removed verification of unneccesary requests.

(cherry picked from commit 4c0aa4acd5)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
 2020-11-18 07:28:57 +01:00
Arve Knudsen 7292e1508e Drone: Upgrade build pipeline tool and build image (#29161) (#29162) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-17 20:40:19 +01:00
Grot (@grafanabot) 2489dc4d3a Release: Updated versions in package to 7.3.3 (#29126) v7.3.3 2020-11-17 13:18:22 +01:00
Torkel Ödegaard ca8de25f0c git cherry-pick -x 0f3bebb38d (#29155) 
Backport of https://github.com/grafana/grafana/pull/29031
 2020-11-17 12:05:11 +01:00
Grot (@grafanabot)andLeonard Gram ff7c462600 Build: support custom build tags (#28609) (#29128) 
* Build: support custom build tags

* Update build.go

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

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 63c230b670)

Co-authored-by: Leonard Gram <leo@xlson.com>
 2020-11-17 11:09:19 +01:00
Torkel Ödegaard 41bbafe979 Revert "Graph: Fixes stacking issues like floating bars when data is not aligned (#29051) (#29088)" (#29151) 
This reverts commit 697e4f7037.
 2020-11-17 10:27:10 +01:00
Grot (@grafanabot)andAlexander Zobnin 37e4a19ea8 Provisioning: always pin app to the sidebar when enabled (#29084) (#29146) 
(cherry picked from commit 4f9123ebe2)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
 2020-11-17 10:27:49 +03:00
Grot (@grafanabot)andAndrew Mattheisen f04131c9c6 build paths in an os independent way (#29143) (#29147) 
Use filepath instead of path to manipulate filename paths in a way compatible with the target operating system-defined file paths.

(cherry picked from commit 4430ca2317)

Co-authored-by: Andrew Mattheisen <amattheisen@users.noreply.github.com>
 2020-11-17 08:24:12 +01:00
Grot (@grafanabot)andArve Knudsen 7e6c34fc20 Chore: Upgrade Go dev tools (#29124) (#29132) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 115f38f5c3)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-16 08:34:17 +01:00
Torkel Ödegaard 0e5da44bc1 Automatin: set node version 2020-11-15 12:18:02 +01:00
Torkel Ödegaard fc44872ca2 Automation: Adding version bump action 2020-11-15 11:52:34 +01:00
Grot (@grafanabot)andArve Knudsen c88fc42fc6 Drone: Fix Drone config verification for enterprise on Windows (#29118) (#29119) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 01df8f177c)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-14 12:04:03 +01:00
Grot (@grafanabot)andArve Knudsen d05c3462da [v7.3.x] Drone: Verify Drone config at beginning of pipelines (#29111) 
* Drone: Verify Drone config at beginning of pipelines (#29071)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 113e288668)

* Sync .drone.yml

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Remove Windows testing of PRs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-14 07:36:28 +01:00
Grot (@grafanabot)andkay delaney 8db22cef96 Test Datasource/Bug: Fixes division by zero in csv metric values scenario (#29029) (#29068) 
Closes #8705

(cherry picked from commit 9659c98d61)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2020-11-13 15:52:58 +01:00
Grot (@grafanabot)Torkel ÖdegaardTorkel Ödegaard
 		edfe914cb0 [v7.3.x] StatPanel: Fixes hanging issue when all values are zero (#29087) 
* StatPanel: Fixes hanging issue when all values are zero (#29077)

* StatPanel: Fixes hanging issue when all values are zero

* Minor tweak

(cherry picked from commit 01a4951da0)

* Fixed test

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2020-11-13 15:51:38 +01:00
Arve Knudsen 4cf6c916c7 Data source proxy: Convert 401 from data source to 400 (#28962) (#29095) 
* Data source proxy: Convert 401 from data source to 400

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-13 15:06:38 +01:00
Grot (@grafanabot)andTorkel Ödegaard 697e4f7037 Graph: Fixes stacking issues like floating bars when data is not aligned (#29051) (#29088) 
* Graph: Remove interpolation logic from graph stacking

* Improving tooltip

(cherry picked from commit dff451992d)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-11-13 14:16:16 +01:00
Grot (@grafanabot)andWill Browne ca4fdc46fd Auth: Enable more complete credential chain for SigV4 default SDK auth option (#29065) (#29086) 
* Force more complete credential chain for default auth option

* simplify

* allow assume role for default

(cherry picked from commit eba046d3cb)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2020-11-13 11:23:52 +01:00
Grot (@grafanabot)andSofia Papagiannaki e086a96161 Fix for multi-value template variable for project selector (#29042) (#29054) 
(cherry picked from commit 0c054d1a9f)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-11-12 11:54:08 +02:00
Grot (@grafanabot)andTorkel Ödegaard 945573eb93 Thresholds: Fixes color assigned to null values (#29010) (#29018) 
* Thresholds: Fixes color assigned to null values

* Updates

(cherry picked from commit 145901c0db)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-11-12 09:39:49 +01:00
Emil Tullstedt b8ad4eaab3 [v7.3.x] Chore: Bump build pipeline version (#29025) v7.3.2 2020-11-11 14:20:01 +01:00
Leonard Gram f034cbef50 Release v7.3.2 (#29024) 2020-11-11 14:09:57 +01:00
David 23be6e3898 Fix conflict (#29020) 2020-11-11 12:57:07 +01:00
Grot (@grafanabot)andTorkel Ödegaard 7798f01cc9 StatPanels: Fixes auto min max when latest value is zero (#28982) (#29007) 
(cherry picked from commit 10f226c4c2)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-11-11 11:56:33 +01:00
Grot (@grafanabot)andCarl Bergquist 38b96278c8 Tracing: Add setting for sampling server (#29011) (#29015) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
(cherry picked from commit e3c7d66324)

Co-authored-by: Carl Bergquist <carl@grafana.com>
 2020-11-11 10:42:38 +01:00
Marcus AnderssonandLeonard Gram f142752ad6 Gauge: making sure threshold panel json is correct before render (#28898) (#28984) 
* making sure we work with a proper data structure.

* added test to verify functionality.

* removed unused variables.

Co-authored-by: Leonard Gram <leo@xlson.com>
 2020-11-10 17:32:49 +01:00
Marcus AnderssonandTorkel Ödegaard 1cfe644d51 Variables: make sure that we support both old and new syntax for custom variables. (#28896) (#28985) 
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2020-11-10 17:32:37 +01:00
Grot (@grafanabot)andIvana Huckova d8ac457ebc Explore: Remove redundant decodeURI and fix urls (#28697) (#28963) 
* Remove redundant path URIdecoding

* Remove redundant comments

(cherry picked from commit f71f03bf94)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2020-11-10 17:30:20 +01:00
Grot (@grafanabot)Arve KnudsenTorkel Ödegaard
 		3d4ff87721 [v7.3.x] Drone: Fix docs building (#28987) 
* Drone: Fix docs building (#28986)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 9582e0afd9)

* Updated

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2020-11-10 16:49:05 +01:00
Marcus AnderssonandMikhail Snetkov 0c5524786b Alerting: Append appSubUrl to back button on channel form (#28282) (#28983) 
Co-authored-by: Mikhail Snetkov <ufoproger@gmail.com>
 2020-11-10 16:19:47 +01:00