Commit Graph

1968 Commits (f555af6c10ed3a1c1a7018bd91482217c2d51920)

Author SHA1 Message Date
Chris Goller f555af6c10 Merge pull request #101 from influxdata/feature/#54-tr-enterprise-client
Implement Enterprise/OSS client for user and role management
2017-02-24 15:01:15 -06:00
Chris Goller e1764a7c02 Update source timeseries client to change if meta server is set 2017-02-24 14:48:42 -06:00
Jared Scheib 4cb46aef28 Merge pull request #926 from influxdata/fix-kapacitor-graph-height
Fix Kapacitor rule graph display
2017-02-24 12:22:44 -08:00
Jared Scheib d0fd8e017a Update changelog 2017-02-24 12:10:32 -08:00
Jared Scheib 6d4df1f45b Fix Kapacitor rule graph display 2017-02-24 12:06:47 -08:00
Chris Goller 1f9be2e4aa Merge branch 'master' into feature/#54-tr-enterprise-client
Conflicts:
	bolt/internal/internal.pb.go
2017-02-24 13:02:32 -06:00
Chris Goller 77f69b4971 Merge pull request #851 from influxdata/feature/connection-info#825
Add meta server field in connection config
2017-02-24 12:14:29 -06:00
Chris Goller f525a09f5b Update wording for meta service 2017-02-24 12:08:12 -06:00
Chris Goller 51e105c2ba Fix bad merge 2017-02-24 11:48:51 -06:00
Chris Goller 701a041a88 Merge branch 'master' into feature/connection-info#825
Conflicts:
	CHANGELOG.md
2017-02-24 11:29:43 -06:00
Chris Goller 1f878aa6d9 Fix enterprise create user to add permissions 2017-02-24 01:16:28 -06:00
Chris Goller b8fa581248 Enhance server logging for connection errors 2017-02-24 00:34:50 -06:00
Chris Goller f60a358751 Merge branch 'master' into feature/#54-tr-enterprise-client
Conflicts:
	Makefile
	chronograf.go
	server/routes.go
	server/users.go
2017-02-23 23:26:09 -06:00
Chris Goller 6581dc7ec2 Add roles endpoint and switching between OSS and enterprise 2017-02-23 21:54:20 -06:00
Jared Scheib cd2b7c9d3d Merge pull request #924 from influxdata/751-stack_graph
Update canned Docker layouts via PUT request
2017-02-23 17:30:29 -08:00
Jared Scheib bc0f8b3556 Update canned layouts via PUT request, rather than manually 2017-02-23 17:22:16 -08:00
Chris Goller b29846da68 Merge pull request #922 from influxdata/feature/oauth-google
Support Multiple OAuth2 Providers - Add Heroku and Google
2017-02-23 17:34:01 -06:00
Tim Raymond 6202736230 Updated README and CHANGELOG [ci skip]
- Added Oauth2 support for Heroku and Google (#922)
2017-02-23 18:32:50 -05:00
Tim Raymond 6a9e61c740 Merge branch 'master' into feature/oauth-google
Conflicts:
	server/dashboards.go
	server/server.go
	ui/.eslintrc
	ui/src/index.js
2017-02-23 18:13:39 -05:00
Jared Scheib 93a89271bd Merge pull request #920 from influxdata/751-stack_graph
Display stacked and step plot graphs
2017-02-23 14:56:36 -08:00
Jared Scheib 2ef362da93 Validate displayOptions prop 2017-02-23 14:49:27 -08:00
Jared Scheib 6c67dcf402 Merge 'master' into 751-stack_graph, resolve conflicts 2017-02-23 14:33:07 -08:00
Jared Scheib 03a6624d78 Update changelog 2017-02-23 14:26:48 -08:00
Tim Raymond 1b5b568d2a Move OAuth configuration into server/server.go
This uses a provide() function in server/server.go, to push the
necessary oauth2.Provider and oauth2.Mux into the scope of the
server.Mux. This allows the server.Mux to configure its routes without
caring which Providers are enabled, which switches/ENVs are set etc. It
configures its routes optimistically and leaves the higher-order logic
to decide whether to actually invoke the logic used by the mux to
configure routes for that provider.
2017-02-23 17:17:28 -05:00
Jared Scheib 8a769ce31e Display stacked and step plot graphs 2017-02-23 14:09:21 -08:00
Jared Scheib b7f4909685 Add stacked and stepplot graph display options as new types to canned Docker graphs and swagger def 2017-02-23 14:08:45 -08:00
Andrew Watkins 2fa8f91af5 Set set CSSTransforms to false 2017-02-23 16:05:11 -06:00
Chris Goller 08271f25ef Add roles to chronograf 2017-02-23 16:02:53 -06:00
Andrew Watkins d44bb842fe Merge pull request #908 from influxdata/feature/885-presentation-mode-1
Dashboardstravaganza
2017-02-23 15:36:20 -06:00
Andrew Watkins c728f33bc5 Merge branch 'master' into feature/885-presentation-mode-1 2017-02-23 15:35:03 -06:00
Alex P e1a45cdc8e Make presentation mode have less margin around the edges
Needs a window resize event to re-calculate the grid’s size
2017-02-23 12:07:44 -08:00
Alex P 4ea7b1ee00 Make entire dash edit button clickable and add text label
++usability
2017-02-23 12:03:01 -08:00
Alex P 147e44075a Make dashboards only have edit styles in edit mode 2017-02-23 11:45:26 -08:00
Alex P 486afb82cb Change dashboard classnames to new classnames from last commit 2017-02-23 11:45:07 -08:00
Alex P f86631ac7a Move dash graph styles from Hosts to Dashboards and rename generic 2017-02-23 11:44:32 -08:00
Andrew Watkins 4c08488fc7 Merge branch 'feature/885-presentation-mode-1' of github.com:influxdata/chronograf into feature/885-presentation-mode-1 2017-02-23 13:10:06 -06:00
Andrew Watkins 88f41f1b14 Make host layouts not draggable or resizable 2017-02-23 13:09:04 -06:00
Andrew Watkins 73560c37e4 Update AJAX function names 2017-02-23 08:27:25 -06:00
Andrew Watkins 4787d4e4cd Merge pull request #917 from influxdata/nav-experiment
Side Nav Simplification
2017-02-22 21:04:42 -06:00
Andrew Watkins d2d1f9f81e Update CHANGELOG 2017-02-22 20:49:32 -06:00
Alex P c4c8f26096 Block text selection on graph heading & hosts graph 2017-02-22 18:48:54 -08:00
Alex P 6eb6d68dff Simplify side nav 2017-02-22 18:15:29 -08:00
Alex P 0616110dd6 Hard code kubernetes dash into dashboards table 2017-02-22 18:14:56 -08:00
Alex P a55c275315 Refactor dashboards page a tiny bit 2017-02-22 18:14:39 -08:00
Andrew Watkins d2957dda8c Use single source of truth for layout state 2017-02-22 16:24:41 -06:00
Andrew Watkins b8fe3fc59a Update reducer with new dashboard position 2017-02-22 16:22:56 -06:00
Chris Goller 5eed15b450 Merge branch 'master' into feature/#54-tr-enterprise-client 2017-02-22 13:56:22 -06:00
Andrew Watkins c7d117f10e Merge pull request #909 from influxdata/new-icons
7 New Icons
2017-02-22 12:58:56 -06:00
Chris Goller 10b0e1f623 Add examples for most swagger JSON schemas 2017-02-22 12:52:55 -06:00
Alex P 70f3aa1f48 7 New Icons 2017-02-22 09:46:57 -08:00