Commit Graph

587 Commits (d875757ce35d6d5e1608581f117001f6fd2a2ac3)

Author SHA1 Message Date
Michael Desa 4496c361d7 Add PUT /config/:section route 2017-12-13 09:28:39 -08:00
Michael Desa 5ec549db0f Add /config/:section endpoint 2017-12-13 09:04:44 -08:00
Michael de Sa fcd25ad580 Implement Config GET service method
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-12-12 17:06:57 -08:00
Jared Scheib 5038f8532b Add /config link to AllRoutes handler
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-12 15:11:30 -08:00
Nathan Haugo 1e8a66dffa Update bumpversion with 1.4.0.0-beta1 2017-12-07 14:38:28 -06:00
Jared Scheib 482a4de6c1 Merge branch 'master' into multitenancy 2017-12-06 19:05:16 -08:00
Jared Scheib bbe1330cbf Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 18:47:05 -08:00
Jared Scheib 808163fe69 Merge branch 'multitenancy' into multitenancy_fix_layouts 2017-12-05 16:03:05 -08:00
Michael Desa e5e65dfc1b Remove Create/Update/Delete logic for Layouts 2017-12-05 17:11:16 -05:00
Michael Desa fc0d525022 Remove /mappings in place of /layouts
Remove POST/PUT/DELETE methods to /layouts
2017-12-05 17:07:09 -05:00
Jared Scheib 987d462de3 Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 13:37:46 -08:00
Nathan Haugo 4afa71a2f4
Merge pull request #2410 from influxdata/gauge-cell-type
Gauge Dashboard Cell
2017-12-05 13:26:02 -08:00
Jared Scheib 1323a062b7 Merge branch 'master' into multitenancy 2017-12-05 13:00:48 -08:00
Chris Goller 62db317268
Merge branch 'master' into feature/add-meta-auth 2017-12-05 14:37:47 -06:00
Alex P 5f6a9a9087 Merge branch 'master' into gauge-cell-type 2017-12-05 12:12:16 -08:00
Jared Scheib 93f11e1325 Merge remote-tracking branch 'origin/master' into multitenancy 2017-12-05 11:43:23 -08:00
Michael Desa 06db8a885f Allow for empty MetaURL in UpdateSource
Currently, if an empty source is supplied, then the source's meta url
will not be updated. Now, if the MetaURL is supplied and is different
than the one that is currently on the source, the value will be updated.
Even in the case of empty string meta urls.
2017-12-05 13:04:31 -05:00
Chris Goller 6db56147a8 Add basic auth or JWT tokens for meta queries 2017-12-04 18:07:08 -06:00
Michael Desa 15a1c45cf1 Allow admins to update a superadmins roles 2017-12-04 16:53:30 -05:00
Chris Goller 7d35d3b3d1
Merge branch 'master' into fix/basepath-logout 2017-12-04 15:00:07 -06:00
Andrew Watkins 87fa2c1c91 Will not supply roles if there is no metaURL 2017-12-02 12:11:52 -08:00
Chris Goller 3f760c1b1b Update oauth logout to include basepath 2017-12-01 15:35:39 -06:00
Jared Scheib f8920cf39b
Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-11-30 19:07:40 -08:00
Jared Scheib 6b7a18d666 Complete 9ef1e57 by removing Role concept from sources in server 2017-11-30 19:03:56 -08:00
Michael Desa 6feba85807 Change NewUsersNotSuperAdmin to SuperAdminFirstUserOnly 2017-11-30 15:01:52 -05:00
Chris Goller 52e1175c7d Update patching of enterprise users allow incremental updating of fields 2017-11-30 12:41:50 -06:00
Michael Desa 86b9c0d985 Make first user SuperAdmin 2017-11-30 12:56:13 -05:00
Michael Desa 9ef1e57934 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
Chris Goller 6564712e9d 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
Michael Desa 6ca8bf5089 Accept name,provider,scheme in UpdateUser if unchanged 2017-11-22 15:20:48 -05:00
Michael Desa 8f7363b3f4 Ensure that organzation on role is valid org id 2017-11-22 15:03:15 -05:00
Michael Desa ec20267c2f Disallow empty organization id create/update user 2017-11-22 14:49:44 -05:00
Michael Desa f2591c9eb1 Change HTTP Status 401 to 403 in AuthorizedUser
This signals to the front end that a user must go through another ouath
flow.
2017-11-21 18:55:26 -05:00
Michael Desa cf82990623 Return HTTP Status 403 if org not found in /me
Fix returning non-standard status from AuthorizedUser
2017-11-21 18:53:42 -05:00
Chris Goller c87bfe1678 Add GENERIC_API_KEY to override of oauth2 responses to support azure 2017-11-21 16:55:03 -06:00
Andrew Watkins 59fb33387b Fix broken test due to stupid new line 2017-11-21 11:34:26 -08:00
Andrew Watkins 33e83254e5 Handle nil cell in validateDashboardRequest 2017-11-21 11:27:48 -08:00
Andrew Watkins 5398c791b1
Merge branch 'master' into feature/time-cop 2017-11-21 10:29:31 -08:00
Chris Goller e0246bc840 Update invalid swagger information for cell hex color length 2017-11-21 12:22:02 -06:00
Chris Goller 1d11677c5f Add colors to all cells 2017-11-21 12:16:23 -06:00
Jared Scheib 9b89e42777 Add mock.Store to queries test
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-11-16 13:01:20 -08:00
Jared Scheib f38b80a30d Merge branch 'master' into multitenancy 2017-11-14 00:05:18 -08:00
Michael Desa 489127cecb Add organizations to newDashboardResponse tests 2017-11-13 23:37:50 -08:00
Jared Scheib 05c76d3c52 Add Organization ID to dashboards response
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-11-13 23:28:41 -08:00
Michael de Sa 65bc529831 Fix tests broken in 96a362cb
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-11-13 23:10:26 -08:00
Michael Desa fdc6dc4aa3 Fix wording suggested in PR 2017-11-13 20:49:07 -08:00
Michael Desa 011b0bfb73 Add option to specify users are create as super admin 2017-11-13 20:44:50 -08:00
Michael Desa 5b64cb4dc3 Use default organization default role in me
Forbid users from application if they have no roles and were not
explicitly added in private organization
2017-11-13 19:28:15 -08:00
Luke Morris b3d0d6eeee Address PR feedback. 2017-11-13 18:08:50 -08:00
Luke Morris b543e64ef1 Make Public values explicit 2017-11-13 12:15:53 -08:00