Skip to content

Commit

Permalink
Merge pull request #164 from stackrox/stage
Browse files Browse the repository at this point in the history 
sync: stage to production
  • Loading branch information
@ludydoo
ludydoo authored Nov 16, 2023
2 parents d193e38 + a040264 commit 8e6229d
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 83 deletions.
8 changes: 4 additions & 4 deletions resources/grafana/generated/dashboards/rhacs-cluster-overview-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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}}",
Expand Down Expand Up @@ -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,
Expand All @@ -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}}",
Expand Down
8 changes: 4 additions & 4 deletions resources/grafana/generated/dashboards/rhacs-cluster-overview-dashboard.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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}}",
Expand Down Expand Up @@ -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,
Expand All @@ -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}}",
Expand Down
26 changes: 13 additions & 13 deletions resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
26 changes: 13 additions & 13 deletions resources/grafana/generated/dashboards/rhacs-cluster-resource-adjustment-dashboard.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions resources/grafana/sources/rhacs-cluster-overview.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
"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,
Expand All @@ -740,7 +740,7 @@
"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}}",
Expand Down Expand Up @@ -837,7 +837,7 @@
"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,
Expand All @@ -849,7 +849,7 @@
"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}}",
Expand Down
Loading

0 comments on commit 8e6229d

Please sign in to comment.