5ec506b8fb
Merge branch 'master' into feature/persist_datasource_flag-1555
2017-07-07 14:45:00 -07:00
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
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
12f1a8ce4b
Add test for creating NewSources via server flag
...
Move TestLogger to mocks
Signed-off-by: Tim Raymond <tim@timraymond.com>
2017-07-07 12:56:12 -07:00
fea0a330eb
Correct comment
2017-07-06 15:04:04 -07:00
10c317c083
Refactor process new sources into named func
2017-07-06 14:27:14 -07:00
d7e73f55ad
Move NewSources input prep to server
...
Signed-off-by: Tim Raymond <tim@timraymond.com>
2017-07-06 14:12:07 -07:00
ac0598f95c
Allow server to run even if NewSources errors out
2017-07-06 12:05:05 -07:00
3c3602a724
Update error messages to use plural
2017-07-06 11:48:14 -07:00
abff00f88f
Add sample usage
...
Make flag identifier plural since JSON array of objects
2017-07-06 11:44:42 -07:00
52e65be69d
Successfully persist new source and kapa via server flag
...
Move this to after BoltDb connection is opened
2017-07-05 18:12:08 -07:00
b1f8ff81c3
Parse JSON for --new-source into struct
...
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-07-05 15:00:59 -07:00
0c8b543806
Add pseudocode outline for parsing and persisting source and server
...
Signed-off-by: Tim Raymond <tim@timraymond.com>
2017-06-29 15:33:22 -07:00
de9d0df860
Group flags more semantically consistently
2017-06-29 14:27:30 -07:00
639bce7217
Group flags more semantically consistently
2017-06-29 14:25:41 -07:00
788aec07db
Improve description of custom link use, and give example ( #1676 )
2017-06-28 14:41:13 -07:00
5a4817baf6
Support Organizations in Auth0
...
It's useful for operators to classify users into separate groups which
we have termed "organizations". For other OAuth providers, the notion of
an organization typically fell along company lines. For example,
MegaCorp might have a "MegaCorp" GitHub organiztion, and all email
addresses would have the domain "megacorp.com".
Auth0 is slightly different in that MegaCorp would likely run their own
Auth0 provider for their internal services, so "organizations" in Auth0
are no longer synonymous with "large organizations" (or companies).
Instead, Auth0 organizations could be used to restrict access to
Chronograf instances based on team membership within an organization.
To make use of Auth0 organizations, operators should modify users'
app_metadata to include the key "organization". Its value should be the
organization which that user belongs to. This can be done automatically
through arbitrary rules using Auth0 Rules.
2017-06-28 16:29:52 -04:00
e9f6568074
Clarify error output for missing Name or URL
2017-06-27 13:40:26 -07:00
33127d7915
Error out server if CustomLinks invalid on run
...
Signed-off-by: Chris Goller <goller@gmail.com>
2017-06-27 13:31:35 -07:00
91bae804e1
Refactor links_test to use table test and cleaner error check
...
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-06-27 13:30:34 -07:00
200225d2e2
Conserve memory allocation for customLinks slice
...
Signed-off-by: Chris Goller <goller@gmail.com>
2017-06-27 12:00:05 -07:00
3b76f82d47
Remove omitempty from CustomLink definition since should never b
2017-06-27 11:02:28 -07:00
0ab48663a8
Return and test for nil on invalid NewCustomLink input
2017-06-27 10:59:04 -07:00
fcf9971d86
Pass through CustomLinks error message directly
2017-06-26 18:02:22 -05:00
3e3bf8988c
Add full test coverage for NewCustomLinks
2017-06-26 17:18:53 -05:00
b38439321d
Move external links structs to links.go
2017-06-26 16:13:23 -05:00
def34560e0
Only test one CustomLink to avoid map key order failing test
2017-06-26 16:12:54 -05:00
81aa909329
Add custom links to routes test
2017-06-26 16:00:27 -05:00
987141cffa
Use appropriate error when NewCustomLinks fails
2017-06-26 15:44:56 -05:00
a32c17a18d
Comment CustomLink struct
2017-06-26 15:43:03 -05:00
cac72eea60
Change 'Url' prop key to 'URL' to satisfy Go convention
2017-06-26 15:42:36 -05:00
9198e5cb7a
Update comment for ServeHTTP to mention External Links
2017-06-26 15:35:42 -05:00
4bf242f955
Refactor CustomLinks transform into routes.go and new links.go
...
Rename generateCustomLinks to NewCustomLinks
Handle error from NewCustomLinks per app convention
2017-06-26 15:30:33 -05:00
a6dcb3a382
Add 'custom' prop and example to /chronograf/v1 in swagger docs
2017-06-26 11:56:05 -07:00
c1bdbcaa89
Generate custom links from env var and multiple CLI flags
...
Signed-off-by: Chris Goller <goller@gmail.com>
2017-06-26 11:48:47 -07:00
a251071254
WIP Parse custom links from CLI
2017-06-23 15:12:02 -07:00
6c8e889b03
Add Auth0 to supported OAuth2 providers
...
Auth0 is an OpenID Connect compliant OAuth2 provider, so we're able to
re-use the generic OAuth2 provider to implement it. The routes required
by Auth0 have been hardcoded for user convenience.
Also, Auth0 requires users to register a subdomain of auth0.com when
signing up. This must be provided to chronograf through the
`--auth0-domain` parameter (or `AUTH0_DOMAIN` ENV). This is **distinct**
from the `PUBLIC_URL`. For example, for a Chronograf hosted at
`http://www.example.com `, and an Auth0 domain of
`http://oceanic-airlines.auth0.com `, a client-id of `notpennysboat` and a
client-secret of `4-8-15-16-23-42`, the command line options would look
like:
```
chronograf \
--auth0-domain=http://oceanic-airlines.auth0.com \
--auth0-client-id=notpennysboat \
--auth0-secret=4-8-15-16-23-24
--public-url=http://www.example.com
-t `uuidgen`
```
2017-06-21 10:20:46 -04:00
34808ddb9d
Merge pull request #1619 from pragkent/generic-oauth-redirect-url
...
Add redirect url to generic oauth
2017-06-21 10:19:03 -04:00
17984600cb
Fix generic redirect URL
2017-06-21 12:19:21 +08:00
9c597d2c8f
Replace string concat to path.Join
2017-06-18 10:47:02 +08:00
0bb20c8a0f
Don't pass RedirectURL if PublicURL not set
2017-06-18 10:40:07 +08:00
7df4a6ed1a
Merge branch 'master' into feature/status_page-1556
2017-06-16 17:52:16 -07:00
255daba611
Update default JSON feed URL to final, secure link
2017-06-16 14:23:46 -07:00
a231e9f942
Add redirect url to generic oauth
2017-06-16 17:35:57 +08:00
73fd58ef35
Update swagger docs for external and statusFeed props
2017-06-15 18:23:42 -07:00
59e184b1f1
Comment new StatusFeed member of AllRoutes
2017-06-15 17:55:46 -07:00
7a6131bd40
Refactor statusFeedURL to be set in CLI 'default'
...
Reverts to a clean separation of concerns between mux.go vs AllRoutes
AllRoutes now expects a StatusFeed url directly
2017-06-15 13:51:22 -07:00
95e2c18c5a
Add test for all routes with ExternalLinks
2017-06-14 16:22:30 -07:00
741ce0c4b6
Remove unused fragment
2017-06-14 13:51:08 -07:00
1723f30bdf
correct TemplateVar collection type in Queries
2017-06-14 10:52:29 -04:00
Jared Scheib
Tim Raymond
Jared Scheib
Timothy J. Raymond
Kent Wang