Skip to content

Remove deprecated object metrics#1305

Merged
stefanprodan merged 1 commit intofluxcd:mainfrom
hasithsen:main
Dec 11, 2024
Merged

Remove deprecated object metrics#1305
stefanprodan merged 1 commit intofluxcd:mainfrom
hasithsen:main

Conversation

@hasithsen
Copy link
Copy Markdown
Contributor

@hasithsen hasithsen commented Dec 9, 2024

Suspend and readiness metrics recording removed from Kustomization reconciler.

Refer fluxcd/flux2#5083.

Comment thread internal/controller/kustomization_controller.go
Copy link
Copy Markdown
Contributor

@darkowlzz darkowlzz left a comment

Choose a reason for hiding this comment

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

Thanks for working on this.

Metrics before

# HELP gotk_reconcile_condition The current condition status of a GitOps Toolkit resource reconciliation.
# TYPE gotk_reconcile_condition gauge
gotk_reconcile_condition{kind="Kustomization",name="podinfo",namespace="default",status="False",type="Ready"} 0
gotk_reconcile_condition{kind="Kustomization",name="podinfo",namespace="default",status="True",type="Ready"} 1
gotk_reconcile_condition{kind="Kustomization",name="podinfo",namespace="default",status="Unknown",type="Ready"} 0
# HELP gotk_reconcile_duration_seconds The duration in seconds of a GitOps Toolkit resource reconciliation.
# TYPE gotk_reconcile_duration_seconds histogram
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.01"} 0
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.038363583488692544"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.1471764538093883"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.5646216173286169"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="2.166090855590701"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="8.309900738254731"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="31.879757075478317"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="122.30217221643493"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="469.19495946736544"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="1799.9999999999986"} 2
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="+Inf"} 2
gotk_reconcile_duration_seconds_sum{kind="Kustomization",name="podinfo",namespace="default"} 0.35714156
gotk_reconcile_duration_seconds_count{kind="Kustomization",name="podinfo",namespace="default"} 2
# HELP gotk_suspend_status The current suspend status of a GitOps Toolkit resource.
# TYPE gotk_suspend_status gauge
gotk_suspend_status{kind="Kustomization",name="podinfo",namespace="default"} 0

After:

# HELP gotk_reconcile_duration_seconds The duration in seconds of a GitOps Toolkit resource reconciliation.
# TYPE gotk_reconcile_duration_seconds histogram
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.01"} 0
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.038363583488692544"} 0
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.1471764538093883"} 0
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="0.5646216173286169"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="2.166090855590701"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="8.309900738254731"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="31.879757075478317"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="122.30217221643493"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="469.19495946736544"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="1799.9999999999986"} 1
gotk_reconcile_duration_seconds_bucket{kind="Kustomization",name="podinfo",namespace="default",le="+Inf"} 1
gotk_reconcile_duration_seconds_sum{kind="Kustomization",name="podinfo",namespace="default"} 0.250414117
gotk_reconcile_duration_seconds_count{kind="Kustomization",name="podinfo",namespace="default"} 1

LGTM!

@darkowlzz
Copy link
Copy Markdown
Contributor

darkowlzz commented Dec 11, 2024

@hasithsen it would be nice to squash the two commits to a single commit, removing the statement about restoring metric from commit message, if you can. Otherwise, I'll take care of it.

Comment thread internal/controller/kustomization_controller.go Outdated
@darkowlzz darkowlzz changed the title feat: Remove deprecated object metrics from controllers fluxcd/flux2#5083 Remove deprecated object metrics Dec 11, 2024
@hasithsen
Copy link
Copy Markdown
Contributor Author

@darkowlzz, sorry about the multiple hiccups, resolved white space issue and squashed changes to a single commit.

@stefanprodan stefanprodan merged commit ca40713 into fluxcd:main Dec 11, 2024
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.

3 participants