public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,655 Commits 655 Branches 650 Tags
fdb48b7bbc2ae4e73e861d3dffc08b9b74818d27
Commit Graph
18655 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Carl Bergquist fdb48b7bbc Merge pull request #14531 from grafana/golang_1.11.4 
Upgrade go version to 1.11.4
 2018-12-19 10:09:56 +01:00
Torkel Ödegaard 5f2937431f Merge pull request #14572 from grafana/develop-draggable-panel 
Another take on resizing the panel, now using react-draggable
 2018-12-19 10:07:45 +01:00
Johannes Schill 9cd0067187 Add min/max height when resizing and replace debounce with throttle 2018-12-19 09:08:56 +01:00
bergquist a6d90151da changelog: adds note about closing #14546 2018-12-19 08:58:14 +01:00
Carl Bergquist 251e80aa5e Merge pull request #14547 from jacobrichard/master 
Adding CIDR capability to auth_proxy whitelist
 2018-12-19 08:55:03 +01:00
Jacob Richard 34d3086ec8 Adding tests for auth proxy CIDR support 2018-12-18 21:16:29 -06:00
bergquist ea84ec6229 changelog: adds note about closing #14109 2018-12-18 22:49:38 +01:00
Carl Bergquist 854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot 
Add support for deleting external snapshots from Snapshots List
 2018-12-18 22:43:12 +01:00
Johannes Schill a007730f5d Another take on resizing the panel, now using react-draggable 2018-12-18 17:22:30 +01:00
Victor Cinaglia 48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
Torkel Ödegaard a4091813bf Merge pull request #14534 from grafana/14409/threshold-ux-changes 
14409/threshold ux changes
 2018-12-18 11:30:48 +01:00
Torkel Ödegaard e56b478709 Merge pull request #14551 from grafana/explore-ds-fixes 
Explore: Datasource fixes
 2018-12-18 10:38:31 +01:00
Torkel Ödegaard e8f9174d08 Minor update 2018-12-18 09:58:27 +01:00
Erik Sundell ad3d36e6b7 Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id 2018-12-18 09:44:51 +01:00
bergquist 3c6bcde8b2 changelog: adds note about closing #14548 2018-12-18 08:22:02 +01:00
Carl Bergquist ac458a4e4b Merge pull request #14511 from grafana/go-ldap-v3 
ldap: upgrades go-ldap to v3
 2018-12-18 08:18:40 +01:00
Torkel Ödegaard 1b1f8ebadc Merge pull request #14541 from grafana/minor-cleanup 
Minor cleanup now that angular panel edit is no longer
 2018-12-18 07:36:31 +01:00
Jacob Richard 0b50582b56 Adding CIDR capability to auth_proxy whitelist 2018-12-17 23:43:14 -06:00
Torkel Ödegaard 705cbb4095 Minor cleanup now that angular panel edit is no longer 2018-12-17 21:29:25 +01:00
Torkel Ödegaard 1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +01:00
Carl Bergquist 7653d8a197 Merge pull request #14468 from bergquist/db_lock 
Infra package for creating distributed lock to make sure functions are executed once even in HA mode.
 2018-12-17 16:51:11 +01:00
Erik Sundell 2835c4336d filter out table responses that don't have columns and rows 2018-12-17 16:46:22 +01:00
Torkel Ödegaard 7d248cb415 Merge remote-tracking branch 'origin/master' into 14409/threshold-ux-changes 2018-12-17 16:45:46 +01:00
Erik Sundell 18b39967fc enable goto explore from query panel editor for all datasources 2018-12-17 16:44:57 +01:00
bergquist 7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist dbcc2e868d adds integration tests to ci build 2018-12-17 16:36:57 +01:00
bergquist 11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist c565b018c5 clean up integration tests 2018-12-17 16:36:57 +01:00
bergquist 823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
bergquist dc49bebb00 adds server lock package 2018-12-17 16:36:57 +01:00
bergquist ff136b6ba8 initial verison of server lock 2018-12-17 16:36:57 +01:00
Torkel Ödegaard c0fc236fcb Merge pull request #14535 from grafana/react-graph-changes 
React graph changes
 2018-12-17 16:29:00 +01:00
Torkel Ödegaard c20e10a584 Merge branch 'master' into 14409/threshold-ux-changes 2018-12-17 16:25:33 +01:00
Torkel Ödegaard 0fe452ec26 Minor react graph panel refactorings and fixes 2018-12-17 15:38:51 +01:00
Torkel Ödegaard cfae98fae2 Merge pull request #14532 from grafana/fixes-to-user-and-team-picker 
Fixes issues with user and team picker
 2018-12-17 14:56:05 +01:00
Peter Holmberg adebbd9559 sorting tests for change value 2018-12-17 14:37:12 +01:00
Torkel Ödegaard e80a287f7a Merge pull request #14510 from grafana/14484-table-format-string-epochs 
In Table Panel, renders epoch string as date if date column style
 2018-12-17 14:37:00 +01:00
Torkel Ödegaard e38a04ba9a Fixes issues with user and team picker 2018-12-17 14:31:43 +01:00
Peter Holmberg e7f966d002 fixing coloring 2018-12-17 14:26:19 +01:00
bergquist 17f8be90ae upgrade to golang 1.11.4 2018-12-17 14:25:47 +01:00
Peter Holmberg 98490084a1 remove printed index 2018-12-17 14:18:28 +01:00
Peter Holmberg e11834e950 updating test 2018-12-17 14:16:29 +01:00
Peter Holmberg ade2f297a7 adding threshold 2018-12-17 14:15:04 +01:00
Torkel Ödegaard 0fd92ef6fb Refactoring react graph 2018-12-17 13:55:25 +01:00
Torkel Ödegaard 3efaf52049 Merge pull request #14274 from grafana/develop 
Develop (New Panel Edit UX & Explore All Datasources suppport) -> Master
 2018-12-17 13:35:59 +01:00
Torkel Ödegaard 1ac81c3ad0 updated dropdown typeahead to place down instead of up, works better when inside scrollable area 2018-12-17 13:08:09 +01:00
Torkel Ödegaard 7455dfcc84 minor style tweak 2018-12-17 12:57:40 +01:00
Erik Sundell f673d60dae Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-17 11:17:58 +01:00
Erik Sundell e84e6740e6 propagate initial state back to explore query runner 2018-12-17 11:17:16 +01:00
Torkel Ödegaard d912677d80 Merge pull request #14520 from Soitora/patch-1 
OAuth Title Fix
 2018-12-17 07:22:48 +01:00