-
Notifications
You must be signed in to change notification settings - Fork 953
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract MetricsClient and NodeMetrics to support other metrics platform
Signed-off-by: ZhangJian He <shoothzj@gmail.com>
- Loading branch information
Showing
17 changed files
with
1,983 additions
and
50 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
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,34 @@ | ||
| /* | ||
| Copyright 2023 The Volcano 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 refermetrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| ) | ||
|
|
||
| type MetricsClient interface { | ||
| NodeMetricsAvg(ctx context.Context, nodeName string, period string) (*NodeMetrics, error) | ||
| } | ||
|
|
||
| func NewMetricsClient(metricsConf map[string]string) (MetricsClient, error) { | ||
| address := metricsConf["address"] | ||
| if len(address) == 0 { | ||
| return nil, errors.New("metrics address is empty") | ||
| } | ||
| return &PrometheusMetricsClient{address: address}, nil | ||
| } |
88 changes: 88 additions & 0 deletions
88
pkg/scheduler/cache/refermetrics/metrics_client_prometheus.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,88 @@ | ||
| /* | ||
| Copyright 2023 The Volcano 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 refermetrics | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "github.com/prometheus/client_golang/api" | ||
| prometheusv1 "github.com/prometheus/client_golang/api/prometheus/v1" | ||
| pmodel "github.com/prometheus/common/model" | ||
| "k8s.io/klog" | ||
| "strconv" | ||
| "strings" | ||
| "time" | ||
| ) | ||
|
|
||
| const ( | ||
| // promCpuUsageAvg record name of cpu average usage defined in prometheus rules | ||
| promCpuUsageAvg = "cpu_usage_avg" | ||
| // promMemUsageAvg record name of mem average usage defined in prometheus rules | ||
| promMemUsageAvg = "mem_usage_avg" | ||
| ) | ||
|
|
||
| type PrometheusMetricsClient struct { | ||
| address string | ||
| } | ||
|
|
||
| func NewPrometheusMetricsClient(address string) (*PrometheusMetricsClient, error) { | ||
| return &PrometheusMetricsClient{address: address}, nil | ||
| } | ||
|
|
||
| func (p *PrometheusMetricsClient) NodeMetricsAvg(ctx context.Context, nodeName string, period string) (*NodeMetrics, error) { | ||
| klog.V(4).Infof("Get node metrics from Prometheus: %s", p.address) | ||
| client, err := api.NewClient(api.Config{ | ||
| Address: p.address, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| v1api := prometheusv1.NewAPI(client) | ||
| nodeMetrics := &NodeMetrics{} | ||
| for _, metric := range []string{promCpuUsageAvg, promMemUsageAvg} { | ||
| queryStr := fmt.Sprintf("%s_%s{instance=\"%s\"}", metric, period, nodeName) | ||
| klog.V(4).Infof("Query prometheus by %s", queryStr) | ||
| res, warnings, err := v1api.Query(ctx, queryStr, time.Now()) | ||
| if err != nil { | ||
| klog.Errorf("Error querying Prometheus: %v", err) | ||
| } | ||
| if len(warnings) > 0 { | ||
| klog.V(3).Infof("Warning querying Prometheus: %v", warnings) | ||
| } | ||
| if res == nil || res.String() == "" { | ||
| klog.Warningf("Warning querying Prometheus: no data found for %s", queryStr) | ||
| continue | ||
| } | ||
| // plugin.usage only need type pmodel.ValVector in Prometheus.rulues | ||
| if res.Type() != pmodel.ValVector { | ||
| continue | ||
| } | ||
| // only method res.String() can get data, dataType []pmodel.ValVector, eg: "{k1:v1, ...} => #[value] @#[timespace]\n {k2:v2, ...} => ..." | ||
| firstRowValVector := strings.Split(res.String(), "\n")[0] | ||
| rowValues := strings.Split(strings.TrimSpace(firstRowValVector), "=>") | ||
| value := strings.Split(strings.TrimSpace(rowValues[1]), " ") | ||
| switch metric { | ||
| case promCpuUsageAvg: | ||
| cpuUsage, _ := strconv.ParseFloat(value[0], 64) | ||
| nodeMetrics.Cpu = cpuUsage | ||
| case promMemUsageAvg: | ||
| memUsage, _ := strconv.ParseFloat(value[0], 64) | ||
| nodeMetrics.Memory = memUsage | ||
| } | ||
| } | ||
| return nodeMetrics, nil | ||
| } |
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,22 @@ | ||
| /* | ||
| Copyright 2023 The Volcano 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 refermetrics | ||
|
|
||
| type NodeMetrics struct { | ||
| Cpu float64 | ||
| Memory float64 | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.