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.

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

[bitnami/redis] - add missing fields in service/pod monitor #22809

Merged
merged 20 commits into from
Feb 13, 2024
Merged

[bitnami/redis] - add missing fields in service/pod monitor #22809

merged 20 commits into from
Feb 13, 2024
+53 −15

Conversation

shlomitubul
Copy link
Contributor

@shlomitubul shlomitubul commented Jan 28, 2024 •
edited
Loading

Description of the change

When using multiple endpoints in pod-monitor in order to scrape both Sentinel and Redis metrics if
not passing metricRelabelings with unique values (e.g app=redis) the metrics get aggregated from both containers,
this PR mainly fixes a potential bug I introduced in this PR

Benefits

distinguish between Sentinel and Redis container metrics

Possible drawbacks

none

Applicable issues

Additional information

shlomitubul and others added 11 commits January 17, 2024 15:28
@shlomitubul
[bitnami/redis] - add support for additional-endpoints in service/pod…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
80893a3 
… monitor

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
Update README.md with readme-generator-for-helm
3c82ad2 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
@shlomitubul
[bitnami/redis] - bump redis chart version
69fac90 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
[bitnami/redis] - remove unnecessary selector from pod-monitor.yaml
32b8388 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
[bitnami/redis] - update comment in values.yaml
103e479 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
Merge branch 'main' into main
0166772 
Signed-off-by: shlomi tubul <33376277+shlomitubul@users.noreply.github.com>
@dgomezleon
Merge branch 'main' into main
c7850dc 
Signed-off-by: David Gomez <dgomezleon@vmware.com>
@shlomitubul
Merge branch 'bitnami:main' into main
7277b20
@shlomitubul
[bitnami/redis] - Added metricRelabelings to distinguish between Sent…
32e4d9a 
…inel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
[bitnami/redis] - Added metricRelabelings to distinguish between Sent…
3c06fc0 
…inel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
[bitnami/redis] - bump version
397b771 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@github-actions github-actions bot added redis triage Triage is needed labels Jan 28, 2024
@github-actions github-actions bot requested a review from carrodher January 28, 2024 23:07
@shlomitubul
[bitnami/redis] - revert test values
ae3df47 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
[bitnami/redis] - fix serviceMonitor port value
d670f50 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@carrodher
Copy link
Member

Thanks for your contribution, could you please take a look at the errors related to the metadata in values.yaml used to generate the documentation table in the README.md?

ERROR: Missing metadata for key: metrics.serviceMonitor.port
ERROR: Missing metadata for key: metrics.podMonitor.port
ERROR: Metadata provided for non existing key: metrics.port
ERROR: Metadata provided for non existing key: metrics.port

shlomitubul and others added 4 commits January 29, 2024 15:48
@shlomitubul
[bitnami/redis] - fix port comment in service/pod Monitor section
25ec6a4 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
@shlomitubul
Merge branch 'main' into main
e98bf0b 
Signed-off-by: shlomi tubul <33376277+shlomitubul@users.noreply.github.com>
@shlomitubul
[bitnami/redis] - fix port comment in service/pod Monitor section
2cee5c3 
Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
Update README.md with readme-generator-for-helm
e690cc4 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
@shlomitubul
Copy link
Contributor Author

@carrodher fixed, is there anything else I need to change?

Carlos Rodríguez Hernández and others added 2 commits February 2, 2024 09:31
Merge branch 'main' into main
508b126 
Signed-off-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Update README.md with readme-generator-for-helm
efdc50f 
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
@carrodher carrodher added verify Execute verification workflow for these changes in-progress labels Feb 2, 2024
@github-actions github-actions bot removed the triage Triage is needed label Feb 2, 2024
@github-actions github-actions bot removed the request for review from carrodher February 2, 2024 08:41
@github-actions github-actions bot requested a review from andresbono February 2, 2024 08:41
@andresbono
Merge branch 'main' into main
Loading
Loading status checks…
72c3233 
Signed-off-by: Andrés Bono <andresbono@vmware.com>
andresbono
andresbono approved these changes Feb 13, 2024
View reviewed changes
Copy link
Contributor

@andresbono andresbono left a comment

Choose a reason for hiding this comment

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

LGTM, Thank you for your contribution!

@andresbono andresbono enabled auto-merge (squash) February 13, 2024 16:21
@andresbono andresbono merged commit 4d174a3 into bitnami:main Feb 13, 2024
8 checks passed
antonblr pushed a commit to antonblr/charts that referenced this pull request Feb 15, 2024
@shlomitubul @dgomezleon
@andresbono @antonblr
[bitnami/redis] - add missing fields in service/pod monitor (bitnami#…
f03785a 
…22809)

* [bitnami/redis] - add support for additional-endpoints in service/pod monitor

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* [bitnami/redis] - bump redis chart version

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - remove unnecessary selector from pod-monitor.yaml

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - update comment in values.yaml

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - Added metricRelabelings to distinguish between Sentinel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - Added metricRelabelings to distinguish between Sentinel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - bump version

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - revert test values

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix serviceMonitor port value

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix port comment in service/pod Monitor section

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix port comment in service/pod Monitor section

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: shlomi tubul <33376277+shlomitubul@users.noreply.github.com>
Signed-off-by: David Gomez <dgomezleon@vmware.com>
Signed-off-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Signed-off-by: Andrés Bono <andresbono@vmware.com>
Co-authored-by: ShlomiTubul <shlomi.tubul@placer.ai>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: David Gomez <dgomezleon@vmware.com>
Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Co-authored-by: Andrés Bono <andresbono@vmware.com>
Signed-off-by: antonblr <44246099+antonblr@users.noreply.github.com>
joancafom pushed a commit to dalbani/charts that referenced this pull request Feb 22, 2024
@shlomitubul @dgomezleon
@andresbono @joancafom
[bitnami/redis] - add missing fields in service/pod monitor (bitnami#…
73b2974 
…22809)

* [bitnami/redis] - add support for additional-endpoints in service/pod monitor

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* [bitnami/redis] - bump redis chart version

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - remove unnecessary selector from pod-monitor.yaml

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - update comment in values.yaml

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - Added metricRelabelings to distinguish between Sentinel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - Added metricRelabelings to distinguish between Sentinel and Redis container metrics

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - bump version

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - revert test values

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix serviceMonitor port value

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix port comment in service/pod Monitor section

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* [bitnami/redis] - fix port comment in service/pod Monitor section

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

---------

Signed-off-by: ShlomiTubul <shlomi.tubul@placer.ai>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: shlomi tubul <33376277+shlomitubul@users.noreply.github.com>
Signed-off-by: David Gomez <dgomezleon@vmware.com>
Signed-off-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Signed-off-by: Andrés Bono <andresbono@vmware.com>
Co-authored-by: ShlomiTubul <shlomi.tubul@placer.ai>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: David Gomez <dgomezleon@vmware.com>
Co-authored-by: Carlos Rodríguez Hernández <carlosrh@vmware.com>
Co-authored-by: Andrés Bono <andresbono@vmware.com>
Signed-off-by: Jose Antonio Carmona <jcarmona@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andresbono andresbono

Assignees

@andresbono andresbono

Labels
redis solved verify Execute verification workflow for these changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@shlomitubul @carrodher @andresbono @dgomezleon