From 0cb915cccf15ad06a52484cd708266c9036fdf74 Mon Sep 17 00:00:00 2001 From: Nathan Haugo Date: Mon, 9 Oct 2017 10:05:53 -0700 Subject: [PATCH 1/3] Fix copy for rp values --- ui/src/admin/components/DatabaseRow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/admin/components/DatabaseRow.js b/ui/src/admin/components/DatabaseRow.js index bff528f3a..60a216138 100644 --- a/ui/src/admin/components/DatabaseRow.js +++ b/ui/src/admin/components/DatabaseRow.js @@ -161,7 +161,7 @@ class DatabaseRow extends Component { name="name" type="text" defaultValue={formattedDuration} - placeholder="INF, 5m, 1d etc" + placeholder="INF, 1h30m, 1d, etc" onKeyDown={this.handleKeyDown} ref={r => (this.duration = r)} autoFocus={!isNew} From 2261c55f8aae15ad68130407960ab099d31d1f6b Mon Sep 17 00:00:00 2001 From: Nathan Haugo Date: Mon, 9 Oct 2017 10:08:26 -0700 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2a908e26..cf4198a6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.3.10.0 [unreleased] +### Bug Fixes +1. [#2095](https://github.com/influxdata/chronograf/pull/2095): Improve the copy in the retention policy edit page +### Features +### UI Improvements + ## v1.3.9.0 [2017-10-06] ### Bug Fixes 1. [#2004](https://github.com/influxdata/chronograf/pull/2004): Fix Data Explorer disappearing query templates in dropdown From 41470d7bbd956d8f7f87941f481abad93b41503a Mon Sep 17 00:00:00 2001 From: Nathan Haugo Date: Tue, 10 Oct 2017 11:07:57 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md Fix markdown --- CHANGELOG.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5f61cc2c..cc2edd39d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ 1. [#2095](https://github.com/influxdata/chronograf/pull/2095): Improve the copy in the retention policy edit page ### Features -1.[#2083](https://github.com/influxdata/chronograf/pull/2083): Every dashboard can now have its own time range +1. [#2083](https://github.com/influxdata/chronograf/pull/2083): Every dashboard can now have its own time range ### UI Improvements @@ -14,12 +14,12 @@ 1. [#2015](https://github.com/influxdata/chronograf/pull/2015): Chronograf shows real status for windows hosts when metrics are saved in non-default db - thank you, @ar7z1! 1. [#2019](https://github.com/influxdata/chronograf/pull/2006): Fix false error warning for duplicate kapacitor name 1. [#2018](https://github.com/influxdata/chronograf/pull/2018): Fix unresponsive display options and query builder in dashboards -1.[#2004](https://github.com/influxdata/chronograf/pull/2004): Fix DE query templates dropdown disappearance -1.[#2006](https://github.com/influxdata/chronograf/pull/2006): Fix no alert for duplicate db name -1.[#2015](https://github.com/influxdata/chronograf/pull/2015): Chronograf shows real status for windows hosts when metrics are saved in non-default db - thank you, @ar7z1! -1.[#2019](https://github.com/influxdata/chronograf/pull/2006): Fix false error warning for duplicate kapacitor name -1.[#2018](https://github.com/influxdata/chronograf/pull/2018): Fix unresponsive display options and query builder in dashboards -1.[#1996](https://github.com/influxdata/chronograf/pull/1996): Able to switch InfluxDB sources on a per graph basis +1. [#2004](https://github.com/influxdata/chronograf/pull/2004): Fix DE query templates dropdown disappearance +1. [#2006](https://github.com/influxdata/chronograf/pull/2006): Fix no alert for duplicate db name +1. [#2015](https://github.com/influxdata/chronograf/pull/2015): Chronograf shows real status for windows hosts when metrics are saved in non-default db - thank you, @ar7z1! +1. [#2019](https://github.com/influxdata/chronograf/pull/2006): Fix false error warning for duplicate kapacitor name +1. [#2018](https://github.com/influxdata/chronograf/pull/2018): Fix unresponsive display options and query builder in dashboards +1. [#1996](https://github.com/influxdata/chronograf/pull/1996): Able to switch InfluxDB sources on a per graph basis ### Features 1. [#1885](https://github.com/influxdata/chronograf/pull/1885): Add `fill` options to data explorer and dashboard queries