Skip to content

feat(prom): Add prometheus metrics reset support #5287 #5304

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
Merged
merged 7 commits into from
Feb 10, 2021
Merged

feat(prom): Add prometheus metrics reset support #5287 #5304

merged 7 commits into from
Feb 10, 2021

Conversation

victorboissiere
Copy link
Contributor

@victorboissiere victorboissiere commented Jan 24, 2021 •
edited
Loading

Add support for Prometheus metrics reset schedule to fix #5287

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • My build is green (troubleshooting builds).

@victorboissiere
feat(prom): Add prometheus metrics reset support
2969296 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere
docs: Add prom metrics reset
b48198f 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere victorboissiere force-pushed the prometheus-metrics-reset branch from 36fa421 to b48198f Compare January 24, 2021 16:37
@codecov-io
Copy link

codecov-io commented Jan 24, 2021 •
edited
Loading

Codecov Report

Merging #5304 (1b889fe) into master (e02b864) will decrease coverage by 0.11%.
The diff coverage is 82.60%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5304      +/-   ##
==========================================
- Coverage   41.08%   40.97%   -0.12%     
==========================================
  Files         136      137       +1     
  Lines       18365    18585     +220     
==========================================
+ Hits         7546     7615      +69     
- Misses       9741     9883     +142     
- Partials     1078     1087       +9
Impacted Files Coverage Δ
controller/appcontroller.go 53.55% <50.00%> (-0.13%) ⬇️
controller/metrics/metrics.go 76.42% <89.47%> (+2.38%) ⬆️
util/cache/inmemory.go 35.13% <0.00%> (-14.87%) ⬇️
server/application/broadcaster.go 71.42% <0.00%> (-7.15%) ⬇️
controller/state.go 69.64% <0.00%> (-5.65%) ⬇️
util/cache/appstate/cache.go 62.50% <0.00%> (-4.17%) ⬇️
util/cache/cache.go 70.21% <0.00%> (-3.13%) ⬇️
pkg/apis/application/v1alpha1/types.go 55.64% <0.00%> (-0.80%) ⬇️
server/application/application.go 28.37% <0.00%> (-0.70%) ⬇️
reposerver/repository/repository.go 62.41% <0.00%> (-0.19%) ⬇️
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e02b864...1b889fe. Read the comment docs.

@victorboissiere victorboissiere marked this pull request as draft January 24, 2021 16:58
@victorboissiere
metrics: Add cron format test and add error handler
59dcf01 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere victorboissiere force-pushed the prometheus-metrics-reset branch from 269708a to 59dcf01 Compare January 24, 2021 17:01
@victorboissiere
tests: Fix return value not checked
534f378 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere victorboissiere force-pushed the prometheus-metrics-reset branch from 41f3b67 to 534f378 Compare January 24, 2021 17:06
@victorboissiere
docs: Fix generated doc
3ec5f30 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere victorboissiere marked this pull request as ready for review January 24, 2021 17:46
@jessesuen
Copy link
Member

Is there a use case for using a cron expression over something simpler such as an interval? We're thinking to make this simpler to use, as well as more consistent with our other controller flags (e.g. resync period, cache durations) and control this using an interval instead.

@victorboissiere
Copy link
Contributor Author

@jessesuen, the only use case would be to make it explicit when the reset schedule runs.
But you're absolutely right. I haven't thought of using an interval. I will make the changes.
To keep it consistent with other flags, I propose to use --metrics-cache-expiration.

@victorboissiere
controller: Update flag type from cron to duration
1b889fe 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere victorboissiere force-pushed the prometheus-metrics-reset branch from c4dadb5 to 1b889fe Compare January 30, 2021 14:53
@victorboissiere
controller: Add tests comment
59fedc8 
Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@victorboissiere
Copy link
Contributor Author

@jessesuen I've updated the PR with the changes

alexmt
alexmt approved these changes Feb 10, 2021
View reviewed changes
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

Thank you @victorboissiere . LGTM

@alexmt alexmt merged commit e0f7731 into argoproj:master Feb 10, 2021
shubhamagarwal19 pushed a commit to shubhamagarwal19/argo-cd that referenced this pull request Apr 15, 2021
@victorboissiere @Shubhama19
feat(prom): Add prometheus metrics reset support argoproj#5287 (argop…
68a07b2 
…roj#5304)

* feat(prom): Add prometheus metrics reset support

Signed-off-by: Victor Boissiere <victor.boissiere@gmail.com>
@alexmt alexmt mentioned this pull request Jun 12, 2025
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexmt alexmt alexmt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Prometheus metrics cache causes scaling issues with ephemeral projects and apps
4 participants
@victorboissiere @codecov-io @jessesuen @alexmt