Commit Graph

81 Commits (b378dd7c27ff077d8b03254941f581a8a63f5fbd)

Author SHA1 Message Date
Jared Scheib 4e2617ea24 Merge branch 'master' into feature/admin
Conflicts:
	CHANGELOG.md
	enterprise/users.go
	server/admin.go
	server/admin_test.go
	ui/.eslintrc
	ui/src/shared/constants/index.js
	ui/src/store/configureStore.js
	ui/src/style/theme/theme-dark.scss
2017-03-10 18:36:37 -08:00
Jared Scheib b71f1b0cd0 Add tests for role create and update, refactor user create test 2017-03-10 16:48:56 -08:00
Jared Scheib b105f94673 Fix update dropdown when adding users, roles, and permissions (except users/roles), rename success actions for use across AJAX update requests, pass through error on AJAX update failure 2017-03-10 16:22:03 -08:00
Andrew Watkins 8aaa6117f5 Fix tests 2017-03-10 12:52:18 -08:00
Andrew Watkins 9a322d7b78 Add permissions to redux store 2017-03-10 08:35:51 -08:00
Jared Scheib bda2521d7c Rename action to redux convention 2017-03-09 13:59:10 -08:00
Jared Scheib dcaa72b57c Add tests for creating user 2017-03-09 12:48:37 -08:00
Jared Scheib cbe074ccdc Add test for removeAddedUser 2017-03-06 23:23:14 -08:00
Jared Scheib cf08585df9 Add test for addUser 2017-03-06 23:21:10 -08:00
Jared Scheib 2081ab96bc Resolve conflicts to merge 'feature/934-ew-admin' into 'feature/934-ew-admin_add-user' 2017-03-06 23:09:51 -08:00
Jared Scheib b577515b06 Refactor to test combined appReducer, add tests for ephemeral app state reducer 2017-03-03 17:06:47 -08:00
Jared Scheib 80e6e14b0d Add test for autoRefresh reducer 2017-03-03 16:57:05 -08:00
Andrew Watkins 57be2b90b9 Move editMode state into redux 2017-02-22 11:05:20 -06:00
Andrew Watkins f8f1507379 Use redux for dashboard time range 2017-02-22 11:05:20 -06:00
Andrew Watkins eee44a2d42 Add dashboard timeRange to reducer 2017-02-22 11:05:20 -06:00
Andrew Watkins de644286cb Move current dashboard into dashboard reducer 2017-02-22 11:05:20 -06:00
Andrew Watkins efeffd4fa2 Introduce dashboard ui reducer 2017-02-22 11:05:20 -06:00
Jared Scheib 26277032e8 Merge branch 'master' into kapacitor-padding 2017-02-16 18:03:08 -08:00
Jared Scheib 7c484963a2 Refactor tests for clarity and simplicity 2017-02-16 14:51:22 -08:00
Jared Scheib e9028cc7a7 Test for unpadded range when passing in values well within extremities 2017-02-15 18:29:30 -08:00
Jared Scheib 31a599de07 Test for padded range when passing in values at range extremities 2017-02-15 18:28:44 -08:00
Andrew Watkins 4e3fd92730 Merge pull request #880 from influxdata/deui-reducer
DataExplorer ui reducer
2017-02-15 17:00:47 -06:00
Andrew Watkins 2c0a30b931 Introduce data explorer ui reducer 2017-02-13 17:16:54 -06:00
Andrew Watkins a5c3571ec1 Add spec for timeRange reducer 2017-02-13 15:29:17 -06:00
Hunter Trujillo 12e7688a49 Merge branch 'master' into http-tcp
# Conflicts:
#	CHANGELOG.md
2017-02-10 16:03:30 -07:00
Chris Goller f81cd7e7ad Merge pull request #868 from influxdata/disable-alert
Change rule status
2017-02-10 16:41:28 -06:00
Hunter Trujillo 57bf5f571a Merge branch 'master' into http-tcp
# Conflicts:
#	CHANGELOG.md
2017-02-10 13:31:01 -07:00
Hunter Trujillo d428aaf8c7 Refactor parseAlerta spec to test reducer, accessors, and parser separately. Refactor parseAlerta out of rules reducer into its own file in shared/prasing. Update appearance of AlertaConfig. Update appearance of RuleMessage input field. Remove smtp and alerta from default alerts. 2017-02-10 13:03:31 -07:00
Andrew Watkins 95e38a4767 Change rule status 2017-02-10 13:42:42 -06:00
Andrew Watkins e9d8b77a96 Move constants into constants file 2017-02-10 09:04:18 -08:00
Hunter Trujillo a8eaa0979e Add Alerta tick script input to configure kapacitor rule alert config. 2017-02-10 00:19:20 -07:00
Andrew Watkins deb69d668c Merge github.com:influxdata/chronograf into de-organize 2017-02-09 10:26:59 -08:00
Chris Goller 7deaf845a7 Merge pull request #852 from influxdata/feature/kapacitor-detail-field
Update kapacitor alert rule to have detail field
2017-02-08 20:50:48 -06:00
Andrew Watkins c6050d4273 Remove concept of Panels 2017-02-08 13:58:15 -08:00
Andrew Watkins b84179f913 Merge pull request #841 from influxdata/de-struction
Simplify DataExplorer
2017-02-08 08:38:56 -08:00
Andrew Watkins a31518de9c Introduce UPDATE_DETAILS action 2017-02-07 15:15:43 -08:00
Andrew Watkins 63725d544f Fix typo 2017-02-06 12:53:36 -08:00
Andrew Watkins f1dd929725 Remove getState in new object 2017-02-06 12:50:31 -08:00
Andrew Watkins 954a6506fc Add active panel spec 2017-02-06 11:54:22 -08:00
Andrew Watkins 7ef4f9f916 Move test dir to data_explorer 2017-02-06 11:41:42 -08:00
Hunter Trujillo 9507f67b42 Improve performance of the new function by a factor of 3-4x using a memoization technique. 2017-01-29 04:41:07 -07:00
nathan haugo c8333acd2f Revert to f3cb3fb72b 2017-01-26 18:13:27 -08:00
Nathan Haugo 0c02deedd9 Revert "Revert "Bugfix/legend data order"" 2017-01-26 18:00:14 -08:00
Nathan Haugo 8067b32b17 Revert "Bugfix/legend data order" 2017-01-26 17:55:21 -08:00
Nathan Haugo 1da41c760a Merge pull request #799 from influxdata/bugfix/legend-data-order
Bugfix/legend data order
2017-01-26 17:54:19 -08:00
Hunter Trujillo bfdba8de74 Add reducer spec for shared/sources. Add nodemon script to package.json to help with TDD. Fix actual issue: duplicate defaults in sources. 2017-01-26 16:55:05 -07:00
Andrew Watkins b8bb570ecc Cleanup comments 2017-01-26 11:09:04 -08:00
Andrew Watkins 5b200a315f Include support for tags 2017-01-26 11:07:34 -08:00
Hunter Trujillo 9fbbdedc69 Add dygraphSeries. Tests pass. 2017-01-25 14:25:03 -07:00
Andrew Watkins 93dc0ca125 WIP handle duplicate field and measurement names
This solution can now handle an arbitrary number of
responses and series.  Once we munge the series out
into one flat collection, we utilize the index of each
series to identify duplicate labels.
2017-01-24 11:50:41 -08:00