public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,836 Commits 655 Branches 650 Tags
v5.4.0
Commit Graph
17836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Leonard Gram 1a554e2421 linters. 2018-11-20 09:01:52 +01:00
Leonard Gram 7e2298ce31 build: correct filters for ge build artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram 84832cb6cb build: releaser supports releasing only some artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram 87707c964c Revert "docs: building Grafana on arm." 
Further work-arounds are needed to make this work.
This reverts commit 8a2de58728.
 2018-11-20 08:46:09 +01:00
supercharlesliu a241f67fba Add doc for api "GET /api/users/:id/teams" 2018-11-20 10:17:46 +08:00
Bob Shannon 16ff8a182b Re-organize packages and add basic auth test 2018-11-19 13:54:13 -05:00
Roland Dunn fa2c46edb9 Revert "Update google analytics code to submit full URL not just path" 2018-11-19 18:21:37 +00:00
Javier 0900470dda Add Cloudwatch/CloudHSM Metrics and dimensionMaps 2018-11-19 18:10:34 +01:00
Marcus Efraimsson 9af5e9a448 Merge pull request #14127 from grafana/team_members_fix 
Remove react warning in team members page
 2018-11-19 09:03:41 -08:00
Marcus Efraimsson 0aca6f587b remove react warning 2018-11-19 17:54:17 +01:00
Leonard Gram 8a2de58728 docs: building Grafana on arm. 2018-11-19 16:50:19 +01:00
Erik Sundell fa32310f8a stackdriver: add query keyword to service, metric and project since these were the only fields in the editor that was missing it in the whole editor 2018-11-19 16:37:42 +01:00
David 5a759a8317 Merge pull request #14118 from grafana/davkal/explore-logs-dedup 
Explore: POC dedup logging rows
 2018-11-19 15:36:26 +00:00
David Kaltschmidt 4771eaba5b Explore: POC dedup logging rows 
- added dedup switches to logs view
- strategy 'exact' matches rows that are exact (except for dates)
- strategy 'numbers' strips all numbers
- strategy 'signature' strips all letters and numbers to that only whitespace and punctuation remains
- added duplication indicator next to log level
 2018-11-19 16:26:47 +01:00