Commit Graph

133 Commits (d58f06b2321050b4e342986a43fda5ab0ac35923)

Author SHA1 Message Date
Brandon Farmer fe35f189ed Test & refactor basepath validation into dedicated fn 2018-04-23 17:02:00 -07:00
Jared Scheib 2f573fcafb Clean up regexp guard logic for valid basepath 2018-04-20 19:01:23 -07:00
Jared Scheib 97c84cbe6e Remove prefix-routes & clean up basepath var and flag use
Now, if basepath is set, it will be prefixed to all routes.
There is no more additional option of prefix-routes.
2018-04-20 18:40:09 -07:00
Jared Scheib 094f96a73b Match basepath against regexp to ensure proper format 2018-04-20 18:40:09 -07:00
Jared Scheib 923d73a418 Fail server if basepath contains trailing or starting '/' 2018-04-20 18:39:49 -07:00
Jared Scheib dca6270f73 Change useidtoken to use-id-token for consistency 2018-03-28 13:31:24 -07:00
Benjamin Schweizer a231ec1108 added USE_ID_TOKEN option, defaulting off 2018-03-28 15:51:10 +02:00
Benjamin Schweizer 335d8dbb99 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-03-28 13:30:05 +02:00
Jared Scheib 880ec03ae0 Fix Auth0SuperAdminOrg server option description to indicate only one org is acceptable 2018-03-23 14:53:43 -07:00
Michael Desa 471c227295 Add mapPrincipalToSuperAdmin function
The function grants a super superadmin status if the user belongs to a
particular auth0 organization and adds them to the default organization.
2018-03-23 15:48:34 -04:00
Jared Scheib 83ef44b576 WIP 2018-03-23 12:17:22 -07:00
Benjamin Schweizer 227009723d merged upstream, updated comments, added GroupFromClaims() 2018-02-20 09:47:42 +01:00
Michael Desa 64f670e819 Add correct implementation of mappings 2018-02-05 14:54:39 -05:00
Benjamin Schweizer 53d64492a3 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-01-10 21:44:07 +01: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 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
Michael Desa ca055fe410 Add filestore impl of kapacitor and source stores
Remove random `fmt.Println`'s
2017-12-19 13:14:00 -08: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
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
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 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
Benjamin Schweizer 0f9fb94e42 go fmt + got vet 2017-12-13 09:13:11 +01:00
Benjamin Schweizer f7c85429ef add support for RS256 signatures using JWKS 2017-12-10 18:26:27 +01:00
Jared Scheib c9e579acb2 Merge remote-tracking branch 'origin/master' into multitenancy 2017-12-05 11:43:23 -08:00
Michael Desa a81498f57a Change NewUsersNotSuperAdmin to SuperAdminFirstUserOnly 2017-11-30 15:01:52 -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
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 36e14cb111 Refactor data stores into a common interface 2017-10-31 16:41:17 -04:00
Michael Desa bea2caaa7f Move organization resouces to their own package 2017-10-30 14:31:19 -04:00
Michael Desa 1082b264fe Use organization stores 2017-10-30 12:05:59 -04:00
Michael Desa 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
Jared Scheib 3b2818688a Make all Store names plural for consistency 2017-10-24 15:54:24 -07:00
Michael Desa b5e73dfd46 Add CRUD routes for organizations 2017-10-20 15:42:34 -04:00
Jared Scheib 974e9eaf7d Add 'type' to new-sources server flag example 2017-08-11 11:54:16 -07:00
Jared Scheib 6540ea308d Clarify BoltPath server flag help text with default path 2017-07-21 11:41:54 -07:00
Chris Goller 8dc08278bd Add JWT shared secret influxdb auth
Refactor --new-sources to simplify adding shared secrets
2017-07-19 01:39:06 -05:00
Jared Scheib 5ec506b8fb Merge branch 'master' into feature/persist_datasource_flag-1555 2017-07-07 14:45:00 -07:00
Tim Raymond a7fc16cb17 Fix bad merge conflict resolution
Duplicate definitions of the same property were present because of
confusing placement of merge conflict markers.
2017-07-07 16:59:19 -04:00
Tim Raymond 5b5dbee078 Merge master into feature/tr-auth0-organizations
Conflicts were the addition of CLI flags from a concurrent branch.
2017-07-07 16:18:01 -04:00
Jared Scheib fea0a330eb Correct comment 2017-07-06 15:04:04 -07:00
Jared Scheib 10c317c083 Refactor process new sources into named func 2017-07-06 14:27:14 -07:00
Jared Scheib d7e73f55ad Move NewSources input prep to server
Signed-off-by: Tim Raymond <tim@timraymond.com>
2017-07-06 14:12:07 -07:00