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

Use add time for prometheus expiration calculation #7056

Merged
merged 2 commits into from
Feb 24, 2020

Conversation

danielnelson
Copy link
Contributor

closes #6926

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

@danielnelson danielnelson added area/prometheus fix pr to fix corresponding bug labels Feb 20, 2020
@danielnelson danielnelson added this to the 1.13.4 milestone Feb 20, 2020
map[string]interface{}{
"time_idle": 42.0,
},
time.Unix(0, 0),
Copy link
Contributor

Choose a reason for hiding this comment

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

The test probably ought to have different time and addtime to show that addtime is what's used during expiration

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added

@danielnelson danielnelson merged commit b5e0577 into master Feb 24, 2020
@danielnelson danielnelson deleted the prom-expire-add-time branch February 24, 2020 23:53
danielnelson added a commit that referenced this pull request Feb 25, 2020
athoune pushed a commit to bearstech/telegraf that referenced this pull request Apr 17, 2020
idohalevi pushed a commit to idohalevi/telegraf that referenced this pull request Sep 29, 2020
arstercz pushed a commit to arstercz/telegraf that referenced this pull request Mar 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/prometheus fix pr to fix corresponding bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cloudwatch input plugin doesn't work with prometheus output metric_version 2
2 participants