Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/#54-tr-enterprise-client

pull/10616/head
Chris Goller 2017-02-22 13:56:22 -06:00
parent 10b0e1f623 c7d117f10e
commit 5eed15b450
10 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,11 +2,13 @@
### Bug Fixes
1. [#882](https://github.com/influxdata/chronograf/pull/882): Fix y-axis graph padding
2. [#907](https://github.com/influxdata/chronograf/pull/907): Fix react-router warning
### Features
1. [#873](https://github.com/influxdata/chronograf/pull/873): Add [TLS](https://github.com/influxdata/chronograf/blob/master/docs/tls.md) support
### UI Improvements
1. [#905](https://github.com/influxdata/chronograf/pull/905): Make scroll bar thumb element bigger
## v1.2.0-beta3 [2017-02-15]

4
docs/INSTALLATION.md
View File

@ -88,8 +88,8 @@ This is a known issue.
#### 1. Download and Install Telegraf
```
wget https://dl.influxdata.com/telegraf/releases/telegraf_1.2.0_amd64.deb
sudo dpkg -i telegraf_1.2.0_amd64.deb
wget https://dl.influxdata.com/telegraf/releases/telegraf_1.2.1_amd64.deb
sudo dpkg -i telegraf_1.2.1_amd64.deb
```
#### 2. Start Telegraf

8
ui/src/index.js
View File

@ -1,8 +1,8 @@
import React from 'react';
import {render} from 'react-dom';
import {Provider} from 'react-redux';
import {Router, Route, Redirect} from 'react-router';
import {createHistory, useBasename} from 'history';
import {Router, Route, Redirect, useRouterHistory} from 'react-router';
import {createHistory} from 'history';
import App from 'src/App';
import AlertsApp from 'src/alerts';
@ -29,11 +29,11 @@ let browserHistory;
const basepath = rootNode.dataset.basepath;
window.basepath = basepath;
if (basepath) {
browserHistory = useBasename(createHistory)({
browserHistory = useRouterHistory(createHistory)({
basename: basepath, // this is written in when available by the URL prefixer middleware
});
} else {
browserHistory = useBasename(createHistory)({
browserHistory = useRouterHistory(createHistory)({
basename: "",
});
}

BIN
ui/src/style/fonts/icomoon.eot
View File

Binary file not shown.

7
ui/src/style/fonts/icomoon.svg
View File

@ -75,6 +75,13 @@
<glyph unicode="&#xe93f;" glyph-name="diamond" d="M512-212.48c-30.72 0-58.88 10.24-81.92 33.28l-353.28 353.28c-46.080 46.080-46.080 117.76 0 163.84l353.28 353.28c46.080 46.080 117.76 46.080 163.84 0l353.28-353.28c46.080-46.080 46.080-117.76 0-163.84l-353.28-353.28c-23.040-20.48-51.2-33.28-81.92-33.28zM512 647.68c-10.24 0-20.48-2.56-28.16-10.24l-353.28-353.28c-15.36-15.36-15.36-38.4 0-53.76l353.28-353.28c15.36-15.36 38.4-15.36 53.76 0l353.28 353.28c15.36 15.36 15.36 38.4 0 53.76l-353.28 353.28c-5.12 5.12-15.36 10.24-25.6 10.24z" />
<glyph unicode="&#xe940;" glyph-name="circle" d="M512-140.8c-217.6 0-396.8 179.2-396.8 396.8s179.2 396.8 396.8 396.8 396.8-179.2 396.8-396.8-179.2-396.8-396.8-396.8zM512 576c-176.64 0-320-143.36-320-320s143.36-320 320-320 320 143.36 320 320-143.36 320-320 320z" />
<glyph unicode="&#xe941;" glyph-name="export" d="M921.6-153.6c0-28.16-23.040-51.2-51.2-51.2h-768c-28.16 0-51.2 23.040-51.2 51.2v768c0 28.16 23.040 51.2 51.2 51.2h281.6c15.36 0 25.6 10.24 25.6 25.6v0c0 15.36-10.24 25.6-25.6 25.6h-281.6c-56.32 0-102.4-46.080-102.4-102.4v-768c0-56.32 46.080-102.4 102.4-102.4h768c56.32 0 102.4 46.080 102.4 102.4v281.6c0 15.36-10.24 25.6-25.6 25.6v0c-15.36 0-25.6-10.24-25.6-25.6v-281.6zM921.6 768h-384c-15.36 0-25.6-10.24-25.6-25.6v-102.4c0-15.36 10.24-25.6 25.6-25.6h225.28l-414.72-414.72c-10.24-10.24-10.24-25.6 0-35.84l71.68-71.68c10.24-10.24 25.6-10.24 35.84 0l414.72 414.72v-225.28c0-15.36 10.24-25.6 25.6-25.6h102.4c15.36 0 25.6 10.24 25.6 25.6v384c0 56.32-46.080 102.4-102.4 102.4z" />
<glyph unicode="&#xe942;" glyph-name="expand-b" d="M947.2 665.6h-870.4c-43.52 0-76.8-33.28-76.8-76.8v-665.6c0-43.52 33.28-76.8 76.8-76.8h870.4c43.52 0 76.8 33.28 76.8 76.8v665.6c0 43.52-33.28 76.8-76.8 76.8zM307.2-64c0-7.68-5.12-12.8-12.8-12.8h-192c-15.36 0-25.6 10.24-25.6 25.6v192c0 7.68 5.12 12.8 12.8 12.8h51.2c7.68 0 12.8-5.12 12.8-12.8v-140.8h140.8c7.68 0 12.8-5.12 12.8-12.8v-51.2zM307.2 524.8c0-7.68-5.12-12.8-12.8-12.8h-140.8v-140.8c0-7.68-5.12-12.8-12.8-12.8h-51.2c-7.68 0-12.8 5.12-12.8 12.8v192c0 15.36 10.24 25.6 25.6 25.6h192c7.68 0 12.8-5.12 12.8-12.8v-51.2zM947.2-51.2c0-15.36-10.24-25.6-25.6-25.6h-192c-7.68 0-12.8 5.12-12.8 12.8v51.2c0 7.68 5.12 12.8 12.8 12.8h140.8v140.8c0 7.68 5.12 12.8 12.8 12.8h51.2c7.68 0 12.8-5.12 12.8-12.8v-192zM947.2 371.2c0-7.68-5.12-12.8-12.8-12.8h-51.2c-7.68 0-12.8 5.12-12.8 12.8v140.8h-140.8c-7.68 0-12.8 5.12-12.8 12.8v51.2c0 7.68 5.12 12.8 12.8 12.8h192c15.36 0 25.6-10.24 25.6-25.6v-192z" />
<glyph unicode="&#xe943;" glyph-name="expand-c" d="M947.2 665.6h-870.4c-43.52 0-76.8-33.28-76.8-76.8v-665.6c0-43.52 33.28-76.8 76.8-76.8h870.4c43.52 0 76.8 33.28 76.8 76.8v665.6c0 43.52-33.28 76.8-76.8 76.8zM691.2-51.2c0-28.16-23.040-51.2-51.2-51.2h-537.6c-28.16 0-51.2 23.040-51.2 51.2v409.6c0 28.16 23.040 51.2 51.2 51.2h537.6c28.16 0 51.2-23.040 51.2-51.2v-409.6z" />
<glyph unicode="&#xe944;" glyph-name="expand-a" d="M870.4 25.6c0-12.8-12.8-25.6-25.6-25.6h-665.6c-12.8 0-25.6 12.8-25.6 25.6v460.8c0 12.8 12.8 25.6 25.6 25.6h665.6c12.8 0 25.6-12.8 25.6-25.6v-460.8zM89.6 588.8h153.6c7.68 0 12.8 5.12 12.8 12.8v51.2c0 7.68-5.12 12.8-12.8 12.8h-166.4c-43.52 0-76.8-33.28-76.8-76.8v-166.4c0-7.68 5.12-12.8 12.8-12.8h51.2c7.68 0 12.8 5.12 12.8 12.8v153.6c0 7.68 5.12 12.8 12.8 12.8zM76.8-64v153.6c0 7.68-5.12 12.8-12.8 12.8h-51.2c-7.68 0-12.8-5.12-12.8-12.8v-166.4c0-43.52 33.28-76.8 76.8-76.8h166.4c7.68 0 12.8 5.12 12.8 12.8v51.2c0 7.68-5.12 12.8-12.8 12.8h-153.6c-7.68 0-12.8 5.12-12.8 12.8zM934.4-76.8h-153.6c-7.68 0-12.8-5.12-12.8-12.8v-51.2c0-7.68 5.12-12.8 12.8-12.8h166.4c43.52 0 76.8 33.28 76.8 76.8v166.4c0 7.68-5.12 12.8-12.8 12.8h-51.2c-7.68 0-12.8-5.12-12.8-12.8v-153.6c0-7.68-5.12-12.8-12.8-12.8zM947.2 576v-153.6c0-7.68 5.12-12.8 12.8-12.8h51.2c7.68 0 12.8 5.12 12.8 12.8v166.4c0 43.52-33.28 76.8-76.8 76.8h-166.4c-7.68 0-12.8-5.12-12.8-12.8v-51.2c0-7.68 5.12-12.8 12.8-12.8h153.6c7.68 0 12.8-5.12 12.8-12.8z" />
<glyph unicode="&#xe945;" glyph-name="undo" horiz-adv-x="908" d="M891.811 323.956c-31.651 118.691-107.985 218.298-214.575 279.738-80.058 46.080-169.891 67.025-260.189 60.975l-6.982 51.2c-3.258 23.273-19.549 42.356-41.425 49.338-22.342 6.982-46.545 0.931-62.371-16.291l-167.564-178.269c-12.567-13.498-18.618-31.651-15.825-50.269 2.793-18.153 13.498-34.444 29.324-43.753l209.455-123.345c9.309-5.585 20.015-8.378 30.72-8.378 11.636 0 23.273 3.258 33.513 10.24 19.084 13.033 29.324 35.84 26.065 58.647l-9.309 65.629c49.338 0.931 97.745-11.636 141.498-36.771 63.302-36.771 108.916-95.884 127.535-166.633 39.098-146.153-47.942-296.96-193.629-336.524-146.153-39.098-296.495 47.942-335.593 194.095-13.498 49.804-64.233 79.127-114.036 65.629s-79.127-64.233-65.629-114.036c55.389-205.265 241.571-341.178 444.975-341.178 39.098 0 79.127 5.12 119.156 15.825 244.829 65.629 390.516 318.836 324.887 564.131z" />
<glyph unicode="&#xe946;" glyph-name="redo" horiz-adv-x="908" d="M838.749 199.68c-49.804 13.498-100.538-16.291-114.036-65.629-39.098-146.153-189.905-233.193-335.593-194.095-146.153 39.098-233.193 189.905-194.095 336.524 33.513 123.345 146.618 204.8 269.498 202.938l-9.309-65.164c-3.258-22.807 6.982-45.615 26.065-58.647 10.24-6.982 21.876-10.24 33.513-10.24 10.705 0 20.945 2.793 30.72 8.378l209.455 123.345c15.825 9.309 26.531 25.135 29.324 43.753 2.793 18.153-3.258 36.771-15.825 50.269l-167.564 178.269c-15.825 16.756-40.029 23.273-62.371 16.291s-38.167-26.065-41.425-49.338l-6.982-51.2c-214.575 13.964-416.582-125.207-474.298-341.178-65.629-245.295 80.058-498.502 325.353-564.596 39.564-10.705 79.593-15.825 119.156-15.825 202.938 0 389.585 135.913 444.509 341.644 13.033 50.269-16.756 101.004-66.095 114.502z" />
<glyph unicode="&#xe947;" glyph-name="heroku" d="M819.2 768h-614.4c-43.52 0-76.8-33.28-76.8-76.8v-870.4c0-43.52 33.28-76.8 76.8-76.8h614.4c43.52 0 76.8 33.28 76.8 76.8v870.4c0 43.52-33.28 76.8-76.8 76.8zM399.36-2.56l-115.2-92.16c0 0-2.56-2.56-5.12-2.56 0 0-2.56 0-2.56 0-2.56 0-2.56 2.56-2.56 5.12v194.56c0 2.56 2.56 5.12 2.56 5.12 2.56 0 5.12 0 7.68 0l115.2-102.4c2.56 0 2.56-2.56 2.56-5.12 0 0 0-2.56-2.56-2.56zM750.080-89.6c0-2.56-2.56-5.12-5.12-5.12h-115.2c-2.56 0-5.12 2.56-5.12 5.12v268.8c0 23.040 0 43.52-15.36 56.32-12.8 10.24-35.84 12.8-71.68 7.68-46.080-7.68-97.28-20.48-143.36-33.28-2.56 0-5.12-2.56-7.68-2.56s-7.68-2.56-10.24-2.56c-2.56 0-5.12-2.56-7.68-2.56s-7.68-2.56-10.24-2.56c-2.56 0-5.12-2.56-7.68-2.56s-5.12-2.56-7.68-2.56c-2.56 0-5.12-2.56-7.68-2.56s-5.12-2.56-7.68-2.56c-2.56 0-5.12-2.56-7.68-2.56s-2.56-2.56-5.12-2.56-5.12-2.56-7.68-5.12c0 0-2.56 0-2.56-2.56-2.56-2.56-5.12-2.56-7.68-5.12 0 0-2.56 0-2.56 0-2.56-2.56-5.12-5.12-7.68-5.12 0 0-2.56 0-2.56 0s0 0 0 0 0 0 0 0-2.56 0-2.56 0c0 0 0 0 0 0s0 0 0 0 0 0 0 0 0 2.56 0 2.56c0 0 0 0 0 2.56 0 0 0 0 0 0v432.64c0 2.56 2.56 5.12 5.12 5.12h115.2c2.56 0 5.12-2.56 5.12-5.12v-261.12c58.88 17.92 138.24 33.28 212.48 23.040 81.92-10.24 135.68-48.64 135.68-189.44v-266.24zM668.16 435.2c0-2.56-2.56-2.56-5.12-2.56h-115.2c-2.56 0-5.12 2.56-5.12 2.56s0 5.12 0 7.68c28.16 38.4 79.36 107.52 79.36 158.72 0 2.56 2.56 5.12 5.12 5.12h115.2c2.56 0 5.12-2.56 5.12-5.12 2.56-53.76-51.2-125.44-79.36-166.4z" />
<glyph unicode="&#xe948;" glyph-name="heroku-simple" d="M348.16-120.32l-166.4-133.12c-2.56-2.56-2.56-2.56-5.12-2.56s-2.56 0-5.12 0c-2.56 2.56-5.12 5.12-5.12 7.68v281.6c0 2.56 2.56 7.68 5.12 7.68 2.56 2.56 7.68 0 10.24-2.56l166.4-148.48c2.56-2.56 2.56-5.12 2.56-7.68 2.56 0 0-2.56-2.56-2.56zM857.6-245.76c0-5.12-5.12-10.24-10.24-10.24h-166.4c-5.12 0-10.24 5.12-10.24 10.24v391.68c0 30.72 0 64-20.48 81.92-17.92 15.36-53.76 20.48-102.4 12.8-66.56-10.24-140.8-28.16-207.36-48.64-5.12 0-7.68-2.56-10.24-2.56-5.12-2.56-10.24-2.56-15.36-5.12-2.56 0-7.68-2.56-10.24-2.56-5.12-2.56-10.24-2.56-12.8-5.12-2.56 0-7.68-2.56-10.24-2.56-5.12-2.56-7.68-2.56-12.8-5.12-2.56-2.56-7.68-2.56-10.24-5.12s-7.68-2.56-10.24-5.12c-5.12-2.56-7.68-2.56-12.8-5.12-2.56 0-5.12-2.56-7.68-2.56-5.12-2.56-7.68-5.12-12.8-7.68-2.56 0-2.56-2.56-5.12-2.56-5.12-2.56-7.68-5.12-12.8-7.68 0 0-2.56 0-2.56-2.56-5.12-2.56-7.68-5.12-12.8-7.68-2.56 0-2.56-2.56-5.12-2.56 0 0 0 0 0 0s0 0 0 0-2.56 0-2.56 0c0 0 0 0 0 0s0 0 0 0 0 0 0 0-2.56 2.56-2.56 2.56c0 0 0 0 0 2.56 0 0 0 0 0 0v629.76c0 5.12 5.12 10.24 10.24 10.24h166.4c5.12 0 10.24-5.12 10.24-10.24v-378.88c87.040 25.6 202.24 48.64 307.2 33.28 117.76-15.36 197.12-69.12 197.12-276.48v-378.88zM739.84 517.12c-2.56-2.56-5.12-5.12-7.68-5.12h-166.4c-2.56 0-7.68 2.56-7.68 5.12s-2.56 7.68 0 10.24c40.96 56.32 115.2 158.72 115.2 230.4 0 5.12 5.12 10.24 10.24 10.24h166.4c5.12 0 10.24-5.12 10.24-10.24-2.56-76.8-79.36-181.76-120.32-240.64z" />
<glyph unicode="&#xea88;" glyph-name="google" d="M522.2 329.2v-175.6h290.4c-11.8-75.4-87.8-220.8-290.4-220.8-174.8 0-317.4 144.8-317.4 323.2s142.6 323.2 317.4 323.2c99.4 0 166-42.4 204-79l139 133.8c-89.2 83.6-204.8 134-343 134-283 0-512-229-512-512s229-512 512-512c295.4 0 491.6 207.8 491.6 500.2 0 33.6-3.6 59.2-8 84.8l-483.6 0.2z" />
<glyph unicode="&#xea8a;" glyph-name="google3" d="M512 768c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM519.6-128c-212.2 0-384 171.8-384 384s171.8 384 384 384c103.6 0 190.4-37.8 257.2-100.4l-104.2-100.4c-28.6 27.4-78.4 59.2-153 59.2-131.2 0-238-108.6-238-242.4s107-242.4 238-242.4c152 0 209 109.2 217.8 165.6h-217.8v131.6h362.6c3.2-19.2 6-38.4 6-63.6 0.2-219.4-146.8-375.2-368.6-375.2z" />
<glyph unicode="&#xea8b;" glyph-name="google-plus" d="M325.8 310.6v-111.8h184.8c-7.4-48-55.8-140.6-184.8-140.6-111.2 0-202 92.2-202 205.8s90.8 205.8 202 205.8c63.4 0 105.6-27 129.8-50.2l88.4 85.2c-56.8 53-130.4 85.2-218.2 85.2-180.2-0.2-325.8-145.8-325.8-326s145.6-325.8 325.8-325.8c188 0 312.8 132.2 312.8 318.4 0 21.4-2.4 37.8-5.2 54h-307.6zM1024 320h-96v96h-96v-96h-96v-96h96v-96h96v96h96z" />

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 69 KiB

BIN
ui/src/style/fonts/icomoon.ttf
View File

Binary file not shown.

BIN
ui/src/style/fonts/icomoon.woff
View File

Binary file not shown.

BIN
ui/src/style/fonts/icomoon.woff2
View File

Binary file not shown.

4
ui/src/style/mixins/mixins.scss
View File

@ -30,12 +30,12 @@ $scrollbar-width: 16px;
}
&-track-piece {
background-color: $trackColor;
border: 6px solid $trackColor;
border: 3px solid $trackColor;
border-radius: ($scrollbar-width / 2);
}
&-thumb {
background-color: $handleColor;
border: 6px solid $trackColor;
border: 3px solid $trackColor;
border-radius: ($scrollbar-width / 2);
}
&-corner {

21
ui/src/style/theme/bootstrap-theme.scss
View File

@ -335,6 +335,27 @@
.icon.export:before {
content: "\e941";
}
.icon.expand-b:before {
content: "\e942";
}
.icon.expand-c:before {
content: "\e943";
}
.icon.expand-a:before {
content: "\e944";
}
.icon.undo:before {
content: "\e945";
}
.icon.redo:before {
content: "\e946";
}
.icon.heroku:before {
content: "\e947";
}
.icon.heroku-simple:before {
content: "\e948";
}
.icon.alert-triangle:before {
content: "\f02d";
}