public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,339 Commits 655 Branches 650 Tags
ab6cf9e94de7e1a0811bf2eb48cdbde6136448d9
Commit Graph
36339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 8a61e0967e Merge branch 'master' into develop 2017-12-12 13:22:13 +01:00
Torkel Ödegaard a00af85f36 build: fixed unit test failure 2017-12-12 13:21:50 +01:00
Torkel Ödegaard cafed8ce8f Merge branch 'master' into develop 2017-12-12 13:19:07 +01:00
David Kaltschmidt edb2dcf1b0 Extracted row matching function and added comments 2017-12-12 13:18:06 +01:00
bergquist ff1b71bc20 allow overriding dashboards from api 2017-12-12 13:18:00 +01:00
Patrick O'Carroll a69c260173 redesigning links editor 2017-12-12 13:06:32 +01:00
Torkel Ödegaard 871b98c06b graphite: minor fix for PR #10142 the query was being sent for every segmen t you selected before you completed the metric path 2017-12-12 12:56:40 +01:00
Torkel Ödegaard bb52f3670e Merge branch 'parseTarget' of https://github.com/DanCech/grafana into DanCech-parseTarget 2017-12-12 12:38:58 +01:00
Torkel Ödegaard e98f573732 build: fixed broken test 2017-12-12 12:31:41 +01:00
Torkel Ödegaard 35c8cdf3a5 refactor: minor change to panel json fix PR #10156 2017-12-12 12:10:19 +01:00
Alexander Zobnin 86204abbfe Move panel JSON editor to modal dialog (#10156) 
* panel: fix JSON edit, #10149

* panel: show JSON editor in modal, #10149
 2017-12-12 12:04:08 +01:00
Torkel Ödegaard bbd0b98be9 Merge branch 'develop-settings' into develop 2017-12-12 12:03:10 +01:00
Torkel Ödegaard 7b0bbefb96 ux: minor updates to dashboard settings 2017-12-12 12:02:44 +01:00
Torkel Ödegaard 0a8bd5d289 ux: dashboard settings updated 2017-12-12 11:49:01 +01:00
Patrick O'Carroll 515faa9ec5 new dashboard and folder in search (#10152) 
* new dashboard and folder in search

* code formatting fixes
 2017-12-12 11:26:15 +01:00
bergquist c68e7c7283 avatar: avoid concurrent map writes 2017-12-12 11:25:47 +01:00
Patrick O'Carroll 6ae94dda87 redesign dashlinks 2017-12-12 11:21:32 +01:00
Torkel Ödegaard 79d9b64f82 fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161 2017-12-12 11:00:16 +01:00
Carl Bergquist ea2f65b4c3 Merge pull request #10110 from bwhaley/master 
Fixes bug in cloudwatch regarding credentials
 2017-12-12 10:16:53 +01:00
Daniel Lee 3a3272e225 annotations: allows template variables to be used in tag filter 
When filtering built in annotations by tag, interpolates the tag with
template variables. Fixes #9587
 2017-12-12 10:07:33 +01:00
Alfred Krohmer 72e686457c Add default message for Pushover notifications 
If the message field is left empty for Pushover notifications, the API will return an error. This adds a default message if the message would otherwise be empty.

This fixes #8006.
 2017-12-11 22:14:38 +01:00
Alexander Zobnin 26281dd9d8 refactor: format files by gofmt 2017-12-11 19:46:05 +03:00
Johannes Schill 097596a336 ux: Adjust margins when external auth providers are enabled (#9879) 2017-12-11 17:22:40 +01:00
Torkel Ödegaard cc046f03aa ux: dashboard settings progress 2017-12-11 17:19:17 +01:00
Torkel Ödegaard 97bd00c520 ux: dashboard settings work progress 2017-12-11 16:46:10 +01:00
Daniel Lee a37f1b77f1 dashfolders: new dashboard with folder selected 
Fixes #10133
 2017-12-11 16:37:40 +01:00
Johannes Schill f77d34f7c9 ux: wip - Push pixels for new login, remove inline styling, change so we use media queries using min-width instead of max-width and make sure it looks ok across all screen sizes (#9879) 2017-12-11 16:31:50 +01:00
Torkel Ödegaard 008b9bb3e9 ux: dashboard settings work progress 2017-12-11 16:28:57 +01:00
bergquist 411e8a16c2 backend plugins: manage plugins lifecycle with context 2017-12-11 15:05:06 +01:00
Torkel Ödegaard c4b759fe6d ux: dashboard settings progress 2017-12-11 15:04:48 +01:00
Torkel Ödegaard 7f597283e8 ux: dashboard settings progress 2017-12-11 13:47:04 +01:00
Torkel Ödegaard 61dbcfd35b ux: dashboard settings progress 2017-12-11 13:29:23 +01:00
bergquist 1af4f7a1b4 backend plugins: dont swallow errors 2017-12-11 13:16:16 +01:00
Torkel Ödegaard a682475152 fix: fixed failing test 2017-12-11 13:09:25 +01:00
bergquist 026eb9ac36 backend plugins: cleanup protobuf files 2017-12-11 13:09:10 +01:00
Torkel Ödegaard 05ec7541c8 ux: dashboard settings progress 2017-12-11 13:04:06 +01:00
bergquist 7f68c2a53d backend plugins: add more datasource params 2017-12-11 12:53:01 +01:00
David Kaltschmidt 8d70f13393 Type-agnostic row merge in table transform for multiple queries 
* moved unique value naming to datasource (credit: @bergquist)
* merge rows based on same column-values and empty values
* expanded tests
 2017-12-11 12:42:53 +01:00
Torkel Ödegaard 8354c64ff5 Merge branch 'develop' into develop-settings 2017-12-11 12:15:59 +01:00
Torkel Ödegaard 09cc60ffe4 ux: dashboard settings progress 2017-12-11 12:13:45 +01:00
Torkel Ödegaard 795d9c0362 ux: fixed navbar and sidemenu z-index issue and improved responsive rules 2017-12-11 11:42:13 +01:00
bergquist 48e7f866f6 code style 2017-12-11 11:26:36 +01:00
bergquist 55a39dd2ad implement upstream changes 2017-12-11 11:14:03 +01:00
Torkel Ödegaard 2ce4a8e4c5 fix: fixed build failure 2017-12-11 10:52:38 +01:00
bergquist a4748d82ab Merge branch 'master' into backend_plugins 
* master:
  changelog: adds note about closing #10131
  Explicitly specify default region in CloudWatch datasource (#9440)
  wait for all sub routines to finish
  changelog: adds ntoe about closing #10111
  postgres: change $__timeGroup macro to include "AS time" column alias (#10119)
  fixes broken test
  Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate.
 2017-12-11 10:43:41 +01:00
Carl Bergquist 5d70a36ad8 Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang 
[render image]add encoding param
 2017-12-11 10:36:38 +01:00
Torkel Ödegaard 84aa1e89c0 Merge branch 'develop' into develop-login 2017-12-11 10:29:37 +01:00
Carl Bergquist 43cff3a2bd Merge pull request #10146 from noakup/master 
hyphen
 2017-12-11 10:18:00 +01:00
bergquist 66bc1fea2d changelog: adds note about closing #10131 2017-12-11 09:45:47 +01:00
Carl Bergquist a5b3f2b891 Merge pull request #10132 from bergquist/go_routine_management 
Wait for all sub routines to finish before closing Grafana
 2017-12-11 09:43:37 +01:00