Commit Graph

6892 Commits (a61eb73a19846d742e9e1944e13015b85bc7103a)

Author SHA1 Message Date
Alex P dbdaa160db Do not require suffix in single stat graph 2017-12-21 00:13:50 -08:00
Alex P 0ad61caab4 Fix color validation logic 2017-12-21 00:13:27 -08:00
Jared Scheib eeae8d398c Merge pull request #2642 from influxdata/bugfix/rls-pls
DE UI fix
2017-12-20 19:04:31 -08:00
Hunter Trujillo 58ced8b03e updoot2 2017-12-20 19:57:17 -07:00
Hunter Trujillo 4c103d8eac Merge branch 'master' into bugfix/rls-pls 2017-12-20 19:56:44 -07:00
Jared Scheib e475fecfca Merge pull request #2632 from influxdata/feature/superadmin_gets_default_role
Give SuperAdmin DefaultRole on PUT /me
2017-12-20 18:07:55 -08:00
Alex P 1ed028f5db Fix merge issues 2017-12-20 18:00:10 -08:00
Alex P 367c3d61ba Merge branch 'master' into single-stat-colors-polish 2017-12-20 17:59:52 -08:00
Jared Scheib 2da402fa53 Update changelog 2017-12-20 17:52:41 -08:00
Jared Scheib aee4636d79 Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08:00
Nathan Haugo 2a41982c2f Merge pull request #2643 from influxdata/fix/add-changelog-for-2369
Add changelog for 2369
2017-12-20 16:57:50 -08:00
Nathan Haugo 0771d708ea Add changelog for 2369 2017-12-20 16:56:58 -08:00
Michael Desa 82c8646216 Merge pull request #2639 from influxdata/fix/prevent_demoting_superadmin_for_self
Prevent SuperAdmin from modifying their own status
2017-12-20 16:51:17 -08:00
Michael Desa 979ad34ed0 Check specific case when SA changes their status
SA - SuperAdmin
2017-12-20 16:34:31 -08:00
Jared Scheib 023705d9ab Notify user what role & organization they switched to
Show that notification for 4 seconds.
Change copy from 'signed in' to 'logged in'.
Remove concept of userHasRoleInOrg since now obsolete.
2017-12-20 16:20:12 -08:00
Alex P ac43e3b50b Disable SuperAdmin slide toggle on users own row 2017-12-20 16:05:07 -08:00
Alex P e53b702c31 Add disabled state logic to SlideToggle component 2017-12-20 16:04:37 -08:00
Alex P 66a635e84e Add styles for slide toggle disabled state 2017-12-20 16:00:34 -08:00
Hunter Trujillo ebcde4a3fd FIx issue with DE UI state not also updating Redux state when first used. 2017-12-20 16:49:57 -07:00
Michael Desa 0cc30d927f Prevent SuperAdmin from modifying their own status
Previously it was possible for SuperAdmins to remove their own status.
This could create an application state where there were no super admins.
This is not an acceptable application state.
2017-12-20 15:17:08 -08:00
Michael Desa 903e7033f4 Give SuperAdmin DefaultRole on PUT /me
Previously, SuperAdmins were given the admin role in an organization
when they switched into it (via a PUT to /me). This is undesireable for
the comonitoring organization. This PR gives SuperAdmins the default
role for the organization when they switch into it.
2017-12-20 14:20:24 -08:00
Chris Goller 1e93ac0baf Merge pull request #2626 from influxdata/1.4.0.x
Remove backup chronograf database
2017-12-19 21:05:11 -06:00
Chris Goller e672f174a3 Remove backup chronograf database 2017-12-19 20:56:32 -06:00
Chris Goller ec10257815 Merge pull request #2623 from influxdata/1.4.0.x
Prep release of 1.4.0.0-rc1
2017-12-19 20:31:52 -06:00
Chris Goller acc0a31e8d Merge pull request #2624 from influxdata/fix-integration-timings
Update integration test to timeout in 5 seconds rather than 0.1
2017-12-19 20:16:14 -06:00
Chris Goller 42fa762f7f Update integration test to timeout in 5 seconds rather than 0.1 2017-12-19 20:06:11 -06:00
Chris Goller 9eca2c156a Revert "Merge branch 'master' into 1.4.0.x"
This reverts commit f2869813ca, reversing
changes made to 7f5aea6414.
2017-12-19 19:31:18 -06:00
Chris Goller 143416cc2a Revert "Remove accidental chronograf db commit"
This reverts commit 93e9e40db1.
2017-12-19 19:26:49 -06:00
Chris Goller f2869813ca Merge branch 'master' into 1.4.0.x 2017-12-19 18:48:52 -06:00
Nathan Haugo 7f5aea6414 Merge pull request #2622 from influxdata/rel/update-1.4.0.0-rc1
Update CHANGELOG and versions to prep for 1.4.0.0-rc1
2017-12-19 16:43:09 -08:00
Chris Goller ace51b1553 Update CHANGELOG and versions to prep for 1.4.0.0-rc1 2017-12-19 18:38:46 -06:00
Chris Goller 93e9e40db1 Remove accidental chronograf db commit 2017-12-19 17:43:34 -06:00
Nathan Haugo ce45f13cdc Merge pull request #2593 from influxdata/feature/dashboard-filestore
Add filesystem backed dashboard and organization stores
2017-12-19 14:36:19 -08:00
Michael Desa 2dd7a971f4 Change default org id in client to "default" 2017-12-19 14:02:02 -08:00
Michael Desa e0c100ea4e Remove unused code related to excess prints 2017-12-19 13:24:05 -08:00
Chris Goller a8beb49ec3 Merge branch 'feature/dashboard-filestore' of github.com:influxdata/chronograf into feature/dashboard-filestore 2017-12-19 15:21:45 -06:00
Chris Goller a91953ecfb Update CHANGELOG.md to mention storing dashboards, orgs, sources, and
kapacitor on filesystem
2017-12-19 15:14:30 -06:00
Michael Desa ca055fe410 Add filestore impl of kapacitor and source stores
Remove random `fmt.Println`'s
2017-12-19 13:14:00 -08:00
Chris Goller be6b03d413 Merge pull request #2617 from influxdata/go-add-env-templates
Add env var golang templates to filestore rendering
2017-12-19 15:10:04 -06:00
Chris Goller 80cccfe821 Add env var golang templates to filestore rendering 2017-12-19 15:06:24 -06:00
Nathan Haugo 1319a3a527 Merge pull request #2616 from influxdata/fix/update-cell-query-config
Fix cell replacement to return query config
2017-12-19 12:40:30 -08:00
Chris Goller ee2dee6c0f Remove extra debugging statement from influx queries 2017-12-19 13:48:56 -06:00
Chris Goller 6162a34b8f Update CHANGELOG.md to mention fixing cell update responses 2017-12-19 13:47:51 -06:00
Chris Goller e39ddeddcf Fix cell replacement to return query config 2017-12-19 13:43:39 -06:00
Michael Desa 95c01ae080 Change default org ID to default from Default
This is so that the URL can be case insensitive. (e.g.
/chronograf/v1/organizations/default instead of
/chronograf/v1/organizations/Default)
2017-12-19 10:26:36 -08:00
Michael Desa 8a3de1994f Add basic tests for canned dashboards and orgs 2017-12-19 10:13:46 -08:00
Chris Goller fe2e2a865c Update Makefile to require go 1.8 for testing
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-19 10:13:46 -08:00
Chris Goller 7d56fdfc75 Add organization multistore over bolt and filesystem
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-19 10:13:46 -08:00
Chris Goller 6fbd4d6c17 Add filesystem implementation of the organization store
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-19 10:13:46 -08:00
Chris Goller fe404c35cc Fix dashboard filesystem store pointer-less struct
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-19 10:13:46 -08:00