Change Grafana dashboard for OMEC
Change-Id: I38d2b5fdf9a2c644a15bfecc44d970364bd02dae
diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index 2816c6c..353b92f 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -15,4 +15,4 @@
name: nem-monitoring
description: Time Series Storage and Dashboard for SEBA
-version: 1.0.12-dev
+version: 1.0.13-dev
diff --git a/nem-monitoring/grafana-dashboards/mcord.json b/nem-monitoring/grafana-dashboards/omec.json
similarity index 94%
rename from nem-monitoring/grafana-dashboards/mcord.json
rename to nem-monitoring/grafana-dashboards/omec.json
index 5bb160f..efb1c90 100644
--- a/nem-monitoring/grafana-dashboards/mcord.json
+++ b/nem-monitoring/grafana-dashboards/omec.json
@@ -2,7 +2,7 @@
"annotations": {
"list": [
{
- "$$hashKey": "object:6611",
+ "$$hashKey": "object:175",
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
@@ -16,8 +16,8 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
- "id": 6,
- "iteration": 1565383179131,
+ "id": 9,
+ "iteration": 1567571557083,
"links": [],
"panels": [
{
@@ -95,7 +95,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "kube_pod_container_resource_requests_cpu_cores{pod=\"$Pod-0\"}",
+ "expr": "sum(kube_pod_container_resource_requests_cpu_cores{pod=\"$Pod-0\"})",
"format": "time_series",
"intervalFactor": 1,
"refId": "A"
@@ -356,7 +356,7 @@
"tableColumn": "",
"targets": [
{
- "expr": "kube_pod_container_resource_requests_memory_bytes{pod=\"$Pod-0\"}",
+ "expr": "sum(kube_pod_container_resource_requests_memory_bytes{pod=\"$Pod-0\"})",
"format": "time_series",
"intervalFactor": 1,
"refId": "A"
@@ -471,8 +471,8 @@
"allValue": null,
"current": {
"tags": [],
- "text": "HSS",
- "value": "hss"
+ "text": "SPGW-U",
+ "value": "spgwu"
},
"hide": 0,
"includeAll": false,
@@ -481,47 +481,49 @@
"name": "Pod",
"options": [
{
+ "$$hashKey": "object:205",
"selected": false,
"text": "MME",
"value": "mme"
},
{
+ "$$hashKey": "object:206",
"selected": false,
"text": "SPGW-C",
"value": "spgwc"
},
{
- "selected": false,
+ "$$hashKey": "object:207",
+ "selected": true,
"text": "SPGW-U",
"value": "spgwu"
},
{
- "selected": true,
+ "$$hashKey": "object:208",
+ "selected": false,
"text": "HSS",
"value": "hss"
},
{
- "selected": false,
- "text": "HSS-DB",
- "value": "hssdb"
- },
- {
+ "$$hashKey": "object:209",
"selected": false,
"text": "Remote CDN",
"value": "antmedia"
},
{
+ "$$hashKey": "object:210",
"selected": false,
"text": "Remote Streaming",
"value": "remote-streaming"
},
{
+ "$$hashKey": "object:211",
"selected": false,
"text": "Local CDN",
"value": "nginx-rtmp"
}
],
- "query": "MME, SPGW-C, SPGW-U, HSS, HSS-DB, Remote CDN, Remote Streaming, Local CDN",
+ "query": "MME, SPGW-C, SPGW-U, HSS, Remote CDN, Remote Streaming, Local CDN",
"type": "custom"
}
]
@@ -557,7 +559,7 @@
]
},
"timezone": "",
- "title": "M-CORD",
- "uid": "gKU3e27Zz",
+ "title": "OMEC",
+ "uid": "gKU2e27Zz",
"version": 1
-}
\ No newline at end of file
+}
diff --git a/nem-monitoring/templates/grafana-dashboard-mcord-configmap.yaml b/nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml
similarity index 88%
rename from nem-monitoring/templates/grafana-dashboard-mcord-configmap.yaml
rename to nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml
index a948aa7..a7b780b 100644
--- a/nem-monitoring/templates/grafana-dashboard-mcord-configmap.yaml
+++ b/nem-monitoring/templates/grafana-dashboard-omec-configmap.yaml
@@ -16,9 +16,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: grafana-dashboard-mcord
+ name: grafana-dashboard-omec
labels:
grafana_dashboard: "1"
data:
mcord.json: |
-{{ .Files.Get "grafana-dashboards/mcord.json" | indent 4 }}
\ No newline at end of file
+{{ .Files.Get "grafana-dashboards/omec.json" | indent 4 }}