public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ryan 6472c2bcd9 generic repeater 2019-03-13 11:30:52 -07:00
Sean Lafferty 8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
ryan 36d67f22e9 generic repeater 2019-03-13 11:24:18 -07:00
ryan 1bc8e7a8d1 merge master, works with bar gauge now 2019-03-13 11:12:11 -07:00
Sean Lafferty de338338bf Remove todo about index on user_id in user_auth because it exists 2019-03-13 13:46:49 -04:00
Sean Lafferty 7e62394d01 Add function in ds_proxy to handle oauthPassThru headers 2019-03-13 13:45:32 -04:00
Sean Lafferty f79dc0a89b Remove auth_module settings from oauthPassThru ui 2019-03-13 13:34:10 -04:00
Sean Lafferty 4324a7f51a Remove auth module from ds_proxy oauth test 2019-03-13 13:28:49 -04:00
Sean Lafferty 3b15e110a5 Get most recent oauth token from db, rather than lookup by auth_module 2019-03-13 13:22:22 -04:00
corpglory-dev 2bd64d2c31 Improve tooltip look 2019-03-13 19:44:18 +03:00
corpglory-dev a550e5388a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-13 19:31:40 +03:00
Steven Sheehy 17184257af explore/logs: Hide empty duplicates column 
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
 2019-03-13 11:12:29 -05:00
ryan 011b2cdf09 merge master 2019-03-13 09:10:21 -07:00
sridhar-komati 8acc00aa66 fix for firefox checkboxes not appearing properly, added appearance as none 2019-03-13 21:38:16 +05:30
ryan b4a3aecbbc merge master 2019-03-13 09:03:32 -07:00
ryan a17b1912c2 Merge remote-tracking branch 'grafana/master' into table-reducer 
* grafana/master: (95 commits)
  Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
  Add comments
  Add simple test for the ColorPicker
  Use render props pattern in color picker
  Move ColorPicker trigger to separate component and cleanup css
  Improved error handling when rendering dashboard panels, fixes #15913
  fix return type
  Only send ci metrics to hosted metrics instance
  adding types
  Added back branch guard
  moved delete button from sidebar to general tab and renamed it
  Refactoring the ci metrics a bit more making it easier to re-use
  removed unused and very specific variables, also variables with same value as general variable
  reduce loglevel to debug
  Updated bar gauge snapshot
  added some comments about state of components things
  heatmap: fix for negative values
  move sort to table processing
  onCellClick
  rotate!
  ...
 2019-03-13 08:38:25 -07:00
ryan b933c57c62 merge master 2019-03-13 08:36:51 -07:00
Sean Lafferty f17307bb97 Always return most recently used auth_module from GetAuthInfo 2019-03-13 11:29:13 -04:00
sridhar-komati 03d4b61208 used regex instead of string replacing 2019-03-13 20:42:19 +05:30
Torkel Ödegaard 4bbd6ab79c Merge pull request #15975 from grafana/fixed-alert-link-issue 
Fixed issue with AlertList panel links resulting in panel not found errors
 2019-03-13 15:52:14 +01:00
Torkel Ödegaard 91fc73bf82 Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680 2019-03-13 13:51:22 +01:00
Andrej Ocenas f7a8df6ebd Merge pull request #15926 from grafana/create-color-picker-trigger-component 
Create default ColorPickerTrigger component
 2019-03-13 12:47:52 +01:00
Andrej Ocenas fc199a35ca Add comments 2019-03-13 12:23:41 +01:00
Andrej Ocenas dfb2dd2500 Add simple test for the ColorPicker 2019-03-13 12:23:40 +01:00
Andrej Ocenas 96285c4f56 Use render props pattern in color picker 2019-03-13 12:23:39 +01:00
Andrej Ocenas 4a2905de97 Move ColorPicker trigger to separate component and cleanup css 2019-03-13 12:23:38 +01:00
Torkel Ödegaard d6bab53d3b Merge pull request #15626 from grafana/davkal/15607-explore-line-colors 
Explore: Make sure line graphs get different colors
 2019-03-13 12:21:44 +01:00
Torkel Ödegaard d8c2264670 Merge pull request #15970 from grafana/dashboard-rendering-error-handling 
Improved error handling when rendering dashboard panels
 2019-03-13 12:19:58 +01:00
Torkel Ödegaard 2333cf3fd1 Improved error handling when rendering dashboard panels, fixes #15913 2019-03-13 11:43:16 +01:00
Peter Holmberg 1994b18b5a fix return type 2019-03-13 11:37:33 +01:00
Torkel Ödegaard e31029adaa Merge pull request #14877 from papagian/feature-histogram-min-max 
Optionally set histogram x-axis min/max
 2019-03-13 11:23:30 +01:00
Torkel Ödegaard 9e7d1f4275 Merge pull request #15466 from grafana/bar-gauge-poc 
New Bar Gauge panel
 2019-03-13 11:12:33 +01:00
Torkel Ödegaard 7164412d84 Merge pull request #15968 from grafana/move-delete-dashboard 
Moved delete button in Dashboard settings
 2019-03-13 11:09:41 +01:00
Torkel Ödegaard 6445d6cb64 Merge pull request #15963 from grafana/sass-variable-cleanout 
Cleaned out some sass variables
 2019-03-13 11:09:18 +01:00
Torkel Ödegaard 78b2978846 Only send ci metrics to hosted metrics instance 2019-03-13 10:55:20 +01:00
Torkel Ödegaard 6f226edcc0 Merge branch 'ci-metrics-take2' 2019-03-13 10:50:34 +01:00
Peter Holmberg 9c33a9410f adding types 2019-03-13 10:50:21 +01:00
Torkel Ödegaard 988cc198d2 Added back branch guard 2019-03-13 10:50:17 +01:00
ijin08 c96b3995e4 moved delete button from sidebar to general tab and renamed it 2019-03-13 10:24:26 +01:00
Torkel Ödegaard 4f6fdd8665 Refactoring the ci metrics a bit more making it easier to re-use 2019-03-13 10:10:46 +01:00
ijin08 e632309ab9 removed unused and very specific variables, also variables with same value as general variable 2019-03-13 09:40:56 +01:00
bergquist f13263eb54 reduce loglevel to debug 2019-03-13 09:01:45 +01:00
Torkel Ödegaard 613e233440 Updated bar gauge snapshot 2019-03-13 08:50:44 +01:00
Torkel Ödegaard aa6a9329c3 Merge pull request #15842 from ryantxu/alpha-react-virtualized-table 
Alpha react-virtualized table
 2019-03-13 08:42:51 +01:00
Torkel Ödegaard af4de51a9a added some comments about state of components things 2019-03-13 08:39:40 +01:00
Torkel Ödegaard 71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
Torkel Ödegaard 6f683a8e9f Merge pull request #15953 from alexanderzobnin/fix-heatmap-negative-values 
Heatmap: fix for negative values
 2019-03-13 07:27:23 +01:00
ryan 15c111b39d better comments 2019-03-12 21:30:48 -07:00
ryan 8cca611727 comment cleanup 2019-03-12 21:25:35 -07:00
ryan f5e8734c6b force circleci to try again 2019-03-12 21:11:11 -07:00