eliott/Olares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli,kubesphere: add some memory metrics (#1371)

Browse Source 
cli,ks: add some memory metrics
This commit is contained in:
hysyeah
2025-05-30 21:48:26 +08:00
committed by GitHub
parent 2712202c48
commit a371b3ce44
6 changed files with 130 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/pkg/kubesphere/plugins/files/build/ks-core/templates/ks-apiserver.yml
View File

@@ -32,7 +32,7 @@ spec:
- command:
- ks-apiserver
- --logtostderr=true
image: beclab/ks-apiserver:0.0.13
image: beclab/ks-apiserver:0.0.14
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: ks-apiserver
ports:

2
cli/pkg/kubesphere/plugins/files/build/ks-core/templates/ks-controller-manager.yaml
View File

@@ -35,7 +35,7 @@ spec:
- controller-manager
- --logtostderr=true
- --leader-elect=false
image: beclab/ks-controller-manager:0.0.13
image: beclab/ks-controller-manager:0.0.14
imagePullPolicy: {{ .Values.image.pullPolicy }}
name: ks-controller-manager
ports:

22
cli/pkg/kubesphere/plugins/files/build/prometheus/kubernetes/kubernetes-prometheusRule.yaml
View File

@@ -796,6 +796,28 @@ spec:
- expr: |
label_replace(node_disk_data_bytes_written,"node", "$1", "instance", "(.*)")
record: node:node_one_disk_data_bytes_written
- expr: |
label_replace(node_cpu_info, "node", "$1", "instance", "(.*)")
record: node:node_cpu_info
- expr: |
label_replace(node_memory_Buffers_bytes, "node", "$1", "instance", "(.*)")
record: node:node_memory_Buffers_bytes
- expr: |
label_replace(node_memory_Cached_bytes, "node", "$1", "instance", "(.*)")
record: node:node_memory_Cached_bytes
- expr: |
sum by (node, host_ip, role) (
(node_memory_Slab_bytes{job="node-exporter"} + node_memory_KernelStack_bytes{job="node-exporter"} + node_memory_PageTables_bytes{job="node-exporter"}+ node_memory_HardwareCorrupted_bytes{job="node-exporter"}+node_memory_Bounce_bytes{job="node-exporter"}-node_memory_SReclaimable_bytes{job="node-exporter"})
* on (namespace, pod) group_left(node, host_ip, role)
node_namespace_pod:kube_pod_info:
)
record: node:node_memory_system_reserved
- expr: |
label_replace(rate(node_vmstat_pswpout[5m]) * 4096,"node", "$1", "instance", "(.*)")
record: node:node_vmstat_pswpout
- expr: |
label_replace(rate(node_vmstat_pswpin[5m]) * 4096,"node", "$1", "instance", "(.*)")
record: node:node_vmstat_pswpin
- expr: |
1 -
sum(node_memory_MemFree_bytes{job="node-exporter"} + node_memory_Cached_bytes{job="node-exporter"} + node_memory_Buffers_bytes{job="node-exporter"} + node_memory_SReclaimable_bytes{job="node-exporter"})

2
cli/pkg/kubesphere/plugins/files/build/prometheus/node-exporter/node-exporter-serviceMonitor.yaml
View File

@@ -15,7 +15,7 @@ spec:
interval: 1m
metricRelabelings:
- action: keep
regex: node_(uname|network|disk|cpu)_info|node_cpu_.+|node_hwmon_temp_celsius|node_hwmon_chip_names|node_network_route_info|node_network_address_info|node_memory_Mem.+_bytes|node_memory_SReclaimable_bytes|node_memory_Cached_bytes|node_memory_Buffers_bytes|node_network_(.+_bytes_total|up)|node_network_.+_errs_total|node_nf_conntrack_entries.*|node_disk_.+_completed_total|node_disk_.+_bytes_total|node_disk_smartctl_info|node_disk_power_on_hours|node_disk_temp_celsius|node_disk_data_bytes_read|node_disk_data_bytes_written|node_filesystem_files|node_filesystem_files_free|node_filesystem_avail_bytes|node_filesystem_size_bytes|node_filesystem_free_bytes|node_filesystem_readonly|node_load.+|node_timex_offset_seconds
regex: node_memory_.+|node_vmstat_pswpout|node_vmstat_pswpin|node_(uname|network|disk|cpu)_info|node_cpu_.+|node_hwmon_temp_celsius|node_hwmon_chip_names|node_network_route_info|node_network_address_info|node_memory_Mem.+_bytes|node_memory_SReclaimable_bytes|node_memory_Cached_bytes|node_memory_Buffers_bytes|node_network_(.+_bytes_total|up)|node_network_.+_errs_total|node_nf_conntrack_entries.*|node_disk_.+_completed_total|node_disk_.+_bytes_total|node_disk_smartctl_info|node_disk_power_on_hours|node_disk_temp_celsius|node_disk_data_bytes_read|node_disk_data_bytes_written|node_filesystem_files|node_filesystem_files_free|node_filesystem_avail_bytes|node_filesystem_size_bytes|node_filesystem_free_bytes|node_filesystem_readonly|node_load.+|node_timex_offset_seconds
sourceLabels:
- __name__
port: https