Support multiple AmazonCloudWatchAgent CRs and add integration for Prometheus Target Allocator #126
+1,755
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Prometheus monitoring with Target Allocator (#86) * add support for configurable modes for cloudwatch agent CR * Adding more configurable fields * adding support for certs with multiple agent workloaf * Adding support for conditional target-allocator cluster roles * adding support for replicas * adding support for replicas * fixing values.yaml * fixing values.yaml * Updating operator cluster-role to perform CRUD operations on pdb * adding support for custom target-allocator images * bug fixed for parsing prom config * Update Agent workload comment Co-authored-by: Kaushik Surya <[email protected]> --------- Co-authored-by: okankoAMZ <[email protected]> Co-authored-by: Kaushik Surya <[email protected]>
# Conflicts: # charts/amazon-cloudwatch-observability/templates/certmanager.yaml # charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
sky333999
changed the title
musa-asad
reviewed
Dec 17, 2024
| allocationStrategy: "consistent-hashing" | ||
| {{- if $customAgent.prometheus.targetAllocator.prometheusCR }} | ||
| prometheusCR: {{ $customAgent.prometheus.targetAllocator.prometheusCR.enabled | default false }} | ||
| {{- end }} |
There was a problem hiding this comment.
We need to add this to allow the user to use the agent values.
Suggested change
| {{- end }} | |
| {{- end }} | |
| {{- else if $.Values.agent.prometheus.targetAllocator }} | |
| targetAllocator: | |
| enabled: {{ $.Values.agent.prometheus.targetAllocator.enabled | default false }} | |
| image: {{ include "target-allocator.modify-image" (merge (dict "image" $.Values.agent.prometheus.targetAllocator.image) $ ) }} | |
| allocationStrategy: "consistent-hashing" | |
| {{- if $.Values.agent.prometheus.targetAllocator.prometheusCR }} | |
| prometheusCR: {{ $.Values.agent.prometheus.targetAllocator.prometheusCR.enabled | default false }} | |
| {{- end }} |
musa-asad
reviewed
Dec 17, 2024
| {{- with $customAgent.prometheus.config }} | ||
| config: | ||
| {{- toYaml . | nindent 6 }} | ||
| {{- end }} |
There was a problem hiding this comment.
We need to add this to allow the user to use the agent values.
Suggested change
| {{- end }} | |
| {{- end }} | |
| {{- else if $.Values.agent.prometheus.config }} | |
| prometheus: | |
| {{- with $.Values.agent.prometheus.config }} | |
| config: | |
| {{- toYaml . | nindent 6 }} | |
| {{- end }} |
okankoAMZ
commented
Dec 17, 2024
okankoAMZ
commented
Dec 17, 2024
sky333999
reviewed
Dec 17, 2024
sky333999
reviewed
Dec 17, 2024
# Conflicts: # charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml # charts/amazon-cloudwatch-observability/values.yaml
sky333999
approved these changes
Dec 17, 2024
|
There's room for improvements with how we handle the overlays for Did a helm template render of the chart with and without this change and the diffs look as expected - essentially a no-op in the default case. |
mitali-salvi
approved these changes
Dec 17, 2024
musa-asad
approved these changes
Dec 17, 2024
|
I don't understand why this is merged into the main, but no new releases are done. How can we know if this available on release 2.6.0 or not ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.