Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dev-v2.9] fix cluster metric load average order #4403

Open
wants to merge 3 commits into
base: dev-v2.9
Choose a base branch
from
Open

[dev-v2.9] fix cluster metric load average order #4403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e80e7cb
dev-2.9-fix-cluster-metrics-load-average
skanakal Sep 9, 2024
2e27d15
dev-2.9-fix-cluster-nodes-load-average
skanakal Sep 9, 2024
93e4339
make charts
skanakal Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/rancher-monitoring/rancher-monitoring-104.1.3-rc.1+up57.0.3.tgz
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions ...rancher-monitoring/104.1.3-rc.1+up57.0.3/files/rancher/cluster/rancher-cluster-nodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m])) by (instance)",
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m])) by (instance)",
"interval": "",
"legendFormat": "Load[5m] ({{instance}})",
"legendFormat": "Load[1m] ({{instance}})",
"refId": "A"
},
{
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m])) by (instance)",
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m])) by (instance)",
"interval": "",
"legendFormat": "Load[1m] ({{instance}})",
"legendFormat": "Load[5m] ({{instance}})",
"refId": "B"
},
{
Expand Down
8 changes: 4 additions & 4 deletions charts/rancher-monitoring/104.1.3-rc.1+up57.0.3/files/rancher/cluster/rancher-cluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m]))",
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m]))",
"interval": "",
"legendFormat": "Load[5m]",
"legendFormat": "Load[1m]",
"refId": "A"
},
{
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m]))",
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m]))",
"interval": "",
"legendFormat": "Load[1m]",
"legendFormat": "Load[5m]",
"refId": "B"
},
{
Expand Down
4 changes: 2 additions & 2 deletions index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21014,7 +21014,7 @@ entries:
catalog.cattle.io/upstream-version: 57.0.3
apiVersion: v2
appVersion: v0.72.0
created: "2024-11-27T15:58:56.229353808-04:00"
created: "2024-11-29T09:59:35.539466329+05:30"
dependencies:
- condition: grafana.enabled
name: grafana
Expand Down Expand Up @@ -21086,7 +21086,7 @@ entries:
and Prometheus rules combined with documentation and scripts to provide easy
to operate end-to-end Kubernetes cluster monitoring with Prometheus using the
Prometheus Operator.
digest: 9489cf7b092ee478efd82048fb73546440a9734abf677baa3c5ace6c713e66bc
digest: 89ea31abcd2ecf40f9342f6dac56bf9542f9289b0a7dc6604ee782b2ad5f0ae8
home: https://github.com/prometheus-operator/kube-prometheus
icon: file://assets/logos/rancher-monitoring.png
keywords:
Expand Down
8 changes: 4 additions & 4 deletions ...her-monitoring/generated-changes/overlay/files/rancher/cluster/rancher-cluster-nodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m])) by (instance)",
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m])) by (instance)",
"interval": "",
"legendFormat": "Load[5m] ({{instance}})",
"legendFormat": "Load[1m] ({{instance}})",
"refId": "A"
},
{
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m])) by (instance)",
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m])) by (instance)",
"interval": "",
"legendFormat": "Load[1m] ({{instance}})",
"legendFormat": "Load[5m] ({{instance}})",
"refId": "B"
},
{
Expand Down
8 changes: 4 additions & 4 deletions ...g/rancher-monitoring/generated-changes/overlay/files/rancher/cluster/rancher-cluster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,15 +164,15 @@
"steppedLine": false,
"targets": [
{
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m]))",
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m]))",
"interval": "",
"legendFormat": "Load[5m]",
"legendFormat": "Load[1m]",
"refId": "A"
},
{
"expr": "sum(node_load1 OR avg_over_time(windows_system_processor_queue_length[1m]))",
"expr": "sum(node_load5 OR avg_over_time(windows_system_processor_queue_length[5m]))",
"interval": "",
"legendFormat": "Load[1m]",
"legendFormat": "Load[5m]",
"refId": "B"
},
{
Expand Down