Torkel Ödegaard
98daceade0
fix: fixed typescript test error
2018-09-11 19:08:32 +02:00
Torkel Ödegaard
ec41d76080
mobx -> redux: major progress on folder migration
2018-09-11 19:00:37 +02:00
Torkel Ödegaard
dd01abc544
another circleci fix
2018-09-11 18:37:02 +02:00
Torkel Ödegaard
48d1ebacbb
Another circleci fix
2018-09-11 18:32:19 +02:00
Torkel Ödegaard
207ce0cde1
changed gometalinter to use github master
2018-09-11 18:29:50 +02:00
Torkel Ödegaard
888ac27e25
commented out metalinter as gopkg is having issues
2018-09-11 18:24:07 +02:00
Torkel Ödegaard
19cbff658b
wip: folder settings page to redux progress
2018-09-11 17:36:23 +02:00
David
d8a702cba3
Fix prometheus label filtering for comparison queries ( #13213 )
...
- Now supports click filtering for queries like `metric > 0.1`
2018-09-11 16:57:43 +02:00
Peter Holmberg
0768a078ed
Upgrade react and enzyme ( #13224 )
...
* upgrade to latest react and fixed failing test
* upgrading libs
* grunt exec update due to change filename
* new yarn lock
* updated snaps
2018-09-11 16:31:34 +02:00
bergquist
1638c6bea1
enable partial tag matches for annotations
2018-09-11 15:50:04 +02:00
Torkel Ödegaard
89ea47e7fb
Merge branch 'master' into folder-to-redux
2018-09-11 15:07:03 +02:00
Patrick O'Carroll
953bdc4dc0
put folder name under dashboard name, tweaked aliginments in search results
2018-09-11 14:53:38 +02:00
bergquist
19c7dd9834
support template variables with multiple values
2018-09-11 14:25:25 +02:00
Peter Holmberg
9f73f13091
Teams page replace mobx ( #13219 )
...
* creating types, actions, reducer
* load teams and store in redux
* delete team
* set search query action and tests
* Teampages page
* team members, bug in fetching team
* flattened team state, tests for TeamMembers
* test for team member selector
* team settings
* actions for group sync
* tests for team groups
* removed comment
* remove old stores
* fix: formating of datasource.go
* fix: minor changes to imports
* adding debounce and fixing issue in teamlist
* refactoring: moving types to their own files
2018-09-11 14:14:03 +02:00
bergquist
6ba5550f5f
renames jest files to match new convention
2018-09-11 14:09:08 +02:00
Torkel Ödegaard
1ce9001141
upgrade of typescript and tslint and jest ( #13223 )
2018-09-11 13:48:13 +02:00
Mitsuhiro Tanda
28250271cc
fix nil pointer dereference ( #13221 )
2018-09-11 12:53:39 +02:00
bergquist
abd5a74e4c
Merge branch 'master' into 9587_annotation_tags_wih_temp_var
...
* master: (3328 commits)
removes protoc from makefile
changelog: note about closing #11681
Adding Centrify configuration for Oauth
refactor: moved stuff into new features dir manage-dashboards
move: moved styleguide to admin
fix: fixed singlestat test broken due to file move
moved folders from features into the main feature folder they belong to
Add jsonnet with grafonnet-lib to provisioning docs
fix: Dashboard permissions now shows correctly, fixes #13201
Update CHANGELOG.md
redux: do not use redux logger middleware in production builds
Allow oauth email attribute name to be configurable (#13006 )
Document required order for time series queries (#13204 )
refactor: changed AlertRuleItem pause action to callback
Fix query builder queries for interval start
renaming things in admin
release 5.2.4
changelog: release 5.2.4
refactoring: custom scrollbars PR updated, #13175
changelog: add notes about closing #13121
...
2018-09-11 11:04:29 +02:00
bergquist
2936e34d75
removes protoc from makefile
2018-09-11 10:53:21 +02:00
Torkel Ödegaard
61112d93d8
wip: folder to redux
2018-09-11 10:36:55 +02:00
Patrick O'Carroll
1599806b75
Merge remote-tracking branch 'origin' into 11056-folder-m
2018-09-11 09:50:15 +02:00
Carl Bergquist
2f9675b3f8
Merge pull request #13217 from mike-sol/master
...
Add Centrify documentation for generic_oauth
2018-09-11 09:34:48 +02:00
bergquist
b8a881646a
changelog: note about closing #11681
2018-09-11 09:25:08 +02:00
Carl Bergquist
5069e4eadd
Merge pull request #11681 from Jonnymcc/sort-dashboard-tags
...
Sort results from GetDashboardTags
2018-09-11 09:19:30 +02:00
Mike Sollanych
6b0de126ce
Merge pull request #1 from mike-sol/add-centrify-docs
...
Adding Centrify configuration for Oauth
2018-09-10 13:31:00 -07:00
Mike Sollanych
55e42b5fff
Adding Centrify configuration for Oauth
...
Just some simple directions for configuring Centrify to enable oauth login!
2018-09-10 13:30:29 -07:00
Torkel Ödegaard
679ffbfd83
wip: progress on redux folder store
2018-09-10 21:49:04 +02:00
Torkel Ödegaard
9caa030108
Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux
2018-09-10 21:14:33 +02:00
Torkel Ödegaard
108a20196f
Merge branch 'master' into teams-page-replace-mobx
2018-09-10 19:31:19 +02:00
Peter Holmberg
0cfcf2685e
actions for group sync
2018-09-10 16:58:17 +02:00
Peter Holmberg
b1fe0c4c7e
team settings
2018-09-10 15:53:58 +02:00
Torkel Ödegaard
59b5b146da
wip: began folder to redux migration
2018-09-10 14:30:42 +02:00
Peter Holmberg
841bd5817d
test for team member selector
2018-09-10 14:27:33 +02:00
Peter Holmberg
d494ebc730
flattened team state, tests for TeamMembers
2018-09-10 14:19:27 +02:00
Marcus Efraimsson
35a24032a7
Merge pull request #13208 from grafana/fix-dashboard-permissions
...
fix: Dashboard permissions now shows correctly
2018-09-10 14:00:55 +02:00
Torkel Ödegaard
6c90a53654
refactor: moved stuff into new features dir manage-dashboards
2018-09-10 13:59:31 +02:00
Torkel Ödegaard
e4d9620fc0
move: moved styleguide to admin
2018-09-10 13:38:45 +02:00
Torkel Ödegaard
0f98dcdef0
fix: fixed singlestat test broken due to file move
2018-09-10 13:34:33 +02:00
Torkel Ödegaard
17e99bb38a
Merge branch 'master' of github.com:grafana/grafana
2018-09-10 13:29:57 +02:00
Torkel Ödegaard
34567bc4f1
moved folders from features into the main feature folder they belong to
2018-09-10 13:29:27 +02:00
Carl Bergquist
7e0637aa9d
Merge pull request #12260 from strohi/panelids-for-htmlbookmark
...
added id tag to Panels for html bookmarking on longer Dashboards
2018-09-10 13:01:35 +02:00
Marcus Efraimsson
3fe3f3741f
Merge pull request #13200 from svenklemm/postgres-query-builder-fixes
...
Fix query builder queries for interval start
2018-09-10 13:01:17 +02:00
Marcus Efraimsson
227bf85e5e
Merge pull request #13184 from svenklemm/postgres-interval_ms
...
Fix postgres quoting to handle non-string values
2018-09-10 12:43:10 +02:00
Carl Bergquist
37af10c61f
Merge pull request #13209 from metalmatze/docs-jsonnet
...
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:59:31 +02:00
Matthias Loibl
d561104b64
Add jsonnet with grafonnet-lib to provisioning docs
2018-09-10 11:45:23 +02:00
Torkel Ödegaard
9cfe2a7f5c
fix: Dashboard permissions now shows correctly, fixes #13201
2018-09-10 11:35:59 +02:00
Torkel Ödegaard
628ef2d9a9
Update CHANGELOG.md
2018-09-10 10:43:00 +02:00
Torkel Ödegaard
267b96cb48
Merge branch 'master' of github.com:grafana/grafana
2018-09-10 09:54:30 +02:00
Torkel Ödegaard
298c088d57
Merge branch 'redux-poc2'
2018-09-10 09:54:14 +02:00
Torkel Ödegaard
5c58a7d7f4
redux: do not use redux logger middleware in production builds
2018-09-10 09:53:52 +02:00
