Commit Graph

782 Commits (2c8ce9029b62d3d75d50c643f1a3c7f95354b663)

Author SHA1 Message Date
Nathan Haugo 9a0d0ad54d Update changelog for 1.4.0.1 2018-01-25 13:09:45 -08:00
Andrew Watkins ee865e304e Merge annotation-store 2018-01-19 10:11:53 -08:00
Chris Goller 59b85c3f3a Update influxdb annotation store to support update/delete 2018-01-18 21:50:46 -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
Chris Goller 92b5cedff9 Add basic REST routes for annotations 2018-01-12 17:17:14 -06:00
Chris Goller 1629f6c56b Add epoch to influx query 2018-01-12 17:17:01 -06: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 a61eb73a19 Add logic mapping applying a mapping 2018-01-11 12:36:13 -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
Benjamin Schweizer 53d64492a3 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-01-10 21:44:07 +01:00
Deniz Kusefoglu 1080e9b730 Merge pull request #2409 from influxdata/multiple-event-handlers
Multiple event handlers
2018-01-10 12:32:22 -08:00
Michael Desa 4c33cf7846 Add rawUsers route to AllLinks 2018-01-10 11:18:08 -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
Chris Goller 89633f2f18 Update influxdb write proxy to allow self-signed certificates 2018-01-09 11:09:13 -06:00
Chris Goller f6bd84584a Update kapacitor proxy to allow self-signed certificates 2018-01-09 11:05:47 -06:00
deniz kusefoglu b45c88eae8 Merge branch 'master' into multiple-event-handlers 2018-01-04 18:14:06 -08:00
Michael Desa b41816c5cd Add /chronograf/v1/env endpoint to expose env vars
Some environment variables are needed by the front end. This PR
introduces a route so that those environment variables can be exposed.
Additionally, a new environment variable TELEGRAF_SYSTEM_INTERVAL was
added. This env var controls the rate at which the host list page will
update its red/green status.
2018-01-03 11:52:40 -08:00
Jared Scheib b1cd5b7695 Unprettier 2017-12-22 16:56:16 -08:00
Jared Scheib 4349e0a3f0 Add /users & /users/{id} routes & CRUD operations to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib ce505d1119 Add swagger definitions for Chronograf Users, User, & Role 2017-12-22 16:53:17 -08:00
Jared Scheib 7112ea66e0 Add read-only props & fix organization id to be string 2017-12-22 16:53:17 -08:00
Jared Scheib 7f5b641a77 Clarify & make consistent 403 error descriptions 2017-12-22 16:53:17 -08:00
Jared Scheib 937bc6f931 Clarify copy in Organizations descriptions 2017-12-22 16:53:17 -08:00
Jared Scheib f969d011bc Clean up swagger JSON 2017-12-22 16:53:17 -08:00
Jared Scheib 6f672dcffc Change 'multitenancy' tag to 'multiorganization' & 'multiuser' 2017-12-22 16:53:17 -08:00
Jared Scheib 0fb528a89d Add organization/{id} get, patch, & delete to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib b8a2a12896 Clarify swagger description copy 2017-12-22 16:53:17 -08:00
Jared Scheib d345f3d3d0 Make POST descriptions consistent 2017-12-22 16:53:17 -08:00
Jared Scheib 29e95db649 Add Organization resources & apis to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib 73dbc96a8f Change 'internal service error' to 'internal server error'; prettier 2017-12-22 16:53:17 -08:00
Nathan Haugo 93d8b10870 Bumpversion to 1.4.0.0 2017-12-22 12:59:04 -08:00
Alex Paxton da2d8a4fbd Merge pull request #2598 from influxdata/single-stat-colors-polish
Single Stat Colors Polish
2017-12-22 12:48:50 -08:00
Nathan Haugo efbb71e9d7 Update version 2017-12-21 11:36:03 -08:00
Alex P 367c3d61ba Merge branch 'master' into single-stat-colors-polish 2017-12-20 17:59:52 -08:00
Jared Scheib aee4636d79 Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08:00
Michael Desa 979ad34ed0 Check specific case when SA changes their status
SA - SuperAdmin
2017-12-20 16:34:31 -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 ace51b1553 Update CHANGELOG and versions to prep for 1.4.0.0-rc1 2017-12-19 18:38:46 -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 e0c100ea4e Remove unused code related to excess prints 2017-12-19 13:24:05 -08: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
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 e39ddeddcf Fix cell replacement to return query config 2017-12-19 13:43:39 -06: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
Michael Desa f26d2f0f35 Change Organization ID to string from uint64 2017-12-19 10:13:43 -08:00
Chris Goller a797a95e86 Update CLI option to reflect dashboards directory 2017-12-19 10:07:09 -08:00
Chris Goller a6ef15ee54 Add multiple dashboard stores to server 2017-12-19 10:07:07 -08:00
Chris Goller 4f3fd79abe Move MultiSourceStore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller d4a8cbb87c Move kapacitor multistore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller ce87c52fa9 Update layouts from canned package to filestore 2017-12-18 17:31:45 -08:00
Chris Goller 6c98cd49c4 Fix vet for tests 2017-12-18 17:31:45 -08:00
Chris Goller 3bd701441e Update layouts package to multistore 2017-12-18 17:31:45 -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 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
Benjamin Schweizer fb20f6eca3 Merge branch 'master' into master 2017-12-18 15:22:48 +01:00
Luke Morris 17759192b2 Refactor; simplify function responsibilities 2017-12-17 14:11:27 -08:00
Luke Morris 4faf9c5440 Clean up prior to PR 2017-12-16 13:54:55 -08:00
Luke Morris 2196a20100 Create backup of database when moving versions 2017-12-16 12:27:24 -08:00
Luke Morris d201fa941a WIP 2017-12-16 01:01:14 -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
Alex P bd3aec99ad Allow users to toggle between coloring text or background with single stat thresholds 2017-12-14 19:07:19 -08:00
Michael Desa 1f6f78d3fd Use serverContext for getting Config in NewUser 2017-12-14 13:34:19 -08:00
Nathan Haugo c42ebb3a86 Bump version to 1.4.0.0-beta2 2017-12-14 12:47:41 -08:00
Nathan Haugo a91b3ef104 Bump version to 1.4.0.0-beta2 2017-12-14 12:45:44 -08:00
Michael Desa f86004cda3 Add comment clarifying UsersStore Add method 2017-12-14 11:36:26 -08:00
Michael Desa e8861e9b74 Set SuperAdmin for NewUsers based on ConfigSetting 2017-12-14 11:11:51 -08:00
Jared Scheib 0e1bcfc9c6 Merge pull request #2355 from influxdata/multitenancy_all_users_superadmin_toggle
UI Toggle & API for SuperAdminFirstUserOnly server config
2017-12-14 10:54:18 -08:00
Jared Scheib 27fe23b161 Add comment about firstUser superAdmin logic 2017-12-14 10:46:55 -08:00
Michael Desa 4369c9d708 Add SuperAdmin to default org, even if private
Add user to default org if org is public
2017-12-13 17:38:57 -08:00
Michael Desa 2b60043016 Prevent users joining default org if private 2017-12-13 16:59:02 -08:00
Jared Scheib 058f5fbc20 Rename superAdminFirstUserOnly to superAdminNewUsers & flip default logic accordingly
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-13 14:49:49 -08:00
Jared Scheib a54712f600 Add config.self & config.auth routes, update client routes & make PATCH a PUT 2017-12-13 13:54:23 -08:00
Michael Desa 6059f155a1 Remove SuperAdminFirstUserOnly CLI flag
Wire up boltdb config store
2017-12-13 11:55:36 -08:00
Michael Desa c718847014 Wire up bolt db ConfigStore in Server 2017-12-13 10:46:08 -08:00
Michael Desa 9c989083a8 Add PUT /config/:section route 2017-12-13 09:28:39 -08:00
Michael Desa d0f63ca0e0 Add /config/:section endpoint 2017-12-13 09:04:44 -08:00
Benjamin Schweizer 0f9fb94e42 go fmt + got vet 2017-12-13 09:13:11 +01:00
Michael de Sa 17460e397b Implement Config GET service method
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-12-12 17:06:57 -08:00
Jared Scheib 1e42cd6e0e Add /config link to AllRoutes handler
Signed-off-by: Michael de Sa <mjdesa@gmail.com>
2017-12-12 15:11:30 -08:00
Michael Desa 49c8868e67 Prevent user joining private default org
Previously, if an organization was private and a user was removed from
the default organization, then they would be re-added. This behavior was
so left over from when we thought of the default organization as the
place where all users would exist. This PR removes that behavior.

There is one piece of odd behavior where a user's "current organization"
will be the default organization, but they will have no role in the
default organization.
2017-12-12 13:15:53 -08:00
Benjamin Schweizer f7c85429ef add support for RS256 signatures using JWKS 2017-12-10 18:26:27 +01:00
Deniz Kusefoglu ed7f38c943 Merge branch 'master' into multiple-event-handlers 2017-12-08 12:20:40 -08:00
Nathan Haugo 05fc484864 Update bumpversion with 1.4.0.0-beta1 2017-12-07 14:38:28 -06:00
Jared Scheib 31f012ff8f Merge branch 'master' into multitenancy 2017-12-06 19:05:16 -08:00
Jared Scheib 14e8e70484 Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 18:47:05 -08:00
Deniz Kusefoglu 903e461d40 Merge branch 'master' into multiple-event-handlers 2017-12-05 16:18:01 -08:00
Jared Scheib ff1cde524b Merge branch 'multitenancy' into multitenancy_fix_layouts 2017-12-05 16:03:05 -08:00
Michael Desa 8ff0e2947b Remove Create/Update/Delete logic for Layouts 2017-12-05 17:11:16 -05:00
Michael Desa c9471d4084 Remove /mappings in place of /layouts
Remove POST/PUT/DELETE methods to /layouts
2017-12-05 17:07:09 -05:00
Jared Scheib 9b87433ddf Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 13:37:46 -08:00
Nathan Haugo e5afdc3c23 Merge pull request #2410 from influxdata/gauge-cell-type
Gauge Dashboard Cell
2017-12-05 13:26:02 -08:00
Jared Scheib 4f43d2a137 Merge branch 'master' into multitenancy 2017-12-05 13:00:48 -08:00
Chris Goller 86843f73d3 Merge branch 'master' into feature/add-meta-auth 2017-12-05 14:37:47 -06:00
Alex P 6025c1224a Merge branch 'master' into gauge-cell-type 2017-12-05 12:12:16 -08:00
Jared Scheib c9e579acb2 Merge remote-tracking branch 'origin/master' into multitenancy 2017-12-05 11:43:23 -08:00
Michael Desa 8cfc6bbbae 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 ef1cadb7a4 Add basic auth or JWT tokens for meta queries 2017-12-04 18:07:08 -06:00
Michael Desa 9a701a0a65 Allow admins to update a superadmins roles 2017-12-04 16:53:30 -05:00
Chris Goller 67cda93a63 Merge branch 'master' into fix/basepath-logout 2017-12-04 15:00:07 -06:00
Andrew Watkins c474193181 Will not supply roles if there is no metaURL 2017-12-02 12:11:52 -08:00
Chris Goller d6d7081b1e Update oauth logout to include basepath 2017-12-01 15:35:39 -06:00
Deniz Kusefoglu 2a21a31d68 Return 422 error instead of 500 for bad alert rule data
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-01 11:15:57 -08:00
Deniz Kusefoglu ecdaf84961 Provide more verbose error for alert rule json parsing
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-01 11:05:38 -08:00
Jared Scheib 76b61a146e Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-11-30 19:07:40 -08:00
Jared Scheib 7588dcbf63 Complete 9ef1e57 by removing Role concept from sources in server 2017-11-30 19:03:56 -08:00
deniz kusefoglu 851149b397 Rename AlertHandlers to AlertNodes 2017-11-30 16:16:44 -08:00
Chris Goller f728c24764 Update kapacitor rule response to have empty arrays
Signed-off-by: Deniz Kusefoglu <denizk@gmail.com>
2017-11-30 16:32:47 -06:00
Michael Desa a81498f57a Change NewUsersNotSuperAdmin to SuperAdminFirstUserOnly 2017-11-30 15:01:52 -05:00
Chris Goller a841419bfb Update patching of enterprise users allow incremental updating of fields 2017-11-30 12:41:50 -06:00
Michael Desa a2df431c0d Make first user SuperAdmin 2017-11-30 12:56:13 -05:00
Michael Desa 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
Chris Goller 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
Michael Desa a455bac3ce Accept name,provider,scheme in UpdateUser if unchanged 2017-11-22 15:20:48 -05:00
Michael Desa 942671b604 Ensure that organzation on role is valid org id 2017-11-22 15:03:15 -05:00
Michael Desa 5fa2e212fa Disallow empty organization id create/update user 2017-11-22 14:49:44 -05:00
Michael Desa 688bdbd2a8 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 881bd11cf8 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 0e72c0d16b Add GENERIC_API_KEY to override of oauth2 responses to support azure 2017-11-21 16:55:03 -06:00
Andrew Watkins 82fecbd91c Fix broken test due to stupid new line 2017-11-21 11:34:26 -08:00
Andrew Watkins 5280589505 Handle nil cell in validateDashboardRequest 2017-11-21 11:27:48 -08:00
Andrew Watkins 6f6cde7179 Merge branch 'master' into feature/time-cop 2017-11-21 10:29:31 -08:00
Chris Goller 862c1fcade Update invalid swagger information for cell hex color length 2017-11-21 12:22:02 -06:00
Chris Goller 8181e1eaf7 Add colors to all cells 2017-11-21 12:16:23 -06:00
Jared Scheib 78705185f4 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 59fb016a4e Merge branch 'master' into multitenancy 2017-11-14 00:05:18 -08:00
Michael Desa 505e4fad57 Add organizations to newDashboardResponse tests 2017-11-13 23:37:50 -08:00
Jared Scheib 9b56045f8f 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 579f946f00 Fix tests broken in 96a362cb
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-11-13 23:10:26 -08:00
Michael Desa 7117835c52 Fix wording suggested in PR 2017-11-13 20:49:07 -08:00
Michael Desa 4e51963399 Add option to specify users are create as super admin 2017-11-13 20:44:50 -08:00
Michael Desa 1a235d881b 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 338916a340 Address PR feedback. 2017-11-13 18:08:50 -08:00
Luke Morris 0424f9f92e Make Public values explicit 2017-11-13 12:15:53 -08:00
Luke Morris 37d351f63b Sew up failing tests 2017-11-13 11:47:34 -08:00
Luke Morris 1aebbf2bd4 Clear test noise 2017-11-10 18:45:25 -08:00
Luke Morris 9eccded4b2 Reuse chronograf.Organization type 2017-11-10 18:31:30 -08:00
Luke Morris 6d2c7e18d1 Rename whitelistOnly => public 2017-11-10 18:23:41 -08:00
Luke Morris 5fbf1e140a Persist whitelistOnly changes to default organization 2017-11-10 16:43:11 -08:00