Skip to content

K
kubesphere

KubeSphere / kubesphere

通知 138
Star 33
Fork 5
K
kubesphere

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 6cdbf336 编写于 作者: K KubeSphere CI Bot 提交者： GitHub
浏览文件
操作

Merge pull request #3526 from zhu733756/add-pod-level-metrics 

Add pod level metrics for edge node
上级 ea93f383 96d60da9
展开全部 隐藏空白更改
内联 并排
Showing with 992 addition and 267 deletion
pkg/simple/client/monitoring/metricsserver/metricsserver_test.go
浏览文件 @ 6cdbf336
......@@ -2,6 +2,7 @@ package metricsserver
import (
"fmt"
"strings"
"testing"
"time"
......@@ -71,8 +72,126 @@ var node2 = &v1.Node{
},
}
var pod1 = &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod1",
Namespace: "kubeedge",
},
}
var pod2 = &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Namespace: "kubeedge",
},
}
const (
layout = "2006-01-02T15:04:05.000Z"
str = "2021-03-25T12:34:56.789Z"
)
var (
metricsTime, _ = time.Parse(layout, str)
nodeMetric1 = metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-1",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(1000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.BinarySI),
},
}
nodeMetric2 = metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-2",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(2000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(2*1024*1024),
resource.BinarySI),
},
}
podMetric1 = metricsV1beta1.PodMetrics{
TypeMeta: metav1.TypeMeta{
Kind: "DaemonSet",
},
ObjectMeta: metav1.ObjectMeta{
Name: "pod1",
Namespace: "kubeedge",
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Containers: []metricsV1beta1.ContainerMetrics{
metricsV1beta1.ContainerMetrics{
Name: "containers-1",
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
1,
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.DecimalSI),
},
},
},
}
podMetric2 = metricsV1beta1.PodMetrics{
TypeMeta: metav1.TypeMeta{
Kind: "DaemonSet",
},
ObjectMeta: metav1.ObjectMeta{
Name: "pod2",
Namespace: "kubeedge",
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Containers: []metricsV1beta1.ContainerMetrics{
metricsV1beta1.ContainerMetrics{
Name: "containers-1",
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
1,
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.DecimalSI),
},
},
metricsV1beta1.ContainerMetrics{
Name: "containers-2",
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
1,
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.DecimalSI),
},
},
},
}
)
func TestGetNamedMetrics(t *testing.T) {
tests := []struct {
nodeMetricsTests := []struct {
metrics []string
filter string
expected string
......@@ -93,62 +212,63 @@ func TestGetNamedMetrics(t *testing.T) {
expected: "metrics-vector-3.json",
},
}
podMetricsTests := []struct {
metrics []string
filter string
expected string
podName string
namespaceName string
}{
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "pod1$",
expected: "metrics-vector-4.json",
podName: "",
namespaceName: "",
},
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "default/pod2$",
expected: "metrics-vector-5.json",
podName: "",
namespaceName: "",
},
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "",
expected: "metrics-vector-6.json",
podName: "pod1",
namespaceName: "kubeedge",
},
}
fakeK8sClient := fakek8s.NewSimpleClientset(node1, node2)
fakeK8sClient := fakek8s.NewSimpleClientset(node1, node2, pod1, pod2)
informer := informers.NewSharedInformerFactory(fakeK8sClient, 0)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(node1)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(node2)
informer.Core().V1().Pods().Informer().GetIndexer().Add(pod1)
informer.Core().V1().Pods().Informer().GetIndexer().Add(pod2)
fakeMetricsclient := &fakemetricsclient.Clientset{}
layout := "2006-01-02T15:04:05.000Z"
str := "2021-01-25T12:34:56.789Z"
metricsTime, _ := time.Parse(layout, str)
fakeMetricsclient.AddReactor("list", "nodes", func(action core.Action) (handled bool, ret runtime.Object, err error) {
metrics := &metricsV1beta1.NodeMetricsList{}
nodeMetric1 := metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-1",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(1000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.BinarySI),
},
}
nodeMetric2 := metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-2",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(2000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(2*1024*1024),
resource.BinarySI),
},
}
metrics.Items = append(metrics.Items, nodeMetric1)
metrics.Items = append(metrics.Items, nodeMetric2)
return true, metrics, nil
})
for i, tt := range tests {
fakeMetricsclient.AddReactor("list", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
metrics := &metricsV1beta1.PodMetricsList{}
metrics.Items = append(metrics.Items, podMetric1)
metrics.Items = append(metrics.Items, podMetric2)
return true, metrics, nil
})
// test for node edge
for i, tt := range nodeMetricsTests {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
expected := make([]monitoring.Metric, 0)
err := jsonFromFile(tt.expected, &expected)
......@@ -163,10 +283,36 @@ func TestGetNamedMetrics(t *testing.T) {
}
})
}
//test for pods on the node edges
for i, tt := range podMetricsTests {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
expected := make([]monitoring.Metric, 0)
err := jsonFromFile(tt.expected, &expected)
if err != nil {
t.Fatal(err)
}
if tt.podName == "pod1" || strings.Contains(tt.filter, "pod1") {
fakeMetricsclient.PrependReactor("get", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
return true, &podMetric1, nil
})
} else {
fakeMetricsclient.PrependReactor("get", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
return true, &podMetric2, nil
})
}
client := NewMetricsServer(fakeK8sClient, true, fakeMetricsclient)
result := client.GetNamedMetrics(tt.metrics, time.Now(), monitoring.PodOption{ResourceFilter: tt.filter, PodName: tt.podName, NamespaceName: tt.namespaceName})
if diff := cmp.Diff(result, expected); diff != "" {
t.Fatalf("%T differ (-got, +want): %s", expected, diff)
}
})
}
}
func TestGetNamedMetricsOverTime(t *testing.T) {
tests := []struct {
nodeMetricsTests := []struct {
metrics []string
filter string
expected string
......@@ -188,61 +334,62 @@ func TestGetNamedMetricsOverTime(t *testing.T) {
},
}
fakeK8sClient := fakek8s.NewSimpleClientset(node1, node2)
podMetricsTests := []struct {
metrics []string
filter string
expected string
podName string
namespaceName string
}{
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "pod1$",
expected: "metrics-matrix-4.json",
podName: "",
namespaceName: "",
},
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "default/pod2$",
expected: "metrics-matrix-5.json",
podName: "",
namespaceName: "",
},
{
metrics: []string{"pod_cpu_usage", "pod_memory_usage_wo_cache"},
filter: "",
expected: "metrics-matrix-6.json",
podName: "pod1",
namespaceName: "kubeedge",
},
}
fakeK8sClient := fakek8s.NewSimpleClientset(node1, node2, pod1, pod2)
informer := informers.NewSharedInformerFactory(fakeK8sClient, 0)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(node1)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(node2)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(pod1)
informer.Core().V1().Nodes().Informer().GetIndexer().Add(pod2)
fakeMetricsclient := &fakemetricsclient.Clientset{}
layout := "2006-01-02T15:04:05.000Z"
str := "2021-01-25T12:34:56.789Z"
metricsTime, _ := time.Parse(layout, str)
fakeMetricsclient.AddReactor("list", "nodes", func(action core.Action) (handled bool, ret runtime.Object, err error) {
metrics := &metricsV1beta1.NodeMetricsList{}
nodeMetric1 := metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-1",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(1000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(1024*1024),
resource.BinarySI),
},
}
nodeMetric2 := metricsV1beta1.NodeMetrics{
ObjectMeta: metav1.ObjectMeta{
Name: "edgenode-2",
Labels: map[string]string{
"node-role.kubernetes.io/edge": "",
},
},
Timestamp: metav1.Time{Time: metricsTime},
Window: metav1.Duration{Duration: time.Minute},
Usage: v1.ResourceList{
v1.ResourceCPU: *resource.NewMilliQuantity(
int64(2000),
resource.DecimalSI),
v1.ResourceMemory: *resource.NewQuantity(
int64(2*1024*1024),
resource.BinarySI),
},
}
metrics.Items = append(metrics.Items, nodeMetric1)
metrics.Items = append(metrics.Items, nodeMetric2)
return true, metrics, nil
})
for i, tt := range tests {
fakeMetricsclient.AddReactor("list", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
metrics := &metricsV1beta1.PodMetricsList{}
metrics.Items = append(metrics.Items, podMetric1)
metrics.Items = append(metrics.Items, podMetric2)
return true, metrics, nil
})
for i, tt := range nodeMetricsTests {
fakeMetricsclient.Fake.ClearActions()
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
expected := make([]monitoring.Metric, 0)
err := jsonFromFile(tt.expected, &expected)
......@@ -257,6 +404,32 @@ func TestGetNamedMetricsOverTime(t *testing.T) {
}
})
}
for i, tt := range podMetricsTests {
t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
expected := make([]monitoring.Metric, 0)
err := jsonFromFile(tt.expected, &expected)
if err != nil {
t.Fatal(err)
}
if tt.podName == "pod1" || strings.Contains(tt.filter, "pod1") {
fakeMetricsclient.PrependReactor("get", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
return true, &podMetric1, nil
})
} else {
fakeMetricsclient.PrependReactor("get", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) {
return true, &podMetric2, nil
})
}
client := NewMetricsServer(fakeK8sClient, true, fakeMetricsclient)
result := client.GetNamedMetricsOverTime(tt.metrics, time.Now().Add(-time.Minute*3), time.Now(), time.Minute, monitoring.PodOption{ResourceFilter: tt.filter, PodName: tt.podName, NamespaceName: tt.namespaceName})
if diff := cmp.Diff(result, expected); diff != "" {
t.Fatalf("%T differ (-got, +want): %s", expected, diff)
}
})
}
}
func jsonFromFile(expectedFile string, expectedJsonPtr interface{}) error {
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-1.json
浏览文件 @ 6cdbf336
......@@ -11,7 +11,7 @@
},
"values": [
[
1611578096,
1616675696,
"1"
]
]
......@@ -23,7 +23,7 @@
},
"values": [
[
1611578096,
1616675696,
"2"
]
]
......@@ -43,7 +43,7 @@
},
"values": [
[
1611578096,
1616675696,
"1048576"
]
]
......@@ -55,7 +55,7 @@
},
"values": [
[
1611578096,
1616675696,
"2097152"
]
]
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-2.json
浏览文件 @ 6cdbf336
......@@ -11,7 +11,7 @@
},
"values": [
[
1611578096,
1616675696,
"2"
]
]
......@@ -31,7 +31,7 @@
},
"values": [
[
1611578096,
1616675696,
"0.25"
]
]
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-3.json
浏览文件 @ 6cdbf336
......@@ -11,7 +11,7 @@
},
"values": [
[
1611578096,
1616675696,
"1048576"
]
]
......@@ -23,7 +23,7 @@
},
"values": [
[
1611578096,
1616675696,
"2097152"
]
]
......@@ -43,7 +43,7 @@
},
"values": [
[
1611578096,
1616675696,
"0.0001220703125"
]
]
......@@ -55,7 +55,7 @@
},
"values": [
[
1611578096,
1616675696,
"0.000244140625"
]
]
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-4.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"values":[
[
1616675696,
"0.001"
]
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"values": [
[
1616675696,
"1"
]
]
}
]
}
}
]
\ No newline at end of file
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-5.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod2"
},
"values": [
[
1616675696,
"0.002"
]
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod2"
},
"values": [
[
1616675696,
"2"
]
]
}
]
}
}
]
\ No newline at end of file
pkg/simple/client/monitoring/metricsserver/testdata/metrics-matrix-6.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"values":[
[
1616675696,
"0.001"
]
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "matrix",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"values": [
[
1616675696,
"1"
]
]
}
]
}
}
]
\ No newline at end of file
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-1.json
浏览文件 @ 6cdbf336
......@@ -10,7 +10,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"1"
]
},
......@@ -20,7 +20,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"2"
]
}
......@@ -38,7 +38,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"1048576"
]
},
......@@ -48,7 +48,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"2097152"
]
}
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-2.json
浏览文件 @ 6cdbf336
......@@ -10,7 +10,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"2"
]
}
......@@ -28,7 +28,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"0.25"
]
}
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-3.json
浏览文件 @ 6cdbf336
......@@ -10,7 +10,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"1048576"
]
},
......@@ -20,7 +20,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"2097152"
]
}
......@@ -38,7 +38,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"0.0001220703125"
]
},
......@@ -48,7 +48,7 @@
"role": "edge"
},
"value": [
1611578096,
1616675696,
"0.000244140625"
]
}
......
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-4.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"value": [
1616675696,
"0.001"
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"value": [
1616675696,
"1"
]
}
]
}
}
]
\ No newline at end of file
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-5.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod2"
},
"value": [
1616675696,
"0.002"
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod2"
},
"value": [
1616675696,
"2"
]
}
]
}
}
]
\ No newline at end of file
pkg/simple/client/monitoring/metricsserver/testdata/metrics-vector-6.json 0 → 100644
浏览文件 @ 6cdbf336
[
{
"metric_name": "pod_cpu_usage",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"value": [
1616675696,
"0.001"
]
}
]
}
},
{
"metric_name": "pod_memory_usage_wo_cache",
"data": {
"resultType": "vector",
"result": [
{
"metric": {
"namespace": "kubeedge",
"pod":"pod1"
},
"value": [
1616675696,
"1"
]
}
]
}
}
]
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或