-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* add more metric for kcmas and refine implementation for malachite fetcher * add locks for registerred metric fetcher
- Loading branch information
1 parent
f9e16b5
commit 71cad3a
Showing
25 changed files
with
788 additions
and
682 deletions.
There are no files selected for viewing
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
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
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
73 changes: 73 additions & 0 deletions
73
pkg/agent/sysadvisor/plugin/metric-emitter/syncer/node/advisor.go
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| Copyright 2022 The Katalyst Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package node | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
|
|
||
| apimetricnode "github.com/kubewharf/katalyst-api/pkg/metric/node" | ||
| "github.com/kubewharf/katalyst-core/pkg/agent/sysadvisor/types" | ||
| pkgconsts "github.com/kubewharf/katalyst-core/pkg/consts" | ||
| "github.com/kubewharf/katalyst-core/pkg/custom-metric/store/data" | ||
| "github.com/kubewharf/katalyst-core/pkg/metrics" | ||
| "github.com/kubewharf/katalyst-core/pkg/util/general" | ||
| "github.com/kubewharf/katalyst-core/pkg/util/metric" | ||
| ) | ||
|
|
||
| func (n *MetricSyncerNode) advisorMetric(ctx context.Context) { | ||
| tags := n.generateMetricTag(ctx) | ||
| general.InfofV(4, "get metric advisor metric for node") | ||
|
|
||
| // todo add metrics for knob-status | ||
|
|
||
| pod2Pools := make(map[string]string) | ||
| n.metaReader.RangeContainer(func(podUID string, containerName string, containerInfo *types.ContainerInfo) bool { | ||
| pod2Pools[podUID] = containerInfo.OwnerPoolName | ||
| return true | ||
| }) | ||
|
|
||
| pool2Pods := make(map[string][]*v1.Pod) | ||
| _, err := n.metaServer.GetPodList(ctx, func(pod *v1.Pod) bool { | ||
| if pool, ok := pod2Pools[string(pod.UID)]; ok { | ||
| pool2Pods[pool] = append(pool2Pods[pool], pod) | ||
| } | ||
| return false | ||
| }) | ||
| if err != nil { | ||
| general.Errorf("get podList from metaServer failed: %v", err) | ||
| return | ||
| } | ||
|
|
||
| for pool, pods := range pool2Pods { | ||
| v := n.metaServer.AggregatePodMetric(pods, pkgconsts.MetricLoad1MinContainer, metric.AggregatorSum, metric.DefaultContainerMetricFilter) | ||
| _ = n.dataEmitter.StoreFloat64(apimetricnode.CustomMetricNodeAdvisorPoolLoad1Min, v.Value, metrics.MetricTypeNameRaw, append(tags, | ||
| []metrics.MetricTag{ | ||
| { | ||
| Key: fmt.Sprintf("%s", data.CustomMetricLabelKeyTimestamp), | ||
| Val: fmt.Sprintf("%v", v.Time.UnixMilli()), | ||
| }, | ||
| { | ||
| Key: fmt.Sprintf("%s%s", data.CustomMetricLabelSelectorPrefixKey, "pool"), | ||
| Val: fmt.Sprintf("%v", pool), | ||
| }, | ||
| }...)...) | ||
| } | ||
|
|
||
| } |
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
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
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
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
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
157 changes: 0 additions & 157 deletions
157
pkg/metaserver/agent/metric/malachite/cgroup/cgroup_test.go
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.