Commit Graph

804 Commits (1195573014ad9ced5f980006f4923a862d6ed8d2)

Author SHA1 Message Date
Iris Scholten 2b7d2fbc1d update versions with bumpversion 2018-03-28 11:34:23 -07:00
Benjamin Schweizer 2aeb0f7c8a added USE_ID_TOKEN option, defaulting off 2018-03-28 15:51:10 +02:00
Benjamin Schweizer 0a98d1c7b7 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-03-28 13:30:05 +02:00
Iris Scholten ed5119f2ba respond to review 2018-03-27 14:28:59 -07:00
Iris Scholten b251829ccb respond to review 2018-03-27 14:27:01 -07:00
Iris Scholten 4f6de052d7 update swagger.json with tableOptions info 2018-03-27 11:45:57 -07:00
Alex P 347c27b1f4 Add "Scale" type to accepted cell color types 2018-03-26 19:09:09 -07:00
Jared Scheib de90bfedef Test for existing superadmin user in Principal auth0 group 2018-03-23 16:58:09 -07:00
Jared Scheib f3b9f6777a Update existing user's superAdmin status in bolt if in Principal auth0 group 2018-03-23 16:53:08 -07:00
Jared Scheib f1cadf6191 Add server test for Chronograf not private & user is in auth0 superadmin group 2018-03-23 16:26:20 -07:00
Jared Scheib c449d34ec1 Add expected defaultRole to test data organization & currentOrganization 2018-03-23 15:54:46 -07:00
Jared Scheib dd2c600c78 Update 'private' language to make consistent with current behavior of app 2018-03-23 15:45:11 -07:00
Jared Scheib 3dbab1a9b5 Remove extraneous fmt.Print statements 2018-03-23 15:03:01 -07:00
Jared Scheib 50849b11ef Extend test data with case where user has multiple Principal Groups 2018-03-23 15:00:09 -07:00
Jared Scheib 4227ce17dc Fix Auth0SuperAdminOrg server option description to indicate only one org is acceptable 2018-03-23 14:53:43 -07:00
Michael Desa 0cde581538 Add tests for mapProviderToSuperAdmin 2018-03-23 16:12:18 -04:00
Michael Desa 2345723d03 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 07f313f8b5 WIP 2018-03-23 12:17:22 -07:00
Iris Scholten 2b8b3f4b76 WIP change backend TableColumn to RenamableField and ColumnNames in TableOptions to FieldNames 2018-03-20 17:15:33 -07:00
Iris Scholten 1910529eeb add visible to TableColumn in backend and fix tests accordingly 2018-03-20 17:03:24 -07:00
Iris Scholten 79d977fbea add fixFirstColumn to backend and tests 2018-03-19 15:56:31 -07:00
Andrew Watkins 5eebbbe530 Add insecureSkipVerify to marshal / unmarshal
Co-authored-by: Andrew Watkins <andrew.watkinz@gmail.com>
Co-authored-by: Brandon Farmer <bthesorceror@gmail.com>
2018-03-14 17:24:55 -07:00
Brandon Farmer ef4fbba690
Merge pull request #2970 from influxdata/fixes/missing-colors-from-canned-single-stats
Always return colors for single stat graphs
2018-03-14 15:45:22 -07:00
Brandon Farmer 984c571a28 Provide default cell colors in layout 2018-03-13 20:36:43 -07:00
Iris Scholten 9b9be3cda1 Merge branch 'master' into feature/graph-table-time-format 2018-03-13 09:48:52 -07:00
Iris Scholten cf2c508c96 update server_test, internal_test, and cells_test with tableOptions 2018-03-12 17:12:20 -07:00
Luke Morris ee9111d04d Bump version 2018-03-08 18:54:45 -08:00
Luke Morris 92da0b1b51 Bump version to 1.4.2.2 2018-03-07 13:19:40 -08:00
Luke Morris 5777ee718e Bump version number 2018-02-28 23:23:27 -08:00
Luke Morris ff73d82aa2 Bump version number 2018-02-28 21:28:29 -08:00
Luke Morris 4b54081cf8 Revert :interval: work
Squashed commit of the following:

commit 8b18f78098953c5aba744dd16a215b6ed4cd5143
Author: Luke Morris <lukevmorris@gmail.com>
Date:   Wed Feb 28 20:44:46 2018 -0800

    Revert "Merge pull request #2663 from influxdata/feature/migrate-time-interval"

    This reverts commit 935186984c, reversing
    changes made to e5b8889bc6.

commit 8f17059d24cc1a1bb4b8675be70fb9adb3f3a3e3
Author: Luke Morris <lukevmorris@gmail.com>
Date:   Wed Feb 28 20:44:23 2018 -0800

    Revert "Merge pull request #2890 from influxdata/fix/time-interval"

    This reverts commit bb01a569ca, reversing
    changes made to 3609bc7d3a.
2018-02-28 20:47:16 -08:00
Michael Desa 1c9ee296a0 Ensure backwards compat for old GROUP BY :interval: 2018-02-28 17:21:15 -05:00
lukevmorris e8f80a15ac
Merge pull request #2846 from influxdata/feature/annotations
Dashboard annotations
2018-02-27 13:05:39 -08:00
Iris Scholten 812588ffb1 update changelog message and log line message 2018-02-26 15:12:51 -08:00
Alex P 69fa4842e8 Merge branch 'master' into feature/annotations 2018-02-26 15:10:10 -08:00
Iris Scholten 8f471f1375 update url in log line and fix typo 2018-02-26 14:30:47 -08:00
Iris Scholten c2d209690a update tests to account for empty bounds change 2018-02-23 16:48:25 -08:00
Iris Scholten d315c6e9fa make empty axes bounds [,] instead of [] 2018-02-23 16:24:54 -08:00
Luke Morris ab8a73509a Merge branch 'master' into feature/annotations 2018-02-22 19:53:23 -08:00
Chris Goller 0908225f31
Merge pull request #2825 from influxdata/feature/annotation-tests
Annotation tests
2018-02-21 12:23:00 -06:00
Russ Savage ce67e71532
Merge pull request #2819 from influxdata/new-sources
Fix/New sources CLI and Deprecation
2018-02-20 13:39:27 -08:00
Chris Goller a5fa5bddb9 Add initial tests for REST annotations 2018-02-20 08:34:23 -06:00
Benjamin Schweizer 47dac13cae merged upstream, updated comments, added GroupFromClaims() 2018-02-20 09:47:42 +01:00
Luke Morris 114403ef23 Enforce presence of endTime 2018-02-19 09:52:02 -08:00
Luke Morris 7a77a0e653 Full create for single and windowed annotations 2018-02-16 21:37:31 -08:00
Luke Morris 03d7f7457d Unify annotation schema in both client/server 2018-02-16 19:49:13 -08:00
Chris Goller 9a748d7bd5 Fix annotation storage to influxdb 2018-02-16 09:17:47 -08:00
Chris Goller 8e542b5130 Update annotations to use time as endTime 2018-02-16 09:17:47 -08:00
Chris Goller bf102395aa WIP 2018-02-16 09:17:47 -08:00
Luke Morris 59b6979812 Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-15 12:03:10 -08:00
Iris Scholten 562441bf7a add deprecation message if using --new-sources 2018-02-14 17:18:35 -08:00
Chris Goller 093fb7d75d Update meta nodes to respect insecure skip verify 2018-02-14 13:25:08 -08:00
Iris Scholten 039121e18c add organization information to the context 2018-02-14 13:14:57 -08:00
Luke Morris 85781aed9d Bump to 1.4.1.2 2018-02-13 13:34:50 -08:00
Luke Morris b97739e520 Bump version to 1.4.1.1 2018-02-12 18:03:16 -08:00
Luke Morris 27fbfd4d38 Bump version 2018-02-12 16:42:58 -08:00
Luke Morris c136a2f5f0 Remove Public; Improve Tab Names 2018-02-09 16:00:27 -08:00
Luke Morris 67ac6a5a2f Merge branch 'master' into feature/mappings 2018-02-09 11:42:07 -08:00
Luke Morris 4155d9c6d9 Replace Public functionality with Mappings feature 2018-02-08 17:53:34 -08:00
Alex P 66b41abdce Merge branch 'master' into feature/annotationz-pre-pl-with-master 2018-02-08 16:38:47 -08:00
Iris Scholten e5fe5cd0e6 WIP remove public logic from organizations 2018-02-08 16:01:00 -08:00
Luke Morris 1116e41246 Pseudo code for removal of Public 2018-02-08 10:59:54 -08:00
Michael Desa 096ef058eb Allow user to delete themselves
Previously users were prevented from removing themselves.

Connect https://github.com/influxdata/chronograf/issues/2711
2018-02-07 09:46:08 -05:00
Iris Scholten 3c3e524b46 Group=>ProviderOrganization; organization=>organiztionId; fix pointer bug 2018-02-06 18:33:27 -08:00
ischolten b2cfb67256
Merge pull request #2703 from influxdata/feature/global-users
Add global users page for super admins
2018-02-06 14:30:08 -08:00
Michael Desa b5eca6c58a Prevent error if organization not found in mapping
chris go vet fix
2018-02-05 18:20:03 -05:00
Chris Goller 84b6cf4967 Update cell defaults to use empty array 2018-02-05 17:04:15 -06:00
Michael Desa efd691d1b5 Add Mappings CUDA routes 2018-02-05 16:47:44 -05:00
Chris Goller 6bfc6c36b2 Fix cell race condition 2018-02-05 14:50:05 -06:00
Chris Goller a565027394 Add legend to dashboard cells 2018-02-05 14:25:57 -06:00
Michael Desa 8b60388d81 Add correct implementation of mappings 2018-02-05 14:54:39 -05:00
Iris Scholten 5fbfc12f11 Merge branch 'master' into feature/global-users 2018-02-01 16:40:14 -08:00
Nathan Haugo 74f067844c Update changelog for 1.4.0.1 2018-01-25 13:09:45 -08:00
Andrew Watkins 7fbb4d877c Merge annotation-store 2018-01-19 10:11:53 -08:00
Chris Goller 7555783638 Update influxdb annotation store to support update/delete 2018-01-18 21:50:46 -06:00
Michael Desa 8fa2eabdb3 Fix RouteMatchesPrincipal if org isnt on principal 2018-01-17 12:42:32 -05:00
Michael Desa 23a4c34a17 Populate links response with organiation on JWT 2018-01-17 12:26:28 -05:00
Michael Desa f3c57f1e3f Add correct users route to all routes 2018-01-16 17:03:46 -05:00
Michael Desa 2d7828b602 Nest user routes under organization
Add global user routes
2018-01-16 16:45:58 -05:00
Chris Goller 243ccb1ffb Add basic REST routes for annotations 2018-01-12 17:17:14 -06:00
Chris Goller 986e9406f9 Add epoch to influx query 2018-01-12 17:17:01 -06:00
Michael Desa 4afb444579 Allow UpdateUser to accept empty roles 2018-01-12 12:37:30 -05:00
Michael Desa d74d8f35f9 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 0b89623db8 Apply mapping to user in /me 2018-01-11 16:10:27 -05:00
Michael Desa c833020944 Add logic mapping applying a mapping 2018-01-11 12:36:13 -05:00
Michael Desa de61afc850 Fix mappings on me response 2018-01-10 16:34:04 -05:00
Michael Desa 2eb68a3b36 Add mappings to organizations
Add links to organization response on me
2018-01-10 15:56:13 -05:00
Benjamin Schweizer 9ca43f43aa Merge branch 'master' of https://github.com/influxdata/chronograf 2018-01-10 21:44:07 +01:00
Deniz Kusefoglu 3612843df7
Merge pull request #2409 from influxdata/multiple-event-handlers
Multiple event handlers
2018-01-10 12:32:22 -08:00
Michael Desa b360591cb9 Add rawUsers route to AllLinks 2018-01-10 11:18:08 -05:00
Michael Desa acf3de93cd 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 0d6a508a00 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 ce4d51d8a1 Update influxdb write proxy to allow self-signed certificates 2018-01-09 11:09:13 -06:00
Chris Goller d4a807ca96 Update kapacitor proxy to allow self-signed certificates 2018-01-09 11:05:47 -06:00
deniz kusefoglu abdfd14bbd Merge branch 'master' into multiple-event-handlers 2018-01-04 18:14:06 -08:00
Michael Desa 2151413ece 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 8a71b3348e Unprettier 2017-12-22 16:56:16 -08:00
Jared Scheib 5afe31eb33 Add /users & /users/{id} routes & CRUD operations to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib 7dbf1b9793 Add swagger definitions for Chronograf Users, User, & Role 2017-12-22 16:53:17 -08:00
Jared Scheib b5c6856d01 Add read-only props & fix organization id to be string 2017-12-22 16:53:17 -08:00