Fix OMEC user plane namespace prefix
Change-Id: I20539eeafdd4db67ab7f438b4a62266c6e6b520c
diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index 0d5a128..c195e89 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -18,4 +18,4 @@
description: Time Series Storage and Dashboard for CORD
icon: https://guide.opencord.org/logos/cord.svg
-version: 1.3.6
+version: 1.3.7
diff --git a/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json b/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
index 446d500..3c77026 100644
--- a/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
+++ b/nem-monitoring/grafana-dashboards/omec-user-plane-summary.json
@@ -100,7 +100,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "sum(time() - kube_pod_created{datacenter=\"$site\",namespace=~\"omec|omec-cbrs\",pod=~\"spgwu.*\"})",
+ "expr": "sum(time() - kube_pod_created{datacenter=\"$site\",namespace=~\"omec-data-plane-cbrs.*\",pod=~\"spgwu.*\"})",
"refId": "A"
}
],
@@ -164,7 +164,7 @@
"repeatDirection": "v",
"targets": [
{
- "expr": "sum(rate(container_cpu_usage_seconds_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", image!=\"\", container_name!=\"POD\", pod_name=~\"spgwu.*\"}[5m])) / sum(kube_pod_container_resource_limits_cpu_cores{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod=~\"spgwu.*\"}) * 100",
+ "expr": "sum(rate(container_cpu_usage_seconds_total{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", image!=\"\", container_name!=\"POD\", pod_name=~\"spgwu.*\"}[5m])) / sum(kube_pod_container_resource_limits_cpu_cores{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", pod=~\"spgwu.*\"}) * 100",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -242,7 +242,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "100 * (sum(container_memory_usage_bytes{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"spgwu.*\", container_name!=\"POD\"}) / sum(container_spec_memory_limit_bytes{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"spgwu.*\", container_name!=\"POD\"}))",
+ "expr": "100 * (sum(container_memory_usage_bytes{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", pod_name=~\"spgwu.*\", container_name!=\"POD\"}) / sum(container_spec_memory_limit_bytes{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", pod_name=~\"spgwu.*\", container_name!=\"POD\"}))",
"format": "time_series",
"hide": false,
"instant": false,
@@ -309,7 +309,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(container_network_receive_bytes_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"spgwu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
+ "expr": "sum(rate(container_network_receive_bytes_total{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", pod_name=~\"spgwu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -317,7 +317,7 @@
"refId": "B"
},
{
- "expr": "-sum(rate(container_network_transmit_bytes_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"spgwu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
+ "expr": "-sum(rate(container_network_transmit_bytes_total{datacenter=\"$site\", namespace=~\"omec-data-plane-cbrs.*\", pod_name=~\"spgwu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -517,7 +517,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "kube_pod_container_status_restarts_total{datacenter=\"$site\",namespace=~\"omec|omec-cbrs\",pod=~\"spgwu.*\"}",
+ "expr": "kube_pod_container_status_restarts_total{datacenter=\"$site\",namespace=~\"omec-data-plane-cbrs.*\",pod=~\"spgwu.*\"}",
"refId": "A"
}
],
@@ -580,7 +580,7 @@
"repeatDirection": "v",
"targets": [
{
- "expr": "sum(rate(container_cpu_usage_seconds_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", image!=\"\", container_name!=\"POD\", pod_name=~\"accelleran-cbrs-cu.*\"}[5m])) / sum(kube_pod_container_resource_limits_cpu_cores{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod=~\"accelleran-cbrs-cu.*\"}) * 100",
+ "expr": "sum(rate(container_cpu_usage_seconds_total{datacenter=\"$site\", image!=\"\", container_name!=\"POD\", pod_name=~\"accelleran-cbrs-cu.*\"}[5m])) / sum(kube_pod_container_resource_limits_cpu_cores{datacenter=\"$site\", pod=~\"accelleran-cbrs-cu.*\"}) * 100",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -657,7 +657,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "100 * (sum(container_memory_usage_bytes{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"accelleran-cbrs-cu.*\", container_name!=\"POD\"}) / sum(container_spec_memory_limit_bytes{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"accelleran-cbrs-cu.*\", container_name!=\"POD\"}))",
+ "expr": "100 * (sum(container_memory_usage_bytes{datacenter=\"$site\", pod_name=~\"accelleran-cbrs-cu.*\", container_name!=\"POD\"}) / sum(container_spec_memory_limit_bytes{datacenter=\"$site\", pod_name=~\"accelleran-cbrs-cu.*\", container_name!=\"POD\"}))",
"format": "time_series",
"hide": false,
"instant": false,
@@ -723,7 +723,7 @@
"steppedLine": false,
"targets": [
{
- "expr": "sum(rate(container_network_receive_bytes_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"accelleran-cbrs-cu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
+ "expr": "sum(rate(container_network_receive_bytes_total{datacenter=\"$site\", pod_name=~\"accelleran-cbrs-cu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -731,7 +731,7 @@
"refId": "B"
},
{
- "expr": "-sum(rate(container_network_transmit_bytes_total{datacenter=\"$site\", namespace=~\"omec|omec-cbrs\", pod_name=~\"accelleran-cbrs-cu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
+ "expr": "-sum(rate(container_network_transmit_bytes_total{datacenter=\"$site\", pod_name=~\"accelleran-cbrs-cu.*\", interface!=\"tunl0\"}[3m]))by (pod_name, interface)",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
@@ -846,7 +846,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "kube_pod_container_status_restarts_total{datacenter=\"$site\",namespace=~\"omec|omec-cbrs\",pod=~\"accelleran-cbrs-cu.*\"}",
+ "expr": "kube_pod_container_status_restarts_total{datacenter=\"$site\",pod=~\"accelleran-cbrs-cu.*\"}",
"refId": "A"
}
],
diff --git a/nem-monitoring/grafana-dashboards/omec-user-plane.json b/nem-monitoring/grafana-dashboards/omec-user-plane.json
index 02c73c9..0e490d5 100644
--- a/nem-monitoring/grafana-dashboards/omec-user-plane.json
+++ b/nem-monitoring/grafana-dashboards/omec-user-plane.json
@@ -2015,7 +2015,7 @@
"name": "namespace",
"query": "label_values(kube_pod_info{datacenter=\"$site\"},namespace)",
"refresh": 2,
- "regex": "\\b(?:omec|omec-cbrs|omec-b7)\\b",
+ "regex": "\\b(?:omec-data-plane-cbrs.*|omec-data-plane-b7.*)\\b",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",