Commit Graph

652 Commits (9d931390ee7e895923d5e97d0ae923afcf73517d)

Author SHA1 Message Date
Benjamin Schweizer 53d64492a3 Merge branch 'master' of https://github.com/influxdata/chronograf 2018-01-10 21:44:07 +01:00
Deniz Kusefoglu 1080e9b730 Merge pull request #2409 from influxdata/multiple-event-handlers
Multiple event handlers
2018-01-10 12:32:22 -08:00
Michael Desa 1a78819462 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
Chris Goller 89633f2f18 Update influxdb write proxy to allow self-signed certificates 2018-01-09 11:09:13 -06:00
Chris Goller f6bd84584a Update kapacitor proxy to allow self-signed certificates 2018-01-09 11:05:47 -06:00
deniz kusefoglu b45c88eae8 Merge branch 'master' into multiple-event-handlers 2018-01-04 18:14:06 -08:00
Michael Desa b41816c5cd 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 93d8b10870 Bumpversion to 1.4.0.0 2017-12-22 12:59:04 -08:00
Alex Paxton da2d8a4fbd Merge pull request #2598 from influxdata/single-stat-colors-polish
Single Stat Colors Polish
2017-12-22 12:48:50 -08:00
Nathan Haugo efbb71e9d7 Update version 2017-12-21 11:36:03 -08:00
Alex P 367c3d61ba Merge branch 'master' into single-stat-colors-polish 2017-12-20 17:59:52 -08:00
Jared Scheib aee4636d79 Merge branch 'master' into feature/superadmin_gets_default_role 2017-12-20 17:49:29 -08:00
Michael Desa 979ad34ed0 Check specific case when SA changes their status
SA - SuperAdmin
2017-12-20 16:34:31 -08:00
Michael Desa 0cc30d927f 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 903e7033f4 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 ace51b1553 Update CHANGELOG and versions to prep for 1.4.0.0-rc1 2017-12-19 18:38:46 -06:00
Nathan Haugo ce45f13cdc 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 e0c100ea4e Remove unused code related to excess prints 2017-12-19 13:24:05 -08:00
Michael Desa ca055fe410 Add filestore impl of kapacitor and source stores
Remove random `fmt.Println`'s
2017-12-19 13:14:00 -08:00
Nathan Haugo 1319a3a527 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 ee2dee6c0f Remove extra debugging statement from influx queries 2017-12-19 13:48:56 -06:00
Chris Goller e39ddeddcf Fix cell replacement to return query config 2017-12-19 13:43:39 -06:00
Chris Goller 7d56fdfc75 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 f26d2f0f35 Change Organization ID to string from uint64 2017-12-19 10:13:43 -08:00
Chris Goller a797a95e86 Update CLI option to reflect dashboards directory 2017-12-19 10:07:09 -08:00
Chris Goller a6ef15ee54 Add multiple dashboard stores to server 2017-12-19 10:07:07 -08:00
Chris Goller 4f3fd79abe Move MultiSourceStore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller d4a8cbb87c Move kapacitor multistore to the multistore package 2017-12-18 17:31:45 -08:00
Chris Goller ce87c52fa9 Update layouts from canned package to filestore 2017-12-18 17:31:45 -08:00
Chris Goller 6c98cd49c4 Fix vet for tests 2017-12-18 17:31:45 -08:00
Chris Goller 3bd701441e Update layouts package to multistore 2017-12-18 17:31:45 -08:00
Jared Scheib 7c61a91191 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 0fa542b6b1 Minor tweaks based on PR review 2017-12-18 12:59:04 -08:00
lukevmorris 64523ab8c3 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 4d449ba32b Backup/Migrate/Initialize moved into Open
Signed-off-by: Chris Goller <goller@gmail.com>
2017-12-18 12:06:17 -08:00
Benjamin Schweizer fb20f6eca3 Merge branch 'master' into master 2017-12-18 15:22:48 +01:00
Luke Morris 17759192b2 Refactor; simplify function responsibilities 2017-12-17 14:11:27 -08:00
Luke Morris 4faf9c5440 Clean up prior to PR 2017-12-16 13:54:55 -08:00
Luke Morris 2196a20100 Create backup of database when moving versions 2017-12-16 12:27:24 -08:00
Luke Morris d201fa941a WIP 2017-12-16 01:01:14 -08:00
Michael Desa 75d6c659f3 Allow SuperAdmins to change into any organization 2017-12-15 16:05:56 -08:00
Jared Scheib fbc224107e 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 bd3aec99ad Allow users to toggle between coloring text or background with single stat thresholds 2017-12-14 19:07:19 -08:00
Michael Desa 1f6f78d3fd Use serverContext for getting Config in NewUser 2017-12-14 13:34:19 -08:00
Nathan Haugo c42ebb3a86 Bump version to 1.4.0.0-beta2 2017-12-14 12:47:41 -08:00
Nathan Haugo a91b3ef104 Bump version to 1.4.0.0-beta2 2017-12-14 12:45:44 -08:00
Michael Desa f86004cda3 Add comment clarifying UsersStore Add method 2017-12-14 11:36:26 -08:00
Michael Desa e8861e9b74 Set SuperAdmin for NewUsers based on ConfigSetting 2017-12-14 11:11:51 -08:00
Jared Scheib 0e1bcfc9c6 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 27fe23b161 Add comment about firstUser superAdmin logic 2017-12-14 10:46:55 -08:00