Commit Graph

48 Commits (e356b932d4ffa90d66bbf5cc98ddf54c429f87a2)

Author SHA1 Message Date
Luke Morris ab8a73509a Merge branch 'master' into feature/annotations 2018-02-22 19:53:23 -08:00
Luke Morris 59b6979812 Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-15 12:03:10 -08:00
Iris Scholten 4c73fb562d specify json representation of id and srcid to be string 2018-02-14 15:39:38 -08:00
Luke Morris c136a2f5f0 Remove Public; Improve Tab Names 2018-02-09 16:00:27 -08:00
Luke Morris 67ac6a5a2f Merge branch 'master' into feature/mappings 2018-02-09 11:42:07 -08:00
Alex P 66b41abdce Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-08 16:38:47 -08:00
Iris Scholten 3c3e524b46 Group=>ProviderOrganization; organization=>organiztionId; fix pointer bug 2018-02-06 18:33:27 -08:00
ischolten b2cfb67256
Merge pull request #2703 from influxdata/feature/global-users
Add global users page for super admins
2018-02-06 14:30:08 -08:00
Michael Desa efd691d1b5 Add Mappings CUDA routes 2018-02-05 16:47:44 -05:00
Chris Goller a565027394 Add legend to dashboard cells 2018-02-05 14:25:57 -06:00
Michael Desa 8b60388d81 Add correct implementation of mappings 2018-02-05 14:54:39 -05:00
Iris Scholten b4bdf27d88 update the config_test and server_test files to accept super admin status as false 2018-02-05 10:41:31 -08:00
Iris Scholten 5fbfc12f11 Merge branch 'master' into feature/global-users 2018-02-01 16:40:14 -08:00
Andrew Watkins 7fbb4d877c Merge annotation-store 2018-01-19 10:11:53 -08:00
Chris Goller 79551ce3fe Fix integrations tests 2018-01-18 22:01:33 -06:00
Michael Desa 8fa2eabdb3 Fix RouteMatchesPrincipal if org isnt on principal 2018-01-17 12:42:32 -05:00
Michael Desa 23a4c34a17 Populate links response with organiation on JWT 2018-01-17 12:26:28 -05:00
Michael Desa f3c57f1e3f Add correct users route to all routes 2018-01-16 17:03:46 -05:00
Michael Desa 2d7828b602 Nest user routes under organization
Add global user routes
2018-01-16 16:45:58 -05:00
Michael Desa 4afb444579 Allow UpdateUser to accept empty roles 2018-01-12 12:37:30 -05:00
Michael Desa d74d8f35f9 Add wildcard role and validate users roles in CRUD
The server may now specify a '*' to indicate that the server should
retrieve the organizations default role and assign it to the user.
2018-01-12 12:27:55 -05:00
Michael Desa 0b89623db8 Apply mapping to user in /me 2018-01-11 16:10:27 -05:00
Michael Desa de61afc850 Fix mappings on me response 2018-01-10 16:34:04 -05:00
Michael Desa 2eb68a3b36 Add mappings to organizations
Add links to organization response on me
2018-01-10 15:56:13 -05:00
Michael Desa acf3de93cd Allow for different canned resource paths
Previously, users had to place all canned resources (layouts,
dashboards, sources, kapacitors, and organizations) in a single
directory. This work introduces a way to specify two directories.
One for application layouts and one for the other resources.

Users may still place all resources in a single directory if they'd
like.
2018-01-09 17:34:36 -05:00
Michael Desa 0d6a508a00 Modify CRUD user handlers for global operations
Add raw query param middleware performing raw ops

This commit introduces middleware that allows SuperAdmin Users to
specify a query param `raw=true` which will give them raw access to the
data store. Raw access means that it is not in behind the usual
organization facade.

Currently, only the user routes use this middleware.
2018-01-09 13:43:33 -05:00
Jared Scheib f91a2e436d Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08:00
Michael Desa 14af1aa115 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 ab9e686bbb 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 020c7c6901 Update integration test to timeout in 5 seconds rather than 0.1 2017-12-19 20:06:11 -06:00
Michael Desa 9f0476c459 Add filestore impl of kapacitor and source stores
Remove random `fmt.Println`'s
2017-12-19 13:14:00 -08:00
Michael Desa c649095326 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 014048631c Add basic tests for canned dashboards and orgs 2017-12-19 10:13:46 -08:00
Michael Desa d8d20547ab Change Organization ID to string from uint64 2017-12-19 10:13:43 -08:00
Jared Scheib 2ba29d6937
Merge pull request #2591 from influxdata/multitenancy_no_switch_to_orgs_where_no_role
Allow SuperAdmin to switch to orgs where they have no role
2017-12-18 13:44:21 -08:00
Luke Morris 0042cb5c05 Missing comma 2017-12-18 13:00:27 -08:00
Luke Morris 071b8b4f82 Minor tweaks based on PR review 2017-12-18 12:59:04 -08:00
lukevmorris 7663df8884
Merge pull request #2604 from influxdata/2599-backup-database-on-upgrade
After Chronograf version upgrade, backup database on server start
2017-12-18 12:11:28 -08:00
Luke Morris fcdc4efb2c Backup/Migrate/Initialize moved into Open
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-18 12:06:17 -08:00
Luke Morris 8bd97fa14e Repair broken tests 2017-12-17 14:25:18 -08:00
Michael Desa a4736148c0 Allow SuperAdmins to change into any organization 2017-12-15 16:05:56 -08:00
Jared Scheib 933291918b Reference known issue #2601 in Admin creating SuperAdmin response
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-15 15:05:27 -08:00
Michael Desa 6820977a38 Fix wording on API integration tests
Format JSON in test to match others
2017-12-14 15:54:27 -08:00
Michael Desa 4223767c53 Use serverContext for getting Config in NewUser 2017-12-14 13:34:19 -08:00
Luke Morris 1e08695a1f Repair go integration spec - we return 403s now
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-12-06 18:50:53 -08:00
Michael Desa a245dd7c38 Move principal expiry into body of test 2017-12-05 14:31:26 -05:00
Michael Desa 87dcb3cfcd Remove "impossible" state from tests 2017-12-05 14:25:59 -05:00
Michael Desa ab6dfe2ac7 Add initial API integration tests 2017-12-04 15:56:53 -05:00