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

Get client version dynamically #5862

Merged
merged 3 commits into from
Mar 8, 2016
Merged

Get client version dynamically #5862

merged 3 commits into from
Mar 8, 2016

Conversation

toddboom
Copy link
Contributor

  • CHANGELOG.md updated
  • Rebased/mergable
  • Tests pass
  • Sign CLA (if not already signed)

gunnaraasen
gunnaraasen reviewed Feb 29, 2016
View reviewed changes
services/admin/assets/js/admin.js

query.done(function (data, status, xhr) {
var version = xhr.getResponseHeader('X-InfluxDB-Version');
$('.influxdb-client-version').html('v'+version);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

X-InfluxDB-Version returns unknown when InfluxDB is built without a version, which causes this to display as InfluxDB vunkown.

@gunnaraasen
Copy link
Member

Had one comment, otherwise +1.

@e-dard
Copy link
Contributor

e-dard commented Mar 2, 2016

Needs a rebase, but LGTM 👍

@rossmcdonald rossmcdonald mentioned this pull request Mar 4, 2016
Closed
4 tasks
@rossmcdonald rossmcdonald added this to the 0.11.0 milestone Mar 4, 2016
@rossmcdonald
Copy link
Contributor

@toddboom What needs to be done here to push this through? It looks like the 0.10.2 Admin UI wasn't updated, so the sooner we can get this in the better.

@zstyblik zstyblik mentioned this pull request Mar 4, 2016
Closed
@toddboom
Copy link
Contributor Author

toddboom commented Mar 7, 2016

@rossmcdonald i think @gunnaraasen was going to take a look at closing this out. i'll sync up with him today.

@gunnaraasen gunnaraasen force-pushed the tp-fix-dynamic-admin-versioning branch from bd0af5f to d79fc52 Compare March 8, 2016 02:32
@gunnaraasen
Copy link
Member

@toddboom I changed things around a bit. InfluxDB server version is now set using the header from the getDatabases() request and the v will only be appended when the version is not unknown.

@toddboom
Copy link
Contributor Author

toddboom commented Mar 8, 2016

@gunnaraasen this looks good to me - keeps the code pretty clean and gets the job done. thanks! 👍

gunnaraasen added a commit that referenced this pull request Mar 8, 2016
@gunnaraasen
Merge pull request #5862 from influxdata/tp-fix-dynamic-admin-versioning
0d374ec 
Get client version dynamically
@gunnaraasen gunnaraasen merged commit 0d374ec into master Mar 8, 2016
@gunnaraasen gunnaraasen deleted the tp-fix-dynamic-admin-versioning branch March 8, 2016 03:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.11.0
Development

Successfully merging this pull request may close these issues.
4 participants
@toddboom @gunnaraasen @e-dard @rossmcdonald