feat(pod): added pod power #2127
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## reboot #2127 +/- ##
===========================================
- Coverage 91.74% 81.66% -10.08%
===========================================
Files 34 37 +3
Lines 2991 3861 +870
===========================================
+ Hits 2744 3153 +409
- Misses 193 633 +440
- Partials 54 75 +21 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
sthaha
requested changes
Jun 9, 2025
vimalk78
commented
Jun 9, 2025
279a24a to
6f4e06f
Compare
c3293bc to
96c29f7
Compare
sthaha
requested changes
Jun 10, 2025
sthaha
reviewed
Jun 10, 2025
| @@ -95,6 +99,7 @@ func NewPowerCollector(monitor PowerDataProvider, logger *slog.Logger) *PowerCol | |||
| zone = "zone" | |||
| cntrID = "container_id" | |||
| vmID = "vm_id" | |||
| podID = "pod_id" | |||
There was a problem hiding this comment.
Just noticed that we need pod_id in kepler_container_.* as well
- podInformer for fetching and caching pods - pod energy/power calculation - power collector shows pod energy/power - tests Signed-off-by: Vimal Kumar <vimal78@gmail.com>
sthaha
reviewed
Jun 11, 2025
| @@ -195,6 +207,7 @@ func (c *PowerCollector) Collect(ch chan<- prometheus.Metric) { | |||
| c.collectProcessMetrics(ch, snapshot.Processes) | |||
| c.collectContainerMetrics(ch, snapshot.Containers) | |||
There was a problem hiding this comment.
Could you please add pod_id to the containers so that we can "join" containers and pods
sthaha
reviewed
Jun 11, 2025
| pi.manager = mgr | ||
|
|
||
| opts := zap.Options{ | ||
| Development: true, // enables DebugLevel by default |
There was a problem hiding this comment.
nit: can we set this to true if current pi.logger. log-level == Debug?
sthaha
reviewed
Jun 11, 2025
| @@ -311,6 +318,11 @@ func (pm *PowerMonitor) firstReading(newSnapshot *Snapshot) error { | |||
| return fmt.Errorf(vmPowerError, err) | |||
| } | |||
|
|
|||
| // First read for pods | |||
| if err := pm.firstPodRead(newSnapshot); err != nil { | |||
| return fmt.Errorf(containerPowerError, err) | |||
There was a problem hiding this comment.
Suggested change
| return fmt.Errorf(containerPowerError, err) | |
| return fmt.Errorf(podPowerError, err) |
sthaha
reviewed
Jun 11, 2025
| @@ -30,6 +30,7 @@ func TestCollectionLoop(t *testing.T) { | |||
| resourceInformer := &MockResourceInformer{} | |||
| resourceInformer.SetExpectations(t, tr) | |||
| resourceInformer.On("Refresh").Return(nil) | |||
| // resourceInformer.On("Pods").Return(nil) | |||
sthaha
approved these changes
Jun 11, 2025
|
|
||
| containersNoPod := []string{} | ||
| if ri.podInformer != nil { | ||
| for _, container := range containersRunning { |
There was a problem hiding this comment.
missing test? In a follow up PR, could you please add test to test this functionality?
Comment on lines
+226
to
+237
| pod := &Pod{ | ||
| ID: podInfo.ID, | ||
| Name: podInfo.Name, | ||
| Namespace: podInfo.Namespace, | ||
| } | ||
| container.Pod = pod | ||
| _, seen := podsRunning[pod.ID] | ||
| // reset CPU Time of the pod if it is getting added to the running list for the first time | ||
| // in the subsequent iteration, the CPUTimeDelta should be incremented by container's CPUTimeDelta | ||
| resetCPUTime := !seen | ||
| podsRunning[pod.ID] = ri.updatePodCache(container, resetCPUTime) | ||
| } |
There was a problem hiding this comment.
missing tests. Could you please add tests in a follow up PR?
| @@ -237,6 +289,22 @@ func (ri *resourceInformer) Refresh() error { | |||
| ri.vms.Running = vmsRunning | |||
| ri.vms.Terminated = vmsTerminated | |||
|
|
|||
| // Find terminated pods | |||
| totalPodsDelta := float64(0) | |||
There was a problem hiding this comment.
we don't need to find totalPodsDelta, do we?
|
|
||
| // Resource usage tracking | ||
| CPUTotalTime float64 // total cpu time used by the VM so far | ||
| CPUTimeDelta float64 // cpu time used by the VM since last refresh |
There was a problem hiding this comment.
Suggested change
| CPUTimeDelta float64 // cpu time used by the VM since last refresh | |
| CPUTimeDelta float64 // cpu time used by the Pod since last refresh |
| Namespace string | ||
|
|
||
| // Resource usage tracking | ||
| CPUTotalTime float64 // total cpu time used by the VM so far |
There was a problem hiding this comment.
Suggested change
| CPUTotalTime float64 // total cpu time used by the VM so far | |
| CPUTotalTime float64 // total cpu time used by the Pod so far |
2e3afdf
into
sustainable-computing-io:reboot
15 of 17 checks passed
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.
feat(pod): added pod power