Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,166 Commits
296 Branches
122 Tags
181 MiB
Commit Graph

831 Commits (d9462013a3d7ad8b24b6d4f748e803fd8e0802ad)

Author SHA1 Message Date
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
Jared Scheib de9970cc1a Clarify & make consistent 403 error descriptions 2017-12-22 16:53:17 -08:00
Jared Scheib 73f429c4c0 Clarify copy in Organizations descriptions 2017-12-22 16:53:17 -08:00
Jared Scheib b675bb6086 Clean up swagger JSON 2017-12-22 16:53:17 -08:00
Jared Scheib a7756df20b Change 'multitenancy' tag to 'multiorganization' & 'multiuser' 2017-12-22 16:53:17 -08:00
Jared Scheib b5d1a6bac1 Add organization/{id} get, patch, & delete to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib 929c20e9fd Clarify swagger description copy 2017-12-22 16:53:17 -08:00
Jared Scheib c36acbbf52 Make POST descriptions consistent 2017-12-22 16:53:17 -08:00
Jared Scheib 606f78ebe8 Add Organization resources & apis to swagger 2017-12-22 16:53:17 -08:00
Jared Scheib 11d20cf22e Change 'internal service error' to 'internal server error'; prettier 2017-12-22 16:53:17 -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
Benjamin Schweizer 39416832f4
Merge branch 'master' into master 2017-12-18 15:22:48 +01: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
Benjamin Schweizer 7d4b8317e1 go fmt + got vet 2017-12-13 09:13:11 +01: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
Benjamin Schweizer 645923a168 add support for RS256 signatures using JWKS 2017-12-10 18:26:27 +01: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