Supporting JMX annotations #240
Merged
Conversation
This file contains hidden or 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
Paramadon
previously approved these changes
Oct 9, 2024
mitali-salvi
force-pushed
the
jmx-merge
branch
from
69c96cc to
c8e6e2f
Compare
musa-asad
previously approved these changes
Oct 11, 2024
Contributor
Author
|
CloudWatch agent container port Cloudwatch agent service |
jefchien
reviewed
Oct 11, 2024
jefchien
approved these changes
Oct 12, 2024
movence
approved these changes
Oct 13, 2024
Paramadon
approved these changes
Oct 14, 2024
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 <[email protected]> * Update internal/config/main.go Co-authored-by: Musa <[email protected]> --------- Co-authored-by: Parampreet Singh <[email protected]> Co-authored-by: Musa <[email protected]> Co-authored-by: Mitali Salvi <[email protected]> Co-authored-by: Jeffrey Chien <[email protected]>
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 <[email protected]> * 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 <[email protected]> * [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 <[email protected]> * Update internal/config/main.go Co-authored-by: Musa <[email protected]> --------- Co-authored-by: Parampreet Singh <[email protected]> Co-authored-by: Musa <[email protected]> Co-authored-by: Mitali Salvi <[email protected]> Co-authored-by: Jeffrey Chien <[email protected]> --------- Co-authored-by: Musa <[email protected]> Co-authored-by: Mitali Salvi <[email protected]> Co-authored-by: ItielOlenick <[email protected]> Co-authored-by: Kaushik Surya <[email protected]> Co-authored-by: Parampreet Singh <[email protected]> Co-authored-by: Jeffrey Chien <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.aws.amazon.com/inject-jmx-{targetSystem}where targetSystem includes jvm, "tomcat", "kafka", "kafka-consumer", "kafka-producer""OTEL_EXPORTER_OTLP_PROTOCOL"= "http/protobuf"
"OTEL_METRICS_EXPORTER"="none"
"OTEL_LOGS_EXPORTER"="none"
"OTEL_AWS_JMX_EXPORTER_METRICS_ENDPOINT="http://cloudwatch-agent.amazon-cloudwatch:4314/v1/metrics"
"OTEL_JMX_TARGET_SYSTEM"="jvm,tomcat"
Testing
amazon-cloudwatch-observabilityhelm-charti. Annotate a pod deploying a sprint boot project with instrumentation.opentelemetry.io/inject-java: "true" cloudwatch.aws.amazon.com/inject-jmx-jvm: "true" and deploy on the cluster
ii. Verified environment variables and init container are added to the pod
iii. Verified cloudwatch-agent service and container has the port 4314 open when the agent config has JMX enabled
iv. Verified jmx metrics are being published to CloudWatch
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.