Add support for a supplemental YAML configuration for the CloudWatchAgent #241
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
jefchien
approved these changes
Oct 15, 2024
| @@ -167,6 +167,9 @@ type AmazonCloudWatchAgentSpec struct { | |||
| // Config is the raw JSON to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details. | |||
| // +required | |||
| Config string `json:"config,omitempty"` | |||
| // Config is the raw YAML to be used as the collector's configuration. Refer to the OpenTelemetry Collector documentation for details. | |||
There was a problem hiding this comment.
nit: Would specify that it's in addition to the JSON.
sky333999
approved these changes
Oct 16, 2024
| @@ -25,3 +27,16 @@ func ReplaceConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, error) { | |||
|
|
|||
| return string(out), nil | |||
| } | |||
|
|
|||
| func ReplaceOtelConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, error) { | |||
There was a problem hiding this comment.
nit: What is this replacing?
| continue | ||
| } | ||
|
|
||
| exprtPorts, err := cmptParser.Ports() |
There was a problem hiding this comment.
nit: Should this be called receiverPorts?
okankoAMZ
pushed a commit
to okankoAMZ/amazon-cloudwatch-agent-operator
that referenced
this pull request
Oct 31, 2024
okankoAMZ
added a commit
that referenced
this pull request
Nov 5, 2024
* Adding support for NodeJS auto instrumentation and integ tests (#220) * Support configurable resources for NodeJS. (#225) * Supporting JMX annotations (#240) * Add support for a supplemental YAML configuration for the CloudWatchAgent (#241) * Changed naming for OTLP container ports from agent JSON (#252) * Updated Release Notes for 1.8.0 (#251) * Adjust EKS add-on integration test service count expectations (#256) * Add integration tests for JMX. (#250) * Implemented Target Allocator Container (#214) * Implemented TargetAllocator resource deployments. (#208) * Update cmd/amazon-cloudwatch-agent-target-allocator/config/config.go Co-authored-by: Musa <musaasad@amazon.com> * Update internal/config/main.go Co-authored-by: Musa <musaasad@amazon.com> --------- Co-authored-by: Parampreet Singh <50599809+Paramadon@users.noreply.github.com> Co-authored-by: Musa <musaasad@amazon.com> Co-authored-by: Mitali Salvi <44349099+mitali-salvi@users.noreply.github.com> Co-authored-by: Jeffrey Chien <chienjef@amazon.com>
okankoAMZ
added a commit
that referenced
this pull request
Nov 26, 2024
* Implemented Target Allocator Container (#214) * Merge `main` into `target-allocator` (#232) NodeJS merging-in from main * Supporting K8s 1.31 (#222) (#236) Co-authored-by: Mitali Salvi <44349099+mitali-salvi@users.noreply.github.com> * Implemented TargetAllocator resource deployments. (#208) * Adding target-allocator label to service selectors (#242) * Target allocator TLS Implementation (#239) * Ta https server (#2921) * Added https server, tests, secret marshalling --------- Co-authored-by: ItielOlenick <67790309+ItielOlenick@users.noreply.github.com> * [Target Allocator] Enable Deployment and Daemonset modes for Agent (#253) * Changes error to warning * [CI/CD] Add Target Allocator(TA) Build to Build and Upload Workflow (#247) * edited workflow * Clean up managed resources when disabled (#255) * Reconciler now removes un-used managed resources for CWA collector * remove pprof endpoint (#260) * [TA] One service per Target Allocator (#259) * added one-service per TA * Setup cert-watcher for TA server cert (#264) * [TA] Target Allocator TLS Unit-tests (#265) * TLS tests * Injecting Prometheus path if not specified in agent config (#258) * Injecting Prom path if it doesn't exist * Rebasing Target Allocator Branch to Main (#266) * Adding support for NodeJS auto instrumentation and integ tests (#220) * Support configurable resources for NodeJS. (#225) * Supporting JMX annotations (#240) * Add support for a supplemental YAML configuration for the CloudWatchAgent (#241) * Changed naming for OTLP container ports from agent JSON (#252) * Updated Release Notes for 1.8.0 (#251) * Adjust EKS add-on integration test service count expectations (#256) * Add integration tests for JMX. (#250) * Implemented Target Allocator Container (#214) * Implemented TargetAllocator resource deployments. (#208) * Update cmd/amazon-cloudwatch-agent-target-allocator/config/config.go Co-authored-by: Musa <musaasad@amazon.com> * Update internal/config/main.go Co-authored-by: Musa <musaasad@amazon.com> --------- Co-authored-by: Parampreet Singh <50599809+Paramadon@users.noreply.github.com> Co-authored-by: Musa <musaasad@amazon.com> Co-authored-by: Mitali Salvi <44349099+mitali-salvi@users.noreply.github.com> Co-authored-by: Jeffrey Chien <chienjef@amazon.com> --------- Co-authored-by: Musa <musaasad@amazon.com> Co-authored-by: Mitali Salvi <44349099+mitali-salvi@users.noreply.github.com> Co-authored-by: ItielOlenick <67790309+ItielOlenick@users.noreply.github.com> Co-authored-by: Kaushik Surya <108111936+sky333999@users.noreply.github.com> Co-authored-by: Parampreet Singh <50599809+Paramadon@users.noreply.github.com> Co-authored-by: Jeffrey Chien <chienjef@amazon.com>
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:
cloudwatch-agentconfig-map with the contents of otelConfigi. Conflicting ports with agent JSON will be ignored
Testing
With the supplemental YAML passed to the agent ---
When the YAML is deleted from the custom resource, the cloudwatch-agent reconciler will delete the config-map data entry and volume mount item
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.