Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (40 commits)
  Update chronograf version number
  Fixed the fromCSV function
  Fixed the window function (influxdata#5083)
  Fixed versions and links in readme (influxdata#5063)
  Fix error when editing kapacitor info in onboarding
  fix: active kapacitor updating and ui defaults (influxdata#5079)
  Be less aggressive on windowInterval
  Stop cells with raw/no format selected from getting changed to base 10
  fix(ui): fix decimalPlaces with wrapper (influxdata#5073)
  Escape injected meta query values
  Update changelog for 1.7.7
  Use JWT in enterprise for authentication
  Fix meta query group calls
  Update flux to 0.12 to match influxdb
  updating functions for flux 0.12 (influxdata#5035)
  Update hostname for meta urls for new sources only
  fix: update chronograf version to 1.7.6
  Bugfix/threshold (influxdata#4916)
  fix(logs): fix log color utils (influxdata#4909)
  Set kapacitor state in ConnectionWizard and call syncHostnames for new kapacitors
  ...
  • Loading branch information
afausti committed Mar 13, 2019
2 parents a0a825f + 63e16b0 commit 8942edb
Show file tree
Hide file tree
Showing 8,800 changed files with 3,219,437 additions and 36,274 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.7.0
current_version = 1.7.4
files = README.md server/swagger.json Makefile
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<release>\d+)
serialize = {major}.{minor}.{release}
Expand Down
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ version: 2
jobs:
build:
environment:
DOCKER_TAG: chronograf-20180327
DOCKER_TAG: chronograf-20181214
machine: true
steps:
- checkout
Expand All @@ -53,7 +53,7 @@ jobs:

deploy-nightly:
environment:
DOCKER_TAG: chronograf-20180327
DOCKER_TAG: chronograf-20181214
machine: true
steps:
- attach_workspace:
Expand All @@ -80,7 +80,7 @@ jobs:

deploy-pre-release:
environment:
DOCKER_TAG: chronograf-20180327
DOCKER_TAG: chronograf-20181214
machine: true
steps:
- attach_workspace:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

deploy-release:
environment:
DOCKER_TAG: chronograf-20180327
DOCKER_TAG: chronograf-20181214
machine: true
steps:
- attach_workspace:
Expand Down
46 changes: 42 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,52 @@
## v1.7.4 [unreleased]
## v1.7.8 [2019-02-08]
### Bug Fixes
1. [#5068](https://github.com/influxdata/chronograf/pull/5068): Escape injected meta query values
1. [#5073](https://github.com/influxdata/chronograf/pull/5073): Fix out of range decimal places
1. [#5076](https://github.com/influxdata/chronograf/pull/5076): Stop raw yaxis format from getting updated to 10
1. [#5077](https://github.com/influxdata/chronograf/pull/5077): Correct autoInterval calculations
1. [#5079](https://github.com/influxdata/chronograf/pull/5079): Fix multiple organizations not showing configured kapacitors
1. [#5078](https://github.com/influxdata/chronograf/pull/5078): Fix the inability to edit kapacitor info in the onboarding wizard
1. [#5083](https://github.com/influxdata/chronograf/pull/5083): Fix the column names in the Window function example

## v1.7.7 [2018-01-16]

### Bug Fixes
1. [#5045](https://github.com/influxdata/chronograf/pull/5045): Use JWT in enterprise for authentication in flux

## v1.7.6 [2019-01-14]

### Bug Fixes
1. [#4895](https://github.com/influxdata/chronograf/pull/4895): Properly set scroll to row for table graph
1. [#4906](https://github.com/influxdata/chronograf/pull/4906): Prevent Kapacitor URLs from being overwritten in Connection Wizard.
1. [#4862](https://github.com/influxdata/chronograf/pull/4909): Fix logs intermitently show empty on first load
1. [#5034](https://github.com/influxdata/chronograf/pull/5034): Prevent meta node URLs from being overwritten in Connection Wizard.
1. [#5035](https://github.com/influxdata/chronograf/pull/5035): Update functions list for Flux 0.12

## v1.7.5 [2018-12-14]

### Bug Fixes
1. [#4886](https://github.com/influxdata/chronograf/pull/4886): Update go, node, and alpine versions

## v1.7.4 [2018-12-12]

### Features

### Bug Fixes
1. [4814](https://github.com/influxdata/chronograf/pull/4814): Fix logs page getting stuck on scroll to top
1. [4819](https://github.com/influxdata/chronograf/pull/4819): Fix momentary display of fallback notes while dashboard is loading
1. [4819](https://github.com/influxdata/chronograf/pull/4819): Fix issue displaying UUIDs in table cells
1. [#4814](https://github.com/influxdata/chronograf/pull/4814): Fix logs page getting stuck on scroll to top
1. [#4819](https://github.com/influxdata/chronograf/pull/4819): Fix momentary display of fallback notes while dashboard is loading
1. [#4819](https://github.com/influxdata/chronograf/pull/4819): Fix issue displaying UUIDs in table cells
1. [#4854](https://github.com/influxdata/chronograf/pull/4854): Update functions list for Flux 0.7.1
1. [#4846](https://github.com/influxdata/chronograf/pull/4846): Fix missing data and type in refreshing graph
1. [#4861](https://github.com/influxdata/chronograf/pull/4861): Fix logs stuck in loading state
1. [#4847](https://github.com/influxdata/chronograf/pull/4847): Improve display of Flux Wizard on small screens
1. [#4863](https://github.com/influxdata/chronograf/pull/4863): Update logs histogram data on click and new search
1. [#4872](https://github.com/influxdata/chronograf/pull/4872): Prevent cell renaming widget from pushing other header elements offscreen
1. [#4877](https://github.com/influxdata/chronograf/pull/4877): Fix flux editor scrollbars
1. [#4840](https://github.com/influxdata/chronograf/pull/4840): Use valid characters for sensu ids

### UI Improvements
1. [#4809](https://github.com/influxdata/chronograf/pull/4809): Add loading spinners while fetching protoboards
1. [4845](https://github.com/influxdata/chronograf/pull/4845): Allow Kapacitor step in Connection Configuration to be skipped

## v1.7.3 [2018-11-13]

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gliderlabs/alpine
FROM alpine:3.8
MAINTAINER Chris Goller <chris@influxdb.com>

ENV PROTOBOARDS_PATH /usr/share/chronograf/protoboards
Expand Down
Loading

0 comments on commit 8942edb

Please sign in to comment.