public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 655 Branches 650 Tags
4a8a3d40e76c64ad6e8b1be548eacbf264fa231e
Commit Graph

17850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
moznion 4a8a3d40e7 Fix bug what updating org quota doesn't work 
https://github.com/grafana/grafana/blob/3c330c8e4c0b0f9fb258801ba8a7fe2586bbc819/pkg/services/sqlstore/quota.go#L106

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.

(cherry picked from commit 061e06c226)
 2018-12-10 14:37:26 +01:00
Johannes Schill 01c4b71cfb If user login equals user email, only show the email once #14341 
(cherry picked from commit 02b14d33a6)
 2018-12-10 14:35:42 +01:00
Johannes Schill e7cd39a543 UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341 
(cherry picked from commit 114a264da4)
 2018-12-10 14:35:31 +01:00
Torkel Ödegaard 6f241a4bac fix for panel-initialized event not being called 
(cherry picked from commit 757cada4a5)
 2018-12-10 14:34:46 +01:00
Brian Gann 0a19581c48 redact value for plugin proxy routes 
(cherry picked from commit 02365514f9)
 2018-12-10 14:34:25 +01:00
Torkel Ödegaard 96cb4df83a fix for panel embedding. Solo panel height was not correctly set. Made panel--solo into panel-solo class. in develop branch we have remove the need for the panel class 
(cherry picked from commit e31490ac68)
 2018-12-10 14:34:07 +01:00
Tom Nitti 7820775a53 added support for influxdb cumulative_sum function in tsdb 
(cherry picked from commit 1e53c12921)
 2018-12-10 14:33:41 +01:00
Dominik Henneke 9699133501 Use buildTableConstraint instead of buildSchemaConstraint to find the datatype of a column if using a table from a different database schema 
(cherry picked from commit b450b778cb)
 2018-12-10 14:32:55 +01:00
flopp999 80ecd8ea8e fixedUnit for Flow:l/min and mL/min 
got stranged result with decimalSIPrefix
(cherry picked from commit 8caeb13026)
 2018-12-10 14:32:31 +01:00
Marcus Efraimsson 2ab2259091 fix time regions using zero hours 
(cherry picked from commit ad33cd5c5c)
 2018-12-10 14:32:08 +01:00
Kornelijus Survila deb305b95f dataproxy: Override incoming Authorization header 
(cherry picked from commit 0cafd9a663)
 2018-12-10 14:31:28 +01:00
Leonard Gram d42c17efad build: update latest when pushing docker. 
(cherry picked from commit 9a771555f3)
 2018-12-04 11:17:50 +01:00
Leonard Gram 972aaef2a6 build: always test publisher. 
(cherry picked from commit cb0d58c6f1)
 2018-12-03 15:18:10 +01:00
Leonard Gram ce3982d406 build: packages linked to dl.grafana.com. 
(cherry picked from commit ff0730ca1a)
 2018-12-03 15:18:10 +01:00
Marcus Efraimsson 69c5191926 Merge pull request #14212 from grafana/cp-5.4.0 
Cherry picks for v5.4.0
v5.4.0 		2018-12-03 02:17:42 -08:00
Marcus Efraimsson 99ee3bbe5a release v5.4.0 2018-12-03 10:53:20 +01:00
Marcus Efraimsson 01840cbd70 let each sql datasource handle timeFrom and timeTo macros 
(cherry picked from commit 624e5e5b3d)
 2018-11-30 16:27:36 +01:00
Matthew Coltman 23b19543bd Add AWS/CodeBuild namespace for CloudWatch datasource 
(cherry picked from commit bbd0ec3a8b)
 2018-11-30 16:27:07 +01:00
Ryan McKinley bb4e5934fb check for null with toLocalString (#14208) 
(cherry picked from commit b3e6da0cbd)
 2018-11-28 10:23:43 +01:00
Torkel Ödegaard fd3821d2f1 Fix elastic ng-inject (build issue) (#14195) 
fix elastic ng-inject issue in query editor

(cherry picked from commit 2faf8c722f)
 2018-11-28 10:23:22 +01:00
Leonard Gram 8b1d0b14b6 docker: Upgrades base packages in the images. 
Related to #14182

(cherry picked from commit bccce9922a)
 2018-11-28 10:22:39 +01:00
Marcus Efraimsson 23c6bea21b return actual error if failing to update alert data 
(cherry picked from commit 36aec52c08)
 2018-11-28 10:21:26 +01:00
Marcus Efraimsson e3abefa19f fix handle of elasticsearch 6.0+ version 
(cherry picked from commit a022284cb0)
 2018-11-28 10:20:41 +01:00
flopp999 4ee92bd59c Fix abbreviations of Litre/min and milliLitre/min (#14114) 
(cherry picked from commit 91d97ab5b5)
 2018-11-28 10:20:04 +01:00
Marcus Efraimsson 780e5153d0 cloudwatch: handle invalid time ranges 
(cherry picked from commit 3534762f49)
 2018-11-28 10:00:23 +01:00
Marcus Efraimsson be9058d7ef cloudwatch: recover/handle panics when executing queries 
(cherry picked from commit 879aed7d06)
 2018-11-28 10:00:16 +01:00
bergquist 3301f96811 updates time range options for alert queries 
add some new options for the to value.
removes '1s' option for from since thats unreasonable low

closes #12134

(cherry picked from commit 14688766ef)
 2018-11-28 09:59:52 +01:00
bergquist 1c59669da0 format: remove </input> and align tabs 
(cherry picked from commit 60c291c8dc)
 2018-11-28 09:59:45 +01:00
Torkel Ödegaard 1ad60be47b fixed failing graph tests 
(cherry picked from commit 0731b8635b)
 2018-11-28 09:59:10 +01:00
Torkel Ödegaard 9ec0af73ec fixed issue with new legend not checking if panel.legend.show 
(cherry picked from commit cab92f88af)
 2018-11-28 09:59:00 +01:00
Leonard Gram 8190d10827 build: docker build for ge. 
(cherry picked from commit 6c267cb592)
 2018-11-21 09:28:15 +01:00
Marcus Efraimsson 18b5f630f7 update release publish script links 
(cherry picked from commit e421c387ea)
 2018-11-20 16:24:59 +01:00
Marcus Efraimsson 9df26af3db release v5.4.0-beta1 v5.4.0-beta1 2018-11-20 14:08:27 +01:00
Marcus Efraimsson 0b3e5ec4a7 Merge pull request #14137 from grafana/webpack-error-template-fix 
fix for issue with error view in production builds
 2018-11-20 04:59:12 -08:00
Torkel Ödegaard 34c70ca7ce fix for issue with error view in production builds 2018-11-20 13:47:45 +01:00
Daniel Lee 42d5003be3 changelog: adds note for #13561 2018-11-20 13:43:48 +01:00
Daniel Lee 4aeea56342 Merge pull request #14007 from grafana/stackdriver-template-query-editor 
Stackdriver template query editor
 2018-11-20 13:41:18 +01:00
Marcus Efraimsson 55fefde2a0 update changelog 2018-11-20 13:23:44 +01:00
Erik Sundell 7021e07ab2 stackdriver: remove not used variable 2018-11-20 13:22:43 +01:00
Erik Sundell b200f92710 stackdriver: use angular dropdown so that we can restrict user input 2018-11-20 13:18:00 +01:00
Erik Sundell 7fc8ed942f stackdriver: make sure object type queries are also checked for vtemplate variables 2018-11-20 12:30:31 +01:00
bergquist 8bd0aeb56e changelog: adds note about closing #13577 2018-11-20 11:21:17 +01:00
Carl Bergquist db8bd8298a Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth 
Add basic authentication support to metrics endpoint
 2018-11-20 11:19:55 +01:00
bergquist c999394b49 adds basic auth configuration to default.ini 2018-11-20 11:07:39 +01:00
Erik Sundell aa65796ee1 stackdriver: reset defaults.ini 2018-11-20 10:00:01 +01:00
Marcus Efraimsson b948c9bdf5 changelog: add notes about closing #14120 2018-11-20 09:59:35 +01:00
Marcus Efraimsson 9cc6c2128a Merge pull request #14120 from supercharlesliu/user-teams 
Add API GET /api/users/:id/teams for GrafanaAdmin
 2018-11-20 00:56:35 -08:00
Marcus Efraimsson 49bf003df1 Merge pull request #14132 from cloudshapes/revert-14092-record-full-url-in-google-analytics 
Revert "Update google analytics code to submit full URL not just path"
 2018-11-20 00:49:46 -08:00
Marcus Efraimsson 8ec7fd56d4 changelog: add notes about closing #14129 
[skip ci]
 2018-11-20 09:47:24 +01:00
Marcus Efraimsson cab2c5189a Merge pull request #14129 from daktari/master 
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
 2018-11-20 00:42:22 -08:00