Add HCS shim api as alternative source for metric provider #154
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
1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go
KlwntSingh
force-pushed
the
hcsshim_api
branch
2 times, most recently
from
905a8a3 to
199d66f
Compare
1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor
KlwntSingh
force-pushed
the
hcsshim_api
branch
from
199d66f to
50d94de
Compare
chadpatel
previously approved these changes
Jan 29, 2024
mitali-salvi
previously approved these changes
Jan 29, 2024
1. Ran `go mod tidy` inside cmd/otelcontribcol
KlwntSingh
dismissed stale reviews from mitali-salvi and chadpatel
via
c7dea01
mitali-salvi
approved these changes
Jan 30, 2024
chadpatel
approved these changes
Jan 30, 2024
KlwntSingh
merged commit 6cd1657
into
amazon-contributing:aws-cwa-ciwindows
36 of 67 checks passed
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Jan 30, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Feb 2, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Feb 2, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Feb 22, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Feb 22, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol # Conflicts: # receiver/awscontainerinsightreceiver/go.mod # receiver/awscontainerinsightreceiver/go.sum
KlwntSingh
added a commit
that referenced
this pull request
Feb 29, 2024
… commits (#168) Add support for Container Insights on Windows for EKS * Add kubelet summary API for Windows (#142) * CPU extractors with unit tests (#146) * Add memory extractors for pod and node level (#147) * Define structs for CPU and Memory stats (#149) * Add Container level metrics for CPU and memory resources. (#150) * Add storage metrics for container and node level (#151) * Add network metrics (#152) * Enable awscontainerinsights receiver to run inside Host Process container (#153) * Add HCS shim api as alternative source for metric provider (#154) * Add check for host process container before reading from hcshim (#156) * Fix CPU utilization percentage for Windows nodes (#161) * Add List of Metrics for Windows + Design (#166) * fix fstype (#164)
KlwntSingh
added a commit
to KlwntSingh/opentelemetry-collector-contrib
that referenced
this pull request
Mar 2, 2024
…ntributing#154) * Add storage metrics for container and node level 1. Add storage extractors for container and node level 2. Add metric source for Windows metric collection 3. Refactor metric source for cadvisor 4. Add os label for windows # Conflicts: # internal/aws/containerinsight/const.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractorhelpers.go # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/fs_extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/k8swindows.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet_test.go # receiver/awscontainerinsightreceiver/internal/stores/utils.go # receiver/awscontainerinsightreceiver/internal/stores/utils_test.go * Add hcsshim API as source 1. Added hcshim API as alternative to kubelet for networking stats 2. Added unit tests for hcsshim provider 3. Add new fields to network extractor * Fix e2e test for docker build 1. Ran `go mod tidy` inside cmd/otelcontribcol # Conflicts: # receiver/awscontainerinsightreceiver/go.mod # receiver/awscontainerinsightreceiver/go.sum # Conflicts: # receiver/awscontainerinsightreceiver/internal/k8swindows/extractors/extractor.go # receiver/awscontainerinsightreceiver/internal/k8swindows/kubelet/kubelet.go
KlwntSingh
added a commit
that referenced
this pull request
Mar 7, 2024
* Add kubelet summary API for Windows (#142) * CPU extractors with unit tests (#146) * Add memory extractors for pod and node level (#147) * Define structs for CPU and Memory stats (#149) * Add Container level metrics for CPU and memory resources. (#150) * Add storage metrics for container and node level (#151) * Add network metrics (#152) * Enable awscontainerinsights receiver to run inside Host Process container (#153) * Add HCS shim api as alternative source for metric provider (#154) * Add check for host process container before reading from hcshim (#156) * Fix CPU utilization percentage for Windows nodes (#161) * Add List of Metrics for Windows + Design (#166) * fix fstype (#164) * Add windows build tag to fix building cw agent on Windows * Downgrade internal/aws/containerinsight from 0.92 0.89 * Separate unit tests in util.go specific for Windows * Fix util unit tests applicable for Windows * Fix goporto issue * Fix lint issue * Fix regression in unit tests caused due to rebasing mainline * Add unit tests for k8s Windows * Add unit test for kubelet client on Windows * Run DCGM scrapper only for CW agent on Linux * Separate out node Volume unit tests for Windows * Add changelog for Container Insights on Windows
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:
Testing: