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.

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

fix(influxdb): rename telegraf orgID #13411

Merged
merged 2 commits into from
Jun 3, 2019
Merged

fix(influxdb): rename telegraf orgID #13411

merged 2 commits into from
Jun 3, 2019

Conversation

kelwang
Copy link
Contributor

@kelwang kelwang commented Apr 15, 2019

Closes #13147

rename telegraf config's OrganizationID to OrgID
only merged after #13404 resolved

  • CHANGELOG.md updated with a link to the PR (not the Issue)
  • Rebased/mergeable
  • Tests pass
  • http/swagger.yml updated (if modified Go structs or API)
  • Sign CLA (if not already signed)

Copy link
Contributor

@imogenkinsman imogenkinsman left a comment

Choose a reason for hiding this comment

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

Backend changes look fine to me. This needs a review from someone on chronograf before it can be merged. We may want to hold off on API changes until after our upcoming milestone.

@kelwang kelwang force-pushed the telegraf_rename_orgID branch 2 times, most recently from 22d14af to 9967658 Compare May 15, 2019 20:04
"resolved": "https://registry.npmjs.org/@influxdata/influx/-/influx-0.3.4.tgz",
"integrity": "sha512-WUkugWDdvG5BpdRtdrFPnevFlJOmxod3t91cUuTcUiGdYATqCnVgMYvjmK0oXu/8DFrGAZlzg/u4vMQq8ndhnA==",
"version": "github:influxdata/influxdb2-js#986c7b3ee77e22a10208688b49edcf85ef354be1",
"from": "github:influxdata/influxdb2-js#telegraf_rename_orgID",
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this was set during testing and should be reverted

ui/package.json Outdated
@@ -140,7 +140,7 @@
},
"dependencies": {
"@influxdata/clockface": "0.0.13",
"@influxdata/influx": "0.3.4",
"@influxdata/influx": "github:influxdata/influxdb2-js#telegraf_rename_orgID",
Copy link
Contributor

Choose a reason for hiding this comment

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

See above

Copy link
Contributor

@imogenkinsman imogenkinsman left a comment

Choose a reason for hiding this comment

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

Think this is good to go once package.json has been reverted.

Copy link
Contributor

@imogenkinsman imogenkinsman left a comment

Choose a reason for hiding this comment

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

Preemptively approving this. Once influxdata/influxdb-client-js#115 is approved, we can change the package.json back.

@kelwang kelwang force-pushed the telegraf_rename_orgID branch from 9967658 to fe01f36 Compare June 3, 2019 20:25
@kelwang kelwang force-pushed the telegraf_rename_orgID branch from fe01f36 to 7a40d92 Compare June 3, 2019 23:40
@kelwang kelwang merged commit 3a07e7f into master Jun 3, 2019
@kelwang kelwang deleted the telegraf_rename_orgID branch June 3, 2019 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants