Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,255 Commits
205 Branches
453 Tags
382 MiB
Commit Graph

4255 Commits (0950833ec0c9a90ae692e271137fbcb9af1ddbf8)

Author SHA1 Message Date
Alex P 6f38287f0e Fix accidental changelog mixup from merge 2017-07-10 13:01:41 -07:00
Alex P 51069eb3d6 Make changelog update more descriptive 
Sorry to nitpick
 2017-07-10 12:59:07 -07:00
Alex P 3e95cb1aad Move changelog update into correct version header 2017-07-10 12:56:41 -07:00
Alex Paxton 45f88c7db8 Merge branch 'master' into zindex 2017-07-10 12:52:08 -07:00
Andrew Maney 64e2716ad9 Update CHANGELOG message to present tense 2017-07-10 15:44:36 -04:00
Jared Scheib 50bfe97ac4 Move he dep to correct package.json and yarn.lock 2017-07-10 12:38:36 -07:00
Alex P 95b1fedf23 Prioritize alert name over host 2017-07-10 12:22:40 -07:00
Luke Morris 2533c76d6e Bump version, update changelog 2017-07-10 11:52:12 -07:00
Andrew Maney 7249c4728e CHANGELOG updated 2017-07-10 13:38:35 -04:00
Andrew Maney d54425347c Z-index for options menu fixed 2017-07-10 13:14:50 -04:00
Alex P b6fa438fef Make NAME and HOST columns less likely to wrap 
- LEVEL, TIME and and VALUE have fixed pixels widths as the maximum
content size is predictable
 2017-07-07 17:20:33 -07:00
Andrew Watkins 0a80cac953 Merge pull request #1679 from influxdata/get-legend-rekt 
Update legend functionality
 2017-07-07 16:53:25 -07:00
Andrew Watkins f9be34655f Merge pull request #1697 from influxdata/hotfix/custom-time-range 
Custom Time Range Indicator Hotfix
 2017-07-07 16:52:29 -07:00
Jared Scheib 8bf6c71119 Fix isEditable prop name 2017-07-07 16:00:17 -07:00
Jared Scheib 342941cef8 Make minor syntax consistency updates 2017-07-07 15:42:17 -07:00
Jared Scheib f988da6e7f Merge pull request #1695 from influxdata/feature/persist_datasource_flag-1555 
Add server flag to add new InfluxDb source and Kapacitor server
 2017-07-07 14:51:51 -07:00
Jared Scheib 5ec506b8fb Merge branch 'master' into feature/persist_datasource_flag-1555 2017-07-07 14:45:00 -07:00
Timothy J. Raymond df40cb53be Merge pull request #1674 from influxdata/feature/tr-auth0-organizations 
Add support for Auth0 organizations
 2017-07-07 17:07:35 -04:00
Tim Raymond a7fc16cb17 Fix bad merge conflict resolution 
Duplicate definitions of the same property were present because of
confusing placement of merge conflict markers.
 2017-07-07 16:59:19 -04:00
Andrew Watkins 79ba169f6f Put parent in charge of when to render custom time 2017-07-07 13:28:49 -07:00
Andrew Watkins 7bd7734c74 Fix bool 2017-07-07 13:25:02 -07:00
Andrew Watkins 00c0f44b97 Refactor NameableGraph component 2017-07-07 13:22:38 -07:00
Tim Raymond 5b5dbee078 Merge master into feature/tr-auth0-organizations 
Conflicts were the addition of CLI flags from a concurrent branch.
 2017-07-07 16:18:01 -04:00
Jared Scheib 4ce7e950a0 Update changelog 2017-07-07 13:14:01 -07:00
Jared Scheib 12f1a8ce4b Add test for creating NewSources via server flag 
Move TestLogger to mocks

Signed-off-by: Tim Raymond <tim@timraymond.com>
 2017-07-07 12:56:12 -07:00
Andrew Watkins 657da10701 Refactor to use js class syntax 2017-07-07 11:45:06 -07:00
Andrew Watkins 2b2abacaf7 Pull out custom time range into separate component 2017-07-07 11:37:53 -07:00
Andrew Watkins e1bd454363 Merge pull request #1698 from influxdata/hotfix/node-8-support 
Fix node-sass version for Node 8 support.
 2017-07-07 09:34:59 -07:00
Hunter Trujillo 579c2fac81 Fix tempvar on status page. 2017-07-07 08:37:34 -06:00
Hunter Trujillo ce3305fabd Fix broken upper time range tempvar. 2017-07-07 08:34:03 -06:00
Hunter Trujillo 05cbed726b Fix node-sass version for Node 8 support. 2017-07-06 17:29:59 -06:00
Jared Scheib fea0a330eb Correct comment 2017-07-06 15:04:04 -07:00
Jared Scheib 10c317c083 Refactor process new sources into named func 2017-07-06 14:27:14 -07:00
Hunter Trujillo ecad98beba Fix quoting of template variable value quoting. 2017-07-06 15:16:06 -06:00
Jared Scheib d7e73f55ad Move NewSources input prep to server 
Signed-off-by: Tim Raymond <tim@timraymond.com>
 2017-07-06 14:12:07 -07:00
Jared Scheib e61ffaa6a3 Clarify comment 2017-07-06 13:47:39 -07:00
Hunter Trujillo e71fca2bf8 Fix issue on both homepage and status page where custom time range indicator data is not present on the cell's query. 2017-07-06 14:31:28 -06:00
Alex P c1045841d7 Fix merge conflicts 2017-07-06 12:49:05 -07:00
Jared Scheib c455592103 Remove check on already existing Kapacitor 
Clean up conditionals by refactoring to use loop label.
Incidentally this also fixed a bug that would not allow
a Kapacitor server to be added by the same name as one
that already existed, allowing the check to be removed
as well.
 2017-07-06 12:18:33 -07:00
Alex P 13b81cb935 Make filter toggleable 2017-07-06 12:16:03 -07:00
Jared Scheib ac0598f95c Allow server to run even if NewSources errors out 2017-07-06 12:05:05 -07:00
Jared Scheib f49badf4f0 Clean up conditionals 2017-07-06 12:04:34 -07:00
Jared Scheib 340ed6f40e Move throwaway parsing type into NewSources 2017-07-06 11:57:02 -07:00
Jared Scheib 3c3602a724 Update error messages to use plural 2017-07-06 11:48:14 -07:00
Jared Scheib abff00f88f Add sample usage 
Make flag identifier plural since JSON array of objects
 2017-07-06 11:44:42 -07:00
Jared Scheib 0c0d1a0e78 Log info if source already exists 2017-07-06 11:19:10 -07:00
Alex P eebef62cc5 Make time list in time range selector appear above the apply button 
Woooooo z-index issues
 2017-07-06 10:10:47 -07:00
Alex P 7469c6dd23 Prevent z-index mixup in which graph options appears above custom time selector 2017-07-06 10:03:08 -07:00
Alex Paxton 4711807dee Merge pull request #1677 from influxdata/custom-range-on-cells 
Display Custom Time Range on Cell
 2017-07-06 09:58:02 -07:00
Hunter Trujillo 187d593007 Improved unitOfTime regex. 2017-07-06 09:26:25 -06:00