Commit Graph

715 Commits (9d4162c60bde92a3849988ef3cbd293cf30c1c33)

Author SHA1 Message Date
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
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
Nathan Haugo d7f9faa782 Bumpversion to 1.4.0.0 2017-12-22 12:59:04 -08:00
Alex Paxton 0f6a2d8802
Merge pull request #2598 from influxdata/single-stat-colors-polish
Single Stat Colors Polish
2017-12-22 12:48:50 -08:00
Nathan Haugo 94fea97117 Update version 2017-12-21 11:36:03 -08:00
Alex P 8b37f02030 Merge branch 'master' into single-stat-colors-polish 2017-12-20 17:59:52 -08:00
Jared Scheib f91a2e436d Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08:00
Michael Desa 95297303be Check specific case when SA changes their status
SA - SuperAdmin
2017-12-20 16:34:31 -08:00
Michael Desa 14af1aa115 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 ab9e686bbb 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 d8a0aa3b89 Update CHANGELOG and versions to prep for 1.4.0.0-rc1 2017-12-19 18:38:46 -06:00
Nathan Haugo 72a756c843
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 774d9a7456 Remove unused code related to excess prints 2017-12-19 13:24:05 -08:00
Michael Desa 9f0476c459 Add filestore impl of kapacitor and source stores
Remove random `fmt.Println`'s
2017-12-19 13:14:00 -08:00
Nathan Haugo daae351232
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 11a4404d6d Remove extra debugging statement from influx queries 2017-12-19 13:48:56 -06:00
Chris Goller 45301fb012 Fix cell replacement to return query config 2017-12-19 13:43:39 -06:00
Chris Goller 3035cad82a 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 d8d20547ab Change Organization ID to string from uint64 2017-12-19 10:13:43 -08:00
Chris Goller 9d1165a335 Update CLI option to reflect dashboards directory 2017-12-19 10:07:09 -08:00
Chris Goller ac41c384f2 Add multiple dashboard stores to server 2017-12-19 10:07:07 -08:00
Chris Goller 979f260f4b Move MultiSourceStore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller f8461a8252 Move kapacitor multistore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller e1bfa8b2b7 Update layouts from canned package to filestore 2017-12-18 17:31:45 -08:00
Chris Goller 8811fc3420 Fix vet for tests 2017-12-18 17:31:45 -08:00
Chris Goller 56d9d4721b Update layouts package to multistore 2017-12-18 17:31:45 -08:00
Jared Scheib 2ba29d6937
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 071b8b4f82 Minor tweaks based on PR review 2017-12-18 12:59:04 -08:00
lukevmorris 7663df8884
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 fcdc4efb2c Backup/Migrate/Initialize moved into Open
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-18 12:06:17 -08:00
Luke Morris 2184aecf86 Refactor; simplify function responsibilities 2017-12-17 14:11:27 -08:00
Luke Morris da71af2b7b Clean up prior to PR 2017-12-16 13:54:55 -08:00
Luke Morris b95837fc5b Create backup of database when moving versions 2017-12-16 12:27:24 -08:00
Luke Morris 5a59d72b06 WIP 2017-12-16 01:01:14 -08:00
Michael Desa a4736148c0 Allow SuperAdmins to change into any organization 2017-12-15 16:05:56 -08:00
Jared Scheib 933291918b 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 43db95f2cc Allow users to toggle between coloring text or background with single stat thresholds 2017-12-14 19:07:19 -08:00
Michael Desa 4223767c53 Use serverContext for getting Config in NewUser 2017-12-14 13:34:19 -08:00
Nathan Haugo 3f4bfefd00 Bump version to 1.4.0.0-beta2 2017-12-14 12:47:41 -08:00
Nathan Haugo 971156edf0 Bump version to 1.4.0.0-beta2 2017-12-14 12:45:44 -08:00
Michael Desa 61ef8937ba Add comment clarifying UsersStore Add method 2017-12-14 11:36:26 -08:00
Michael Desa da605ac138 Set SuperAdmin for NewUsers based on ConfigSetting 2017-12-14 11:11:51 -08:00
Jared Scheib 456488f0ac
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 14599e0f0a Add comment about firstUser superAdmin logic 2017-12-14 10:46:55 -08:00
Michael Desa 392594539b 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 2b38918a44 Prevent users joining default org if private 2017-12-13 16:59:02 -08:00
Jared Scheib f23075cbc4 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 5c813493ea Add config.self & config.auth routes, update client routes & make PATCH a PUT 2017-12-13 13:54:23 -08:00
Michael Desa da67f958ae Remove SuperAdminFirstUserOnly CLI flag
Wire up boltdb config store
2017-12-13 11:55:36 -08:00
Michael Desa 9a1ba96977 Wire up bolt db ConfigStore in Server 2017-12-13 10:46:08 -08:00
Michael Desa 4496c361d7 Add PUT /config/:section route 2017-12-13 09:28:39 -08:00
Michael Desa 5ec549db0f Add /config/:section endpoint 2017-12-13 09:04:44 -08:00
Michael de Sa fcd25ad580 Implement Config GET service method
Signed-off-by: Jared Scheib <jared.scheib@gmail.com>
2017-12-12 17:06:57 -08:00
Jared Scheib 5038f8532b 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 9fd656d4c9 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
Deniz Kusefoglu c2b356b1c5
Merge branch 'master' into multiple-event-handlers 2017-12-08 12:20:40 -08:00
Nathan Haugo 1e8a66dffa Update bumpversion with 1.4.0.0-beta1 2017-12-07 14:38:28 -06:00
Jared Scheib 482a4de6c1 Merge branch 'master' into multitenancy 2017-12-06 19:05:16 -08:00
Jared Scheib bbe1330cbf Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 18:47:05 -08:00
Deniz Kusefoglu ace69cc49b
Merge branch 'master' into multiple-event-handlers 2017-12-05 16:18:01 -08:00
Jared Scheib 808163fe69 Merge branch 'multitenancy' into multitenancy_fix_layouts 2017-12-05 16:03:05 -08:00
Michael Desa e5e65dfc1b Remove Create/Update/Delete logic for Layouts 2017-12-05 17:11:16 -05:00
Michael Desa fc0d525022 Remove /mappings in place of /layouts
Remove POST/PUT/DELETE methods to /layouts
2017-12-05 17:07:09 -05:00
Jared Scheib 987d462de3 Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-12-05 13:37:46 -08:00
Nathan Haugo 4afa71a2f4
Merge pull request #2410 from influxdata/gauge-cell-type
Gauge Dashboard Cell
2017-12-05 13:26:02 -08:00
Jared Scheib 1323a062b7 Merge branch 'master' into multitenancy 2017-12-05 13:00:48 -08:00
Chris Goller 62db317268
Merge branch 'master' into feature/add-meta-auth 2017-12-05 14:37:47 -06:00
Alex P 5f6a9a9087 Merge branch 'master' into gauge-cell-type 2017-12-05 12:12:16 -08:00
Jared Scheib 93f11e1325 Merge remote-tracking branch 'origin/master' into multitenancy 2017-12-05 11:43:23 -08:00
Michael Desa 06db8a885f 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 6db56147a8 Add basic auth or JWT tokens for meta queries 2017-12-04 18:07:08 -06:00
Michael Desa 15a1c45cf1 Allow admins to update a superadmins roles 2017-12-04 16:53:30 -05:00
Chris Goller 7d35d3b3d1
Merge branch 'master' into fix/basepath-logout 2017-12-04 15:00:07 -06:00
Andrew Watkins 87fa2c1c91 Will not supply roles if there is no metaURL 2017-12-02 12:11:52 -08:00
Chris Goller 3f760c1b1b Update oauth logout to include basepath 2017-12-01 15:35:39 -06:00
Deniz Kusefoglu 531e4af26c 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 b83ccaf420 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 f8920cf39b
Merge branch 'multitenancy' into multitenancy_reset_current_org 2017-11-30 19:07:40 -08:00
Jared Scheib 6b7a18d666 Complete 9ef1e57 by removing Role concept from sources in server 2017-11-30 19:03:56 -08:00