31f012ff8f
Merge branch 'master' into multitenancy
2017-12-06 19:05:16 -08:00
14e8e70484
Merge branch 'multitenancy' into multitenancy_reset_current_org
2017-12-05 18:47:05 -08:00
ff1cde524b
Merge branch 'multitenancy' into multitenancy_fix_layouts
2017-12-05 16:03:05 -08:00
2ec8da815b
Remove Organization field from layouts
2017-12-05 17:28:33 -05:00
9b87433ddf
Merge branch 'multitenancy' into multitenancy_reset_current_org
2017-12-05 13:37:46 -08:00
c9e579acb2
Merge remote-tracking branch 'origin/master' into multitenancy
2017-12-05 11:43:23 -08:00
adce9f159c
Merge pull request #2435 from influxdata/multitenancy_prevent_bad_add_org_user
...
Prevent unintended update of existing user on Add; fix duplicate User & Org creation client UX
2017-12-04 14:15:27 -08:00
4cb40dee33
Change ErrOrganizationNameTaken to ErrOrganizationAlreadyExists for consistency
2017-11-30 20:12:00 -08:00
76b61a146e
Merge branch 'multitenancy' into multitenancy_reset_current_org
2017-11-30 19:07:40 -08:00
ff9dd97026
Add Num to UsersStore interface
2017-11-30 12:55:59 -05:00
57b876ad36
Unscope sources by role
...
Previously, as a misunderstanding of
https://github.com/influxdata/chronograf/issues/1915 we allowed
sources to be scoped by role within an organization. This was incorrect.
We no longer user the roles implementation of a chronograf.SourcesStore
and just use the organizations store.
We've left the code around a roles SourcesStore in place, since it may
be useful to us in the future. It may be worth removing if it is
determined that this behavior is not desirable.
2017-11-29 17:32:41 -05:00
3a07920d4c
Merge branch 'master' into gauge-cell-type
...
Conflicts:
bolt/internal/internal.pb.go
bolt/internal/internal.proto
server/cells.go
2017-11-27 16:08:42 -06:00
bde2e11cc1
Format TimeShift struct property descriptions
2017-11-21 10:37:07 -08:00
8181e1eaf7
Add colors to all cells
2017-11-21 12:16:23 -06:00
59fb016a4e
Merge branch 'master' into multitenancy
2017-11-14 00:05:18 -08:00
9eccded4b2
Reuse chronograf.Organization type
2017-11-10 18:31:30 -08:00
6d2c7e18d1
Rename whitelistOnly => public
2017-11-10 18:23:41 -08:00
b110a28278
Add WhitelistOnly to organizations
...
Fix adding default role to organization
2017-11-10 15:57:48 -05:00
e98e1896ae
WIP Add shifts to queryConifg on backend
2017-11-10 11:06:48 -08:00
9920f5e90e
Ensure users name, provider, and scheme are unique
2017-11-10 12:29:17 -05:00
d41a89debf
Refactor and simplify auto group by (:interval:) template variable
2017-11-09 10:02:24 -08:00
d40a374274
Add comments suggested from PR review
...
Add tests to server/stores_test.go
2017-11-07 13:59:40 -05:00
8ded387a81
Add Role to chronograf.Source
2017-11-06 11:24:10 -05:00
7200aaf9f9
Add default org logic to OrganizationsStore
...
Update resource handlers to appropriate consume default organization IDs
2017-11-06 10:14:12 -05:00
292143f01b
Add comment to default role in chronograf.go
2017-11-06 09:46:00 -05:00
63f7d8205c
Add default role to chronograf.Organization
2017-11-06 09:46:00 -05:00
b67b2e8d6e
Fix over-stringification of organization on roles
2017-11-02 21:52:30 -04:00
f95a2963db
Merge pull request #2215 from influxdata/multitenancy_add_orgs_to_me
...
Add CurrentOrganization & Organizations to me resp
2017-11-02 15:38:49 -04:00
bf22d1d57d
Ensure uniqueness of organization names in bolt
2017-11-02 13:04:41 -04:00
311c68f457
Add CurrentOrganization & Organizations to me resp
...
Remove CurrentOrganization from chronograf.User
2017-11-02 11:59:53 -04:00
e7a94c18d6
Add comments throughout codebase
2017-11-01 12:30:42 -04:00
f863bf2042
Add support for super admin
2017-10-31 18:27:24 -04:00
d6a0ab3488
Change OrganizationID to Organization in Roles
...
Fix formatting of proto file
2017-10-30 12:28:57 -04:00
d6d3463208
Merge remote-tracking branch 'origin/multitenancy' into multitenancy_orgs
...
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-10-26 18:21:30 -04:00
5e08464ecf
Provide route to change current users organization
...
Add current Organization to JWT.
Use OrganizationUsersStore to retrieve Users that are not me.
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-10-26 18:06:52 -04:00
c720f8a9cb
Merge pull request #2140 from influxdata/feature/kapa-insecure
...
Add insecure ssl support to connect to kapacitor
2017-10-26 10:40:28 -04:00
cf530eddc6
Update Organization comments on resources
...
Remove `omitempty` on Organization field
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-10-25 14:56:08 -04:00
e56299e72f
Remove Organization from bolt Stores
...
Previously, each store depended on having an organization set on the
implentation of a store. This was used to segment different
organizations into different buckets. This PR undoes that work.
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-10-25 14:29:14 -04:00
e909ce9a1e
Add Organizations to Dashboards
2017-10-25 14:00:06 -04:00
57468b5fbe
Add Organization to layouts
2017-10-25 12:52:56 -04:00
71decb761e
Add Organization to chronograf.Server
2017-10-25 12:42:50 -04:00
ef079a1899
Add Organization to Sources
2017-10-25 11:51:15 -04:00
aa8742662f
Merge branch 'master' into multitenancy
2017-10-24 17:58:15 -07:00
3b2818688a
Make all Store names plural for consistency
2017-10-24 15:54:24 -07:00
0aa28d7066
Add OrganizationUsersStore
...
bolt/organization_users_store contains a boltdb implementation of a
chronograf.UsersStore that filters the results based on the organization
that is set on the context.
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-10-24 13:29:46 -04:00
4353f8ac86
Merge pull request #2128 from influxdata/feature/qc-v2-alias
...
FEATURE: queryConfig v2 && custom field alias persistence
2017-10-20 20:32:33 -07:00
faac66a9bd
Nest resources under Organizations
...
For each organization, we create a set of buckets for each associated
resource (sources, servers, layouts, and dashbaords).
The bucket name is the path join of the resource bucket name and the
oranizations name. If the organizations name is empty, then the bucket
name is the resource bucket name (this is backwards compatible with how
resources are currently stored).
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-10-20 13:50:19 -04:00
de6ae41c60
Implement basic bolt OrganizationsStore
2017-10-20 11:13:13 -04:00
30096623f9
Define Organization and OrganizationsStore
...
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-10-20 10:10:38 -04:00
1b6724122c
Add insecure ssl support to connect to kapacitor
2017-10-19 22:48:31 -05:00
Jared Scheib
Michael Desa
Jared Scheib
Chris Goller
Andrew Watkins
Luke Morris
Nathan Haugo