Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Hosts Page Apps Tag Parsing #2398

Merged
merged 4 commits into from
Nov 28, 2017
Merged

Fix Hosts Page Apps Tag Parsing #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27ca493
Add null guard to tag parsing function to prevent parsing values that…
cryptoquick Nov 21, 2017
8b2bac5
Changelog.
cryptoquick Nov 21, 2017
dc75734
Merge branch 'master' into bugfix/hosts-page-error-2255
cryptoquick Nov 28, 2017
9d526d5
Merge branch 'master' into bugfix/hosts-page-error-2255
cryptoquick Nov 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
1. [#2327](https://github.com/influxdata/chronograf/pull/2327): Visualize CREATE/DELETE queries with Table view in Data Explorer
1. [#2329](https://github.com/influxdata/chronograf/pull/2329): Include tag values alongside measurement name in Data Explorer result tabs
1. [#2386](https://github.com/influxdata/chronograf/pull/2386): Fix queries that include regex, numbers and wildcard
1. [#2398](https://github.com/influxdata/chronograf/pull/2398): Fix apps on hosts page from parsing tags with null values
1. [#2408](https://github.com/influxdata/chronograf/pull/2408): Fix updated Dashboard names not updating dashboard list

### Features
Expand Down
22 changes: 13 additions & 9 deletions ui/src/hosts/apis/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,21 @@ function parseSeries(series) {
function parseTag(s, obj) {
const match = tag.exec(s)

const kv = match[0]
const key = match[1]
const value = match[2]

if (key) {
if (!obj.tags) {
obj.tags = {}
if (match) {
const kv = match[0]
const key = match[1]
const value = match[2]

if (key) {
if (!obj.tags) {
obj.tags = {}
}
obj.tags[key] = value
}
obj.tags[key] = value
return s.slice(match.index + kv.length)
}
return s.slice(match.index + kv.length)

return ''
}

let workStr = series.slice()
Expand Down