public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,840 Commits 655 Branches 650 Tags
ca6bfebb7bcc2cde7aa66c224960f018e800a702
Commit Graph
16840 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard ca6bfebb7b Update CHANGELOG.md 2018-10-12 11:40:19 +02:00
Torkel Ödegaard b5e1a8d7be Merge pull request #13638 from grafana/minor-setting-refactoring 
minor setting refactorings
 2018-10-12 08:58:21 +02:00
Torkel Ödegaard d6292f8345 removed unused setting variable 2018-10-12 08:15:01 +02:00
Torkel Ödegaard d5d8d7efa6 minor setting refactorings 2018-10-12 07:55:36 +02:00
Torkel Ödegaard c1fd4265a9 renamed extension point in the frontend 2018-10-12 07:19:05 +02:00
Torkel Ödegaard cdfbcbce22 updated circleci build-container version 2018-10-11 22:06:36 +02:00
Torkel Ödegaard 4aa7dc0c85 minor change to cloudwatch code formatting 2018-10-11 12:58:17 -07:00
Torkel Ödegaard caf995bb94 Merge branch 'update-cloudwatch-extended-stats-check' of https://github.com/apalaniuk/grafana into apalaniuk-update-cloudwatch-extended-stats-check 2018-10-11 12:55:09 -07:00
Torkel Ödegaard a69013c833 Merge pull request #13611 from grafana/remove-user-from-org-and-system 
Remove user form org in single org setup improvement
 2018-10-11 21:54:07 +02:00
Torkel Ödegaard 69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Torkel Ödegaard c368c72d40 minor ux fix for new select 2018-10-11 12:50:58 -07:00
Torkel Ödegaard b49f4a8c86 Merge pull request #13632 from mrudelle/master 
13340 complete oauth doc
 2018-10-11 21:30:42 +02:00
Dan Cech 19b69a82af fmt 2018-10-11 15:26:06 -04:00
Matthieu Rudelle 3aef519cdc grafana/grafana#13340 complete oauth doc 2018-10-11 21:22:02 +02:00
Torkel Ödegaard b671b9704f changed property name to UserWasDeleted and added an assert for it 2018-10-11 12:20:53 -07:00
Adam Palaniuk 58a156ba03 Update check for invalid percentile statistics 2018-10-11 14:00:34 -05:00
Marcus Efraimsson bcdda7b9ad devenv: fix influxdb block 2018-10-11 17:17:10 +02:00
Marcus Efraimsson 90f6817f6f docs: refer to v5.3 instead of v5.2 2018-10-11 16:36:28 +02:00
Marcus Efraimsson ff5e4e2885 Merge pull request #13618 from grafana/stackdriver-docs-update 
stackdriver docs: metric query editor and annotations
 2018-10-11 16:25:23 +02:00
Daniel Lee 03fefd7bea docs: stackdriver fixes after review 
- index page datasource order changed
- image links changed to the image box format
- incorrect sentence fixed
 2018-10-11 15:42:47 +02:00
Johannes Schill 7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00
Daniel Lee 9f660a7b18 stackdriver docs: metric query editor and annotations 2018-10-11 14:42:34 +02:00
Torkel Ödegaard b7599212e0 Merge pull request #13620 from grafana/frontend-extensions 
Frontend extensions
 2018-10-11 14:41:11 +02:00
Marcus Efraimsson db1325cc24 changelog: add notes about closing #13616 
[skip ci]
 2018-10-11 13:49:50 +02:00
Marcus Efraimsson 776b14f7bb Merge pull request #13617 from grafana/13616_phantomjs_legend 
fix phantomjs render of graph panel when legend displayed as table to the right
 2018-10-11 13:47:34 +02:00
Torkel Ödegaard 795b0ca90f Merge pull request #13619 from grafana/13591/loading-indicators-config-pages 
Adding loading spinner to org pages
 2018-10-11 13:02:47 +02:00
Torkel Ödegaard abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
Peter Holmberg 02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Marcus Efraimsson fc79ba30ae fix phantomjs render of graph panel when legend as table to the right 2018-10-11 11:46:07 +02:00
Marcus Efraimsson 026463f902 changelog: add notes about closing #13172 
[skip ci]
 2018-10-11 10:26:13 +02:00
Marcus Efraimsson 1b32ff5795 Merge pull request #13609 from Yukinoshita-Yukino/master 
elasticsearch: fix no limit size in terms aggregation for alerting queries
 2018-10-11 10:21:58 +02:00
Yuan Liu 18dfdc4f0d add test for es alert when group by has no limit 2018-10-11 16:04:57 +08:00
Torkel Ödegaard 5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +02:00
Torkel Ödegaard 9585dc7825 added the UserWasRemoved flag to make api aware of what happened to return correct message to UI 2018-10-11 07:58:22 +02:00
Torkel Ödegaard 5b5cb6622d Remove user form org now completely removes the user from the system if the user is orphaned 2018-10-11 07:48:35 +02:00
Yuan Liu f8a8b213f9 remove tab 2018-10-11 11:40:23 +08:00
Yuan Liu 567db87c3a bug fix 
bug fix
 2018-10-11 11:36:40 +08:00
Yuan Liu 3b9ab6e204 Update time_series_query.go 
fix alert no data when elasticsearch group by terms size is set to no limit
 2018-10-11 11:21:06 +08:00
Marcus Efraimsson 974eddee8f changelog: add notes about closing #11711 
[skip ci]
 2018-10-10 19:24:13 +02:00
Marcus Efraimsson bc3b7357bd Merge pull request #13400 from connection-reset/concurrent-sql 
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection 
lifetime configurable in the data source settings
 2018-10-10 19:12:38 +02:00
Dan Cech a4f90fd10d add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Marcus Efraimsson 4757ca2242 docs: add version notes 2018-10-10 18:59:09 +02:00
Torkel Ödegaard 39b25e0596 Merge pull request #13536 from grafana/davkal/explore-text-match 
Explore: highlight typed text in suggestions
 2018-10-10 18:50:14 +02:00
Johannes Schill a42227cdff Css fix for selected option 2018-10-10 16:21:08 +02:00
Johannes Schill 127b7d92f8 Merge branch '13425-team-picker-bug' of https://github.com/grafana/grafana into 13425-team-picker-bug 2018-10-10 15:05:04 +02:00
Johannes Schill 9a8a476776 Updated test snapshot #13425 2018-10-10 15:02:13 +02:00
David Kaltschmidt dcee0771ad Initialize Explore datasource correctly 2018-10-10 14:55:41 +02:00
Johannes Schill 501d974eaa Remove the fixed widths and make it possible to pass it in as a prop instead #13425 2018-10-10 14:15:28 +02:00
Johannes Schill 77d06a0924 User filtering now works properly at the backend #13425 2018-10-10 14:15:28 +02:00