diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml index 6fff80ac..2c47daab 100644 --- a/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml +++ b/resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml @@ -739,7 +739,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:cpu_limit_ratio", + "expr": "availability_zone:acscs_worker_nodes:cpu_limit_ratio", "interval": "", "legendFormat": "Limit / {{availability_zone}}", "range": true, @@ -751,7 +751,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:cpu_request_ratio", + "expr": "availability_zone:acscs_worker_nodes:cpu_request_ratio", "hide": false, "interval": "", "legendFormat": "Request / {{availability_zone}}", @@ -848,7 +848,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:memory_limit_ratio", + "expr": "availability_zone:acscs_worker_nodes:memory_limit_ratio", "interval": "", "legendFormat": "Limit / {{availability_zone}}", "range": true, @@ -860,7 +860,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:memory_request_ratio", + "expr": "availability_zone:acscs_worker_nodes:memory_request_ratio", "hide": false, "interval": "", "legendFormat": "Request / {{availability_zone}}", diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml index 43bf9568..e6c0915f 100644 --- a/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml +++ b/resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml @@ -739,7 +739,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:cpu_limit_ratio", + "expr": "availability_zone:acscs_worker_nodes:cpu_limit_ratio", "interval": "", "legendFormat": "Limit / {{availability_zone}}", "range": true, @@ -751,7 +751,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:cpu_request_ratio", + "expr": "availability_zone:acscs_worker_nodes:cpu_request_ratio", "hide": false, "interval": "", "legendFormat": "Request / {{availability_zone}}", @@ -848,7 +848,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:memory_limit_ratio", + "expr": "availability_zone:acscs_worker_nodes:memory_limit_ratio", "interval": "", "legendFormat": "Limit / {{availability_zone}}", "range": true, @@ -860,7 +860,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "availability_zone:strictly_worker_nodes:memory_request_ratio", + "expr": "availability_zone:acscs_worker_nodes:memory_request_ratio", "hide": false, "interval": "", "legendFormat": "Request / {{availability_zone}}", diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-configmap.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-configmap.yaml index 72a9623d..4a545acb 100644 --- a/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-configmap.yaml +++ b/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-configmap.yaml @@ -921,7 +921,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(strictly_worker_nodes)", + "expr": "sum(acscs_worker_nodes)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -988,7 +988,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / 1024 / 1024 / 1024", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / 1024 / 1024 / 1024", "instant": false, "legendFormat": "__auto", "range": true, @@ -1055,7 +1055,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes) / 1024 / 1024 / 1024", + "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes) / 1024 / 1024 / 1024", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1160,7 +1160,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1232,7 +1232,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes)", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes)", "format": "time_series", "hide": false, "instant": false, @@ -1304,7 +1304,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n ", "format": "time_series", "hide": false, "instant": false, @@ -1436,7 +1436,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n ", "format": "time_series", "hide": false, "instant": false, @@ -1452,7 +1452,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) \n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) \n ", "format": "time_series", "hide": false, "instant": false, @@ -1548,7 +1548,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1620,7 +1620,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes)", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes)", "format": "time_series", "hide": false, "instant": false, @@ -1692,7 +1692,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1824,7 +1824,7 @@ data: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1839,7 +1839,7 @@ data: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes)\n", "hide": false, "legendFormat": "cpu absolute", "range": true, diff --git a/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-dashboard.yaml b/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-dashboard.yaml index 804e731c..48584e77 100644 --- a/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-dashboard.yaml +++ b/resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-dashboard.yaml @@ -921,7 +921,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(strictly_worker_nodes)", + "expr": "sum(acscs_worker_nodes)", "legendFormat": "__auto", "range": true, "refId": "A" @@ -988,7 +988,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / 1024 / 1024 / 1024", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / 1024 / 1024 / 1024", "instant": false, "legendFormat": "__auto", "range": true, @@ -1055,7 +1055,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes) / 1024 / 1024 / 1024", + "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes) / 1024 / 1024 / 1024", "legendFormat": "__auto", "range": true, "refId": "A" @@ -1160,7 +1160,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1232,7 +1232,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes)", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes)", "format": "time_series", "hide": false, "instant": false, @@ -1304,7 +1304,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n ", "format": "time_series", "hide": false, "instant": false, @@ -1436,7 +1436,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() strictly_worker_nodes)\n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) / \nsum(kube_node_status_capacity{resource=\"memory\", unit=\"byte\"} * on(node) group_left() acscs_worker_nodes)\n ", "format": "time_series", "hide": false, "instant": false, @@ -1452,7 +1452,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() strictly_worker_nodes) \n ", + "expr": "sum(node_namespace_pod_container:container_memory_working_set_bytes{container!=\"\"} * on (node) group_left() acscs_worker_nodes) \n ", "format": "time_series", "hide": false, "instant": false, @@ -1548,7 +1548,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1620,7 +1620,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes)", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes)", "format": "time_series", "hide": false, "instant": false, @@ -1692,7 +1692,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1824,7 +1824,7 @@ spec: }, "editorMode": "code", "exemplar": false, - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes) / sum(kube_node_status_capacity{resource=\"cpu\", unit=\"core\"} * on(node) group_left() acscs_worker_nodes)\n", "format": "time_series", "hide": false, "instant": false, @@ -1839,7 +1839,7 @@ spec: "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() strictly_worker_nodes)\n", + "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate * on (node) group_left() acscs_worker_nodes)\n", "hide": false, "legendFormat": "cpu absolute", "range": true,