Commit Graph

2910 Commits (f418729342f51a4f651eff0d2fafea1b76b8a30f)

Author SHA1 Message Date
Luke Morris 12d4360cda Missed one 2017-04-04 20:43:15 -07:00
Alex P 9f4cd64c11 Remove custom cursors 2017-04-04 17:41:42 -07:00
Andrew Watkins a08e36ec24 Remove switch statement 2017-04-04 17:11:48 -07:00
Chris Goller 282d46e566 Merge pull request #1182 from influxdata/hotfix/979-no-rp
Update schema exploration to support non-default rp
2017-04-04 18:11:36 -05:00
Chris Goller 36b7db3226 Merge pull request #1184 from influxdata/no-more-changelog-conflicts
Resolve CHANGELOG.md conflicts by keeping both changes
2017-04-04 17:43:21 -05:00
Chris Goller 249d56c16e Add checks for null retention policies in meta queries 2017-04-04 17:42:30 -05:00
lukevmorris d278cd77b2 Experiment with fewer stacking contexts (#1166) 2017-04-04 15:27:49 -07:00
Andrew Watkins 9a46a14810 Merge pull request #1081 from influxdata/console-power
Introduce Raw Query Editor Admin Console UI
2017-04-04 15:22:15 -07:00
Luke Morris d56598f095 Resolve conflicts by taking both changes 2017-04-04 15:13:01 -07:00
Chris Goller d7f62fb781 Merge branch 'master' into hotfix/979-no-rp 2017-04-04 17:11:16 -05:00
Andrew Watkins ff50a00917 Pull out ternary into separate function property 2017-04-04 14:55:53 -07:00
Andrew Watkins d6e8a2180b Remove magic number 2017-04-04 14:50:11 -07:00
Andrew Watkins e28a37127c Be the change 2017-04-04 14:48:22 -07:00
Andrew Watkins 41ef10f227 Pew Pew ; 2017-04-04 14:46:55 -07:00
Andrew Watkins a1d5819bb2 Consolidate switch statement 2017-04-04 14:46:16 -07:00
Timothy J. Raymond fc900721ec Merge pull request #1168 from influxdata/feature/tr-mountable-router
Prefix all Chronograf routes with Basepath when configured
2017-04-04 17:45:31 -04:00
Andrew Watkins 5e6578e615 Add comments to elucidate various influxQL states 2017-04-04 14:42:59 -07:00
lukevmorris 1c1c00cd02 Admin Databases Page no longer breaks if a db is missing an rp (#1179)
* retentionPolicies could be a blank array

* Update CHANGELOG

* Add `retentionPolicies` to swagger docs
2017-04-04 14:42:24 -07:00
Andrew Watkins 2e0c27cd5b Use quotes instead of backticks 2017-04-04 14:38:07 -07:00
Andrew Watkins 25875d2d8f Pull strings into consts 2017-04-04 14:37:24 -07:00
Chris Goller 57d61a1d00 Update CHANGELOG to mention fixing #979 2017-04-04 16:33:45 -05:00
Chris Goller 6d218e7ac2 Update schema exploration to support non-default rp 2017-04-04 16:29:14 -05:00
Tim Raymond 8a51adbced Remove unnecessary conditional tests
Re-mounting should only happen if the --prefix-routes option is set. If
this happens, the result will be a no-op as intended since the
--basepath will be "". MountableRouter and http.StripPrefix are both
no-ops with prefix set to ""
2017-04-04 16:29:48 -04:00
Jared Scheib 23478fffa7 Fix saving email in Kapacitor alerts (#1173)
* Fix Kapacitor Rules bug to now save user input data on an Alert Message

* Update changelog
2017-04-04 12:28:01 -07:00
Alex P 65d9ac67e0 Use more supported .cur format instead of .png 2017-04-04 12:22:47 -07:00
Alex P 3c431d000a Remove unused webpack files. -H 2017-04-04 12:22:23 -07:00
Andrew Watkins f1ff071985 Merge pull request #1164 from influxdata/1105-save-influxql-cells
Restore ability to save raw queries to a Dashboard Cell
2017-04-04 11:27:16 -07:00
Tim Raymond d04483f779 Favor http.StripPrefix over home-rolled version
http.StripPrefix is a standard library handler which is designed to do
exactly what the inline http.HandlerFunc did (with almost the same
implementation).
2017-04-04 14:03:46 -04:00
Luke Morris 038ba649b8 Bump CHANGELOG 2017-04-04 11:00:27 -07:00
Timothy J. Raymond 774700b025 Merge pull request #1115 from influxdata/feature/tr-disable-prefixing-no-flusher
Bypass URLPrefixer if http.Flusher is unavailable
2017-04-04 11:05:56 -04:00
Tim Raymond 08f2489bc0 Update CHANGELOG with URL Prefixer Bypass changes
[ci skip]
2017-04-04 11:03:07 -04:00
Tim Raymond 1376f522b6 Update CHANGELOG with --prefix-routes changes 2017-04-04 10:59:16 -04:00
Tim Raymond 206a6bba33 Bypass URLPrefixer if http.Flusher is unavailable
In certain situations, the http.ResponseWriter passed to the URLPrefixer
may not be an http.Flusher. A simple case where this may occur is if the
Prefixer has been wrapped up in a middleware where the above middleware
wraps the ResponseWriter in a ResponseWriter that doesn't implement the
Flush method.

Previously, the Prefixer would error, which would cause the request to
fail with a 500. Instead, the condition is logged and the request is
passed unmodified to the next middleware in the chain. This effectively
disables prefixing for requests where the above ResponseWriter is not an
http.Flusher.

Misc. Changes
=============

- Some tests for "builders" were moved to server/builders_test.go to
  follow with convention. We've been naming files after different things
  under test and leaving the file matching the package name for support
  objects-in this case a mock logger was added to that file.
2017-04-04 10:33:14 -04:00
Tim Raymond df19469002 Add parameter to control mounting behavior
Some load balancers will strip prefixes on their way to the chronograf
backend, others won't. The "--prefix-routes" parameter forces all
requests to the backend to have the prefix specified in "--basepath".
Omitting it will only cause routes to be rewritten in rendered
templates and assumes that the load balancer will remove the prefix.

Use with Caddy
==============

An easy way to test this out is using the free Caddy http server at
http://caddyserver.com.

This Caddyfile will work with the options `--basepath /chronograf
--prefix-routes` set:

```
localhost:2020 {
  proxy /chronograf localhost:8888
  log stdout
}
```

This Caddyfile will work with only the option `--basepath /chronograf`
set:

```
localhost:2020 {
  proxy /chronograf localhost:8888 {
    except /chronograf
  }
  log stdout
}
```
2017-04-04 10:28:46 -04:00
Luke Morris ea858c58cb Update CHANGELOG 2017-04-03 17:26:35 -07:00
Luke Morris 8fd7105d5d rawText queries should have blank labels for now 2017-04-03 17:22:48 -07:00
Tim Raymond 77ede66347 Use MountableRouter when Basepath is set
This breaks compatibility with the old behavior of --basepath, so this
requires that proxies be configured to not modify routes forwarded to
backends. The old behavior will be supported in a subsequent commit.
2017-04-03 17:09:05 -04:00
Tim Raymond e1d2949b18 Implement a MountableRouter
The httprouter used in Chronograf did not support prefixing every route
with some basepath. This caused problems for those using the --basepath
parameter in combination with a load balancer that did not strip the
basepath prefix from requests that it forwarded onto Chronograf.

To support this, MountableRouter prefixes all routes at definition time
with the supplied prefix.
2017-04-03 17:06:21 -04:00
Luke Morris 92c74050f4 If InfluxQL, use rawText for label and query 2017-04-03 13:49:35 -07:00
Andrew Watkins 006a69e1e5 Fix portion of table being blocked from view 2017-04-03 13:48:59 -07:00
Andrew Watkins 0983f1fade Improve copy 2017-04-03 13:42:55 -07:00
Andrew Watkins d811faf674 Improve no query state for table 2017-04-03 13:27:07 -07:00
Andrew Watkins ed2b83457c Remove requirement from prop 2017-04-03 13:26:47 -07:00
Hunter Trujillo 92ad16e210 Merge pull request #1159 from influxdata/bugfix/1111-kapacitor-form
Bugfix/1111 kapacitor form
2017-04-03 14:22:53 -06:00
Andrew Watkins 13a136e2bd Make query required in table and remove redundancy 2017-04-03 13:10:06 -07:00
Andrew Watkins 8a03b22c90 Change empty how we handle empty state 2017-04-03 13:10:05 -07:00
Andrew Watkins c81fa02692 Handle empty rawText case 2017-04-03 13:10:05 -07:00
Andrew Watkins 3da0df56e6 Fix spacing on input with no status 2017-04-03 13:10:05 -07:00
Andrew Watkins b7607d156c Handle empty results 2017-04-03 13:10:05 -07:00
Andrew Watkins 636a5c2b37 Start query editor with placeholder text 2017-04-03 13:10:05 -07:00