Commit Graph

48 Commits (61cefe2372cbd2e1aec880ec798f27c19034ae7d)

Author SHA1 Message Date
Luke Morris 8f98a92c48 Merge branch 'master' into feature/annotations 2018-02-22 19:53:23 -08:00
Luke Morris 41244f4edc Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-15 12:03:10 -08:00
Iris Scholten b017bdbccd specify json representation of id and srcid to be string 2018-02-14 15:39:38 -08:00
Luke Morris c5d89c353d Remove Public; Improve Tab Names 2018-02-09 16:00:27 -08:00
Luke Morris 5f0ef591ea Merge branch 'master' into feature/mappings 2018-02-09 11:42:07 -08:00
Alex P f2cc269a33 Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-08 16:38:47 -08:00
Iris Scholten 0f2e163e50 Group=>ProviderOrganization; organization=>organiztionId; fix pointer bug 2018-02-06 18:33:27 -08:00
ischolten d83c1e8a63 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 25838cb9ea Add Mappings CUDA routes 2018-02-05 16:47:44 -05:00
Chris Goller 5ccab143b7 Add legend to dashboard cells 2018-02-05 14:25:57 -06:00
Michael Desa 64f670e819 Add correct implementation of mappings 2018-02-05 14:54:39 -05:00
Iris Scholten 20c2b4e7c4 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 adaff3e9e8 Merge branch 'master' into feature/global-users 2018-02-01 16:40:14 -08:00
Andrew Watkins ee865e304e Merge annotation-store 2018-01-19 10:11:53 -08:00
Chris Goller d5082e9a73 Fix integrations tests 2018-01-18 22:01:33 -06:00
Michael Desa ec4a00eb11 Fix RouteMatchesPrincipal if org isnt on principal 2018-01-17 12:42:32 -05:00
Michael Desa e8ed30a9e6 Populate links response with organiation on JWT 2018-01-17 12:26:28 -05:00
Michael Desa e1b071c002 Add correct users route to all routes 2018-01-16 17:03:46 -05:00
Michael Desa 6168dc3e06 Nest user routes under organization
Add global user routes
2018-01-16 16:45:58 -05:00
Michael Desa a48019b643 Allow UpdateUser to accept empty roles 2018-01-12 12:37:30 -05:00
Michael Desa f7f86f0ea6 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 6b11afe433 Apply mapping to user in /me 2018-01-11 16:10:27 -05:00
Michael Desa 732810fe64 Fix mappings on me response 2018-01-10 16:34:04 -05:00
Michael Desa be3b76629a Add mappings to organizations
Add links to organization response on me
2018-01-10 15:56:13 -05:00
Michael Desa 1a78819462 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 1c33580f99 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 aee4636d79 Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08: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 42fa762f7f Update integration test to timeout in 5 seconds rather than 0.1 2017-12-19 20:06:11 -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
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
Michael Desa f26d2f0f35 Change Organization ID to string from uint64 2017-12-19 10:13:43 -08:00
Jared Scheib 7c61a91191 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 b65003203f Missing comma 2017-12-18 13:00:27 -08:00
Luke Morris 0fa542b6b1 Minor tweaks based on PR review 2017-12-18 12:59:04 -08:00
lukevmorris 64523ab8c3 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 4d449ba32b Backup/Migrate/Initialize moved into Open
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-18 12:06:17 -08:00
Luke Morris 8843699303 Repair broken tests 2017-12-17 14:25:18 -08:00
Michael Desa 75d6c659f3 Allow SuperAdmins to change into any organization 2017-12-15 16:05:56 -08:00
Jared Scheib fbc224107e 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 8252fe5149 Fix wording on API integration tests
Format JSON in test to match others
2017-12-14 15:54:27 -08:00
Michael Desa 1f6f78d3fd Use serverContext for getting Config in NewUser 2017-12-14 13:34:19 -08:00
Luke Morris bc89216d2d 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 5bc2b85c11 Move principal expiry into body of test 2017-12-05 14:31:26 -05:00
Michael Desa 3b5d0b386b Remove "impossible" state from tests 2017-12-05 14:25:59 -05:00
Michael Desa 91b28d542e Add initial API integration tests 2017-12-04 15:56:53 -05:00