Skip to content

Commit

Permalink
Merge pull request #11557 from avlitman/add-mem-metric
Browse files Browse the repository at this point in the history
Add rule to collect issues with the pods
  • Loading branch information
kubevirt-bot committed Apr 15, 2024
2 parents b9e89e2 + 8ed18b4 commit deafbf9
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 10 deletions.
3 changes: 3 additions & 0 deletions docs/metrics.md
Expand Up @@ -24,6 +24,9 @@ Indicates whether the Software Emulation is enabled in the configuration. Type:
### kubevirt_console_active_connections
Amount of active Console connections, broken down by namespace and vmi name. Type: Gauge.

### kubevirt_memory_delta_from_requested_bytes
The delta between the pod with highest memory working set or rss and its requested memory for each container, virt-controller, virt-handler, virt-api and virt-operator. Type: Gauge.

### kubevirt_nodes_with_kvm
The number of nodes in the cluster that have the devices.kubevirt.io/kvm resource available. Type: Gauge.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -32,7 +32,7 @@ require (
github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230627123556-81a891d4462a
github.com/machadovilaca/operator-observability v0.0.14
github.com/machadovilaca/operator-observability v0.0.19
github.com/mdlayher/vsock v1.2.1
github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b
github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -581,8 +581,8 @@ github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 h1:nHHjmvjitIiyP
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0/go.mod h1:YBCo4DoEeDndqvAn6eeu0vWM7QdXmHEeI9cFWplmBys=
github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230627123556-81a891d4462a h1:cdX+oxWw1lJDS3EchP+7Oz1XbErk4r7ffVJu1b1MKgI=
github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230627123556-81a891d4462a/go.mod h1:qGj2agzgwQ27nYhP3xhLs+IBzE5+ALNUg8bDfMcwPqo=
github.com/machadovilaca/operator-observability v0.0.14 h1:tS/GKvQRKvpD7pRauS1ulw0AN2V0j2mobg+mFWBt5LE=
github.com/machadovilaca/operator-observability v0.0.14/go.mod h1:e4Z3VhOXb9InkmSh00JjqBBijE+iD+YMzynBpKB3+gE=
github.com/machadovilaca/operator-observability v0.0.19 h1:v1rIrdaZ65iaUvKyBd2g29Aklwr0X9IsYukXTxTW6lo=
github.com/machadovilaca/operator-observability v0.0.19/go.mod h1:e4Z3VhOXb9InkmSh00JjqBBijE+iD+YMzynBpKB3+gE=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down
1 change: 1 addition & 0 deletions pkg/monitoring/rules/recordingrules/BUILD.bazel
Expand Up @@ -5,6 +5,7 @@ go_library(
srcs = [
"api.go",
"nodes.go",
"operator.go",
"recordingrules.go",
"virt.go",
"vm.go",
Expand Down
48 changes: 48 additions & 0 deletions pkg/monitoring/rules/recordingrules/operator.go
@@ -0,0 +1,48 @@
/*
Copyright The KubeVirt 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 recordingrules

import (
"github.com/machadovilaca/operator-observability/pkg/operatormetrics"
"github.com/machadovilaca/operator-observability/pkg/operatorrules"
"k8s.io/apimachinery/pkg/util/intstr"
)

var operatorRecordingRules = []operatorrules.RecordingRule{
{
MetricsOpts: operatormetrics.MetricOpts{
Name: "kubevirt_memory_delta_from_requested_bytes",
Help: "The delta between the pod with highest memory working set or rss and its requested memory for each container, virt-controller, virt-handler, virt-api and virt-operator.",
ConstLabels: map[string]string{
"reason": "memory_working_set",
},
},
MetricType: operatormetrics.GaugeType,
Expr: intstr.FromString("topk by(container)(1,max by(container, namespace, node)(container_memory_working_set_bytes{container=~\"virt-controller|virt-api|virt-handler|virt-operator\"} - on(pod) group_left(node) (kube_pod_container_resource_requests{ container=~\"virt-controller|virt-api|virt-handler|virt-operator\",resource=\"memory\"})))"),
},
{
MetricsOpts: operatormetrics.MetricOpts{
Name: "kubevirt_memory_delta_from_requested_bytes",
Help: "The delta between the pod with highest memory working set or rss and its requested memory for each container, virt-controller, virt-handler, virt-api and virt-operator.",
ConstLabels: map[string]string{
"reason": "memory_rss",
},
},
MetricType: operatormetrics.GaugeType,
Expr: intstr.FromString("topk by(container)(1,max by(container, namespace, node)(container_memory_rss{container=~\"virt-controller|virt-api|virt-handler|virt-operator\"} - on(pod) group_left(node) (kube_pod_container_resource_requests{ container=~\"virt-controller|virt-api|virt-handler|virt-operator\",resource=\"memory\"})))"),
},
}
1 change: 1 addition & 0 deletions pkg/monitoring/rules/recordingrules/recordingrules.go
Expand Up @@ -6,6 +6,7 @@ func Register(namespace string) error {
return operatorrules.RegisterRecordingRules(
apiRecordingRules,
nodesRecordingRules,
operatorRecordingRules,
virtRecordingRules(namespace),
vmRecordingRules,
vmiRecordingRules,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Expand Up @@ -241,7 +241,7 @@ github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1
# github.com/kubevirt/monitoring/pkg/metrics/parser v0.0.0-20230627123556-81a891d4462a
## explicit; go 1.20
github.com/kubevirt/monitoring/pkg/metrics/parser
# github.com/machadovilaca/operator-observability v0.0.14
# github.com/machadovilaca/operator-observability v0.0.19
## explicit; go 1.21
github.com/machadovilaca/operator-observability/pkg/operatormetrics
github.com/machadovilaca/operator-observability/pkg/operatorrules
Expand Down

0 comments on commit deafbf9

Please sign in to comment.