Commit Graph

1723 Commits (6d601d527f9f46b31fe3c2c6a61281e699b44240)

Author SHA1 Message Date
Hunter Trujillo 6d601d527f Add frontend support for OAuth changes. 2017-02-15 11:57:52 -07:00
Chris Goller b48851ee2b Fix go test failures from code moving 2017-02-14 23:38:43 -06:00
Chris Goller 7b4a649130 Add --public-url CLI option to support google oauth redirect uri 2017-02-14 23:34:15 -06:00
Chris Goller b9b37f3b90 Add google oauth provider. Need redirect_uri 2017-02-14 23:11:11 -06:00
Chris Goller 3eb39d85a8 Remove unneeded authenticator from github 2017-02-14 23:09:34 -06:00
Chris Goller 4472ac9636 Add Google login button
Need to update this eventually to use the dynamic routes
2017-02-14 23:05:03 -06:00
Tim Raymond e1db393864 Doc++ 2017-02-14 17:28:38 -05:00
Tim Raymond f01e3b18fe Add Name to oauth2.Provider
Providers should be able to tell us their name. This will help construct
routes.
2017-02-14 17:28:05 -05:00
Tim Raymond 633a586d6f Fix route for links and Github OAuth route
On the backend, the trailing slash on /chronograf/v1/ caused that route
to escape detection by the authentication middleware, so auth was not
triggered. Also, routes were changed on the backend for Github's OAuth
authentication.
2017-02-14 17:26:39 -05:00
Tim Raymond d07c7ca1d6 Reorganize OAuth2 Logic
Created an oauth2 package which encapsulates all oauth2 providers,
utility functions, types, and interfaces. Previously some methods of the
Github provider were used as http.HandlerFuncs. These have now been
pulled into a concrete type called a JWTMux to implement other Oauth2
providers.

JWTMux has all of the functionality required to take a token from any
provider and store it as a JWT in a browser, and that is the extent of
its responsibilities. It implements the oauth2.Mux interface which would
potentially allow other strategies of oauth2 credential storage.
2017-02-14 16:18:41 -05:00
Tim Raymond f0e8d0b3e8 Update Makefile for ctags
Adds a `make ctags` command to generate Go ctags for editors
2017-02-14 16:18:41 -05:00
Hunter Trujillo 95add4909a Fix basepath support. 2017-02-14 10:07:15 -07:00
Hunter Trujillo 7c59c40fa7 Linter fixes. 2017-02-14 09:55:31 -07:00
Chris Goller f1e7ae30c3 WIP 2017-02-13 18:02:43 -06:00
Chris Goller ad2a3bc0d2 Merge branch 'feature/oauth-google' of github.com:influxdata/chronograf into feature/oauth-google 2017-02-13 18:01:39 -06:00
Hunter Trujillo d87a3350f3 Add resource and id methods to AJAX method to access link URLs. 2017-02-13 13:19:34 -07:00
Chris Goller eb173a879c WIP 2017-02-13 08:45:37 -06:00
Hunter Trujillo 4ea695e1a1 Merge pull request #872 from influxdata/hotfix/have-blue
Update chronograf sources response
2017-02-12 16:24:06 -07:00
Chris Goller 0b7e3b8fe1 Update chronograf sources response 2017-02-12 16:38:05 -06:00
Chris Goller 9cc425d39d WIP 2017-02-12 14:52:21 -06:00
Regan Kuchan 7bef858f79 Merge pull request #871 from influxdata/rk-changelog
Update changelog for 1.2.0-beta2
2017-02-10 16:00:10 -08:00
Regan Kuchan d668d7ea17 Update changelog for 1.2.0-beta2 2017-02-10 15:59:21 -08:00
Regan Kuchan 6c766d7be1 Merge pull request #861 from influxdata/release-1.2.0-beta2
Update docs for 1.2-beta2
2017-02-10 15:37:16 -08:00
Regan Kuchan 9b72fd9eb6 Fix merge conflict ii 2017-02-10 15:36:38 -08:00
Regan Kuchan 0e2dab2622 Add a section on the TICKscript parser 2017-02-10 15:28:02 -08:00
Andrew Watkins 0e0f0fc260 Merge pull request #864 from influxdata/http-tcp
Kapacitor Rule Alert Config for HTTP, TCP, Exec, SMTP, and Alerta (parsed pasted Tick script)
2017-02-10 15:20:53 -08:00
Hunter Trujillo bace30142b Fix kapacitor rules page checkbox JSX. 2017-02-10 16:09:12 -07:00
Chris Goller 32e86b1c66 Merge pull request #870 from influxdata/de-empty-states
DE Empty State Polish
2017-02-10 17:09:03 -06:00
Hunter Trujillo 12e7688a49 Merge branch 'master' into http-tcp
# Conflicts:
#	CHANGELOG.md
2017-02-10 16:03:30 -07:00
Hunter Trujillo de66bff1a5 Fix AlertaConfig? 2017-02-10 15:59:43 -07:00
Alex P 6a893f82c6 Polish empty states in DE query builder 2017-02-10 14:57:30 -08:00
Regan Kuchan e15054c057 Add alert rule checkbox feature to README 2017-02-10 14:51:43 -08:00
Chris Goller 1bdfbbdd6b Merge pull request #869 from influxdata/de-scroll-fix
Fix Scrolling Issue on DE Lists
2017-02-10 16:46:10 -06:00
Alex P 190457bbcd fix non-scrolling behavior on DE editor lists 2017-02-10 14:42:24 -08:00
Chris Goller f81cd7e7ad Merge pull request #868 from influxdata/disable-alert
Change rule status
2017-02-10 16:41:28 -06:00
Regan Kuchan d6d39e7372 Fix merge conflicts 2017-02-10 14:36:43 -08:00
Alex P d46e86f4e2 Make Checkbox centered 2017-02-10 14:35:58 -08:00
Alex P 509b13d2d6 Style checkboxes on kapacitor rules table 2017-02-10 14:32:22 -08:00
Hunter Trujillo 9046b8e3da Add alerta and exec to alert destinations. 2017-02-10 15:13:07 -07:00
Hunter Trujillo 57bf5f571a Merge branch 'master' into http-tcp
# Conflicts:
#	CHANGELOG.md
2017-02-10 13:31:01 -07:00
Hunter Trujillo 2181532bf7 Refactor alert config input and label to a stateless component. 2017-02-10 13:28:39 -07:00
Andrew Watkins 8aa7dec87f Optimistically update status state 2017-02-10 12:15:45 -08:00
Hunter Trujillo c2f4629732 Not sure if it's needed here, but for consistency, I've added alerta to the ALERTS constant. 2017-02-10 13:06:16 -07:00
Hunter Trujillo d428aaf8c7 Refactor parseAlerta spec to test reducer, accessors, and parser separately. Refactor parseAlerta out of rules reducer into its own file in shared/prasing. Update appearance of AlertaConfig. Update appearance of RuleMessage input field. Remove smtp and alerta from default alerts. 2017-02-10 13:03:31 -07:00
Chris Goller c125c48efc Fix swagger JSON formatting 2017-02-10 13:57:12 -06:00
Andrew Watkins f47978f4a9 Merge pull request #856 from influxdata/de-organize
DE Reorganize
2017-02-10 11:52:55 -08:00
Chris Goller d7d0cd56f0 Merge branch 'disable-alert' of github.com:influxdata/chronograf into disable-alert 2017-02-10 13:49:07 -06:00
Chris Goller 1d9bb70414 Add disable and enable to kapacitor alerts 2017-02-10 13:48:42 -06:00
Andrew Watkins 95e38a4767 Change rule status 2017-02-10 13:42:42 -06:00
Andrew Watkins 06af77dffb Change rule status 2017-02-10 11:12:59 -08:00