Target Allocator implementation (Part 3 - Collector Enhancement for Prometheus Config Update) #389
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
… and targetallocator & Minor changes
…etween collector and targetallocator & Minor changes" This reverts commit 367c623 - only the folder structure change
rsvarma95
force-pushed
the
collector-enhancement
branch
from
235a8cc
to
715d7e3
Compare
rsvarma95
force-pushed
the
collector-enhancement
branch
from
715d7e3
to
ad0397d
Compare
added 6 commits
August 10, 2021 21:50
commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes
commit 98acb2f Author: Rahul Varma <rahvarm@amazon.com> Date: Thu Aug 12 05:35:53 2021 -0700 Updated struct name & minor changes commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes
|
Hi @Aneurysm9, @jpkrohling and @dashpole. Please review when you have time. |
dashpole
reviewed
Aug 16, 2021
|
Can you please re-review @Aneurysm9 @dashpole @jpkrohling ty! |
dashpole
approved these changes
Aug 18, 2021
|
I'll review this once the part 2 is merged. |
|
@Aneurysm9 can you please review this PR too? Related to #354 |
|
Hi @Aneurysm9 let's get this PR approved and merged by @jpkrohling please. Thx. |
|
Just wanted to mention that this can be reviewed independently and does not have any dependencies on Part 2. |
Aneurysm9
approved these changes
Sep 15, 2021
shree007
pushed a commit
to shree007/opentelemetry-operator
that referenced
this pull request
Dec 12, 2021
…rometheus Config Update) (open-telemetry#389) * load balancer deployment implementation & controller & e2e tests * Load balancer crd update, reconcile logic and e2e tests * Reset last commit and only uploading changes to main.go * Updated bundle and api with new autogenerated resources * Updated code with lint fixes * Updated code to include minor fixes * Update helper.go to add header * Updated comment and bundles * Updated lb reconcile helper function and its invocations * Updated naming scheme and changed CR config * Updated bundle files * Minor changes * Lint and default file fixes * Added rolebinding to automate manual setting * Update opentelemetry-operator.clusterserviceversion.yaml * Removed role/rolebinding files & Minor changes * Minor changes * Added error check in configmap reconcile & spelling correction * Updated target allocator KUTTL tests & renamed folder * Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes * Updated kuttl tests to use namespace-scope resources * Revert part of "Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes" This reverts commit 367c623 - only the folder structure change * Removed separate controller for target allocation * Added additional label for collector pod selection and removed test-step * Minor changes * Added collector enhancement for prometheus config update * Update config_replace.go * Squashed commit of the following: commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Updated port and protocol * Lint fixes * Removed unnecessary structs * Squashed commit of the following: commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Updated structure to reflect new changes in first part * Squashed commit of the following: commit 98acb2f Author: Rahul Varma <rahvarm@amazon.com> Date: Thu Aug 12 05:35:53 2021 -0700 Updated struct name & minor changes commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Merged with main branch * Minor changes * Updated go.sum * Updated go.mod Co-authored-by: Alexis Perez <perzmen@amazon.com> Co-authored-by: Rahul Varma <rahvarm@amazon.com>
ItielOlenick
pushed a commit
to ItielOlenick/opentelemetry-operator
that referenced
this pull request
May 1, 2024
…rometheus Config Update) (open-telemetry#389) * load balancer deployment implementation & controller & e2e tests * Load balancer crd update, reconcile logic and e2e tests * Reset last commit and only uploading changes to main.go * Updated bundle and api with new autogenerated resources * Updated code with lint fixes * Updated code to include minor fixes * Update helper.go to add header * Updated comment and bundles * Updated lb reconcile helper function and its invocations * Updated naming scheme and changed CR config * Updated bundle files * Minor changes * Lint and default file fixes * Added rolebinding to automate manual setting * Update opentelemetry-operator.clusterserviceversion.yaml * Removed role/rolebinding files & Minor changes * Minor changes * Added error check in configmap reconcile & spelling correction * Updated target allocator KUTTL tests & renamed folder * Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes * Updated kuttl tests to use namespace-scope resources * Revert part of "Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes" This reverts commit 367c623 - only the folder structure change * Removed separate controller for target allocation * Added additional label for collector pod selection and removed test-step * Minor changes * Added collector enhancement for prometheus config update * Update config_replace.go * Squashed commit of the following: commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Updated port and protocol * Lint fixes * Removed unnecessary structs * Squashed commit of the following: commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Updated structure to reflect new changes in first part * Squashed commit of the following: commit 98acb2f Author: Rahul Varma <rahvarm@amazon.com> Date: Thu Aug 12 05:35:53 2021 -0700 Updated struct name & minor changes commit a496825 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 14:53:36 2021 -0400 Update api/v1alpha1/opentelemetrycollector_webhook.go Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> commit 3d37148 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 10:34:44 2021 -0700 Added validation in webhook to validate prometheus config commit 33cb042 Author: Rahul Varma <rahvarm@amazon.com> Date: Wed Aug 11 07:16:45 2021 -0700 Updated docker image to quay.io image commit a7764b9 Author: Rahul Varma <rahvarm@amazon.com> Date: Tue Aug 10 20:20:32 2021 -0700 Added version management & Minor fixes * Merged with main branch * Minor changes * Updated go.sum * Updated go.mod Co-authored-by: Alexis Perez <perzmen@amazon.com> Co-authored-by: Rahul Varma <rahvarm@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
This PR addresses issue # 60 in the wg-prometheus repo. This is part 3 of a 3 part update in which enhancements are presented to the OTel Operator to support the deployment and reconcile support for a target allocator resource. This update enables the collectors to use http_sd_config option to determine their scrape targets exposed by the target allocation service. Please refer to the Design Doc, PDF version for code readability for more details
It extends Part 1 and should be merged after Part 1 is complete.
Type of change
New feature & Enhancement
Testing
Implemented go unit tests as part of the new logic responsible for replacing Prometheus config.
cc @alolita @Aneurysm9 @alexperez52