Skip to content

feat: add name and labels in cluster metrics (#17870) #18453

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

Merged
merged 8 commits into from
Jan 29, 2025

Conversation

flbla
Copy link
Contributor

@flbla flbla commented May 30, 2024

Closes #17870

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).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

#18452 #17870 #9731

@flbla flbla requested a review from a team as a code owner May 30, 2024 08:25
Copy link

codecov bot commented May 30, 2024

Codecov Report

Attention: Patch coverage is 93.40659% with 6 lines in your changes missing coverage. Please review.

Project coverage is 55.51%. Comparing base (e147247) to head (94d1e8c).
Report is 377 commits behind head on master.

Files with missing lines Patch % Lines
controller/metrics/clustercollector.go 92.85% 4 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #18453      +/-   ##
==========================================
- Coverage   55.51%   55.51%   -0.01%     
==========================================
  Files         339      339              
  Lines       57273    57346      +73     
==========================================
+ Hits        31797    31837      +40     
- Misses      22790    22820      +30     
- Partials     2686     2689       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@aliazlan-t
Copy link

This will be great. Any idea about what is pending and when can this be merged?

@flbla
Copy link
Contributor Author

flbla commented Jun 12, 2024

hi @aliazlan-t,
I think we need to find a maintainer to review it
I tried to link all issues I found but for now without success

@flbla
Copy link
Contributor Author

flbla commented Jul 10, 2024

@rumstead, I updated the metrics according to the comment of @agaudreault

Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

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

Changes for the name lgtm 👍 However, I think the labels should be in a new metric.

@poliveirabp
Copy link

Hi guys, this is an awesome feature, there is any date on mind when this is becoming live?

@agaudreault agaudreault changed the title feat: add name and labels in cluster metrics Closes [ISSUE #18452] feat: add name and labels in cluster metrics (#18452) Aug 14, 2024
@flbla flbla force-pushed the master branch 3 times, most recently from 3ee65bd to 4c36213 Compare October 7, 2024 14:16
@flbla
Copy link
Contributor Author

flbla commented Oct 7, 2024

Hi @agaudreault @rumstead @reggie-k
I rebased my PR.
could you please take a look at it? 🙏
thank you!

@agaudreault agaudreault changed the title feat: add name and labels in cluster metrics (#18452) feat: add name and labels in cluster metrics (#17870) Oct 9, 2024
@flbla flbla force-pushed the master branch 2 times, most recently from ef48123 to a8e2c87 Compare January 3, 2025 14:40
@flbla flbla requested a review from agaudreault January 3, 2025 15:23
Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

can you fix the failing CI checks?

@flbla
Copy link
Contributor Author

flbla commented Jan 17, 2025

can you fix the failing CI checks?

@nitishfy could you please help me with the e2e failing tests I'm not sure it's due to my changes ? thank you

---edit

I rebased my branch, all tests are success

flbla added 3 commits January 21, 2025 09:52
Signed-off-by: flbla <flbla@users.noreply.github.com>
Signed-off-by: flbla <flbla@users.noreply.github.com>
Signed-off-by: flbla <flbla@users.noreply.github.com>
@agaudreault
Copy link
Member

@flbla I will push some update for the review directly on the PR. I think we can merge faster this way than avoiding another full review loop. Good refactor since my last review 💯

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault
Copy link
Member

agaudreault commented Jan 28, 2025

@flbla it would seem like you created a PR from your fork master branch directly which prevent me from pushing modifications. Can you add me as a contributor in your fork/branch protection, or merge the PR on your fork?

The github setting "Maintainers are allowed to edit this pull request." wont work for master branch.

@agaudreault agaudreault self-assigned this Jan 29, 2025
refactor: use ArgoDB lister instead
@flbla
Copy link
Contributor Author

flbla commented Jan 29, 2025

@agaudreault, okay, thank you
I merged your changes (and also added you as contributor if you need to change something else)

Copy link
Member

@rumstead rumstead left a comment

Choose a reason for hiding this comment

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

LGTM - thanks for making your first contribution!

EDIT: seems odd the linter is picking up unchanged files? Maybe a retrigger would help based on this comment in golangci?

@agaudreault agaudreault enabled auto-merge (squash) January 29, 2025 15:51
@agaudreault agaudreault merged commit e4311d8 into argoproj:master Jan 29, 2025
26 checks passed
vasilegroza pushed a commit to vasilegroza/argo-cd that referenced this pull request Feb 27, 2025
…oj#18453)

Signed-off-by: flbla <flbla@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
chzar pushed a commit to chzar/argo-cd that referenced this pull request Mar 3, 2025
…oj#18453)

Signed-off-by: flbla <flbla@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add name label to "argocd_cluster_connection_status" metric
6 participants