X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fk8s%2Fsummary-dashboard.yaml;h=c455eeae8a9b6657371391c9f8aacc5b26820b09;hb=89a4f0a8a7e73cb984d0bcd6a592d0df3edb0ab9;hp=b35745113ddf3d01ab0b7f194de77ffb47393e90;hpb=9d01bf493067a7197487f1c32ca1d54371c94b03;p=osm%2Fdevops.git

diff --git a/installers/k8s/summary-dashboard.yaml b/installers/k8s/summary-dashboard.yaml
index b3574511..c455eeae 100644
--- a/installers/k8s/summary-dashboard.yaml
+++ b/installers/k8s/summary-dashboard.yaml
@@ -468,7 +468,7 @@ data:
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(kube_pod_info) / sum(kube_node_status_allocatable_pods)",
+              "expr": "sum(kube_pod_info) / sum(kube_node_status_allocatable{resource=\"pods\"})",
               "format": "time_series",
               "intervalFactor": 1,
               "refId": "A"
@@ -549,7 +549,7 @@ data:
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(kube_pod_container_resource_requests_cpu_cores) / sum(kube_node_status_allocatable_cpu_cores)",
+              "expr": "sum(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\"}) / sum(kube_node_status_allocatable{resource=\"cpu\",unit=\"core\"})",
               "format": "time_series",
               "instant": true,
               "intervalFactor": 1,
@@ -631,7 +631,7 @@ data:
           "tableColumn": "",
           "targets": [
             {
-              "expr": "sum(kube_pod_container_resource_requests_memory_bytes) / sum(kube_node_status_allocatable_memory_bytes)",
+              "expr": "sum(kube_pod_container_resource_requests{resource=\"memory\",unit=\"byte\"}) / sum(kube_node_status_allocatable{resource=\"memory\",unit=\"byte\"})",
               "format": "time_series",
               "instant": true,
               "intervalFactor": 1,
@@ -895,7 +895,7 @@ data:
           "tableColumn": "",
           "targets": [
             {
-              "expr": "kube_statefulset_status_replicas_ready{namespace=\"osm\", statefulset=\"mongo\"}",
+              "expr": "kube_statefulset_status_replicas_ready{namespace=\"osm\", statefulset=\"mongodb-k8s\"}",
               "format": "time_series",
               "refId": "A"
             }
@@ -1343,91 +1343,6 @@ data:
           ],
           "valueName": "current"
         },
-        {
-          "cacheTimeout": null,
-          "colorBackground": false,
-          "colorValue": false,
-          "colors": [
-            "#d44a3a",
-            "rgba(237, 129, 40, 0.89)",
-            "#299c46"
-          ],
-          "datasource": "Prometheus",
-          "format": "none",
-          "gauge": {
-            "maxValue": 1,
-            "minValue": 0,
-            "show": true,
-            "thresholdLabels": false,
-            "thresholdMarkers": false
-          },
-          "gridPos": {
-            "h": 4,
-            "w": 3,
-            "x": 4,
-            "y": 14
-          },
-          "id": 79,
-          "interval": null,
-          "links": [],
-          "mappingType": 1,
-          "mappingTypes": [
-            {
-              "name": "value to text",
-              "value": 1
-            },
-            {
-              "name": "range to text",
-              "value": 2
-            }
-          ],
-          "maxDataPoints": 100,
-          "nullPointMode": "connected",
-          "nullText": null,
-          "options": {},
-          "pluginVersion": "6.3.5",
-          "postfix": "",
-          "postfixFontSize": "50%",
-          "prefix": "",
-          "prefixFontSize": "50%",
-          "rangeMaps": [
-            {
-              "from": "null",
-              "text": "N/A",
-              "to": "null"
-            }
-          ],
-          "sparkline": {
-            "fillColor": "rgba(31, 118, 189, 0.18)",
-            "full": false,
-            "lineColor": "rgb(31, 120, 193)",
-            "show": false,
-            "ymax": null,
-            "ymin": null
-          },
-          "tableColumn": "",
-          "targets": [
-            {
-              "expr": "kube_deployment_status_replicas_available{deployment=\"light-ui\"}",
-              "instant": true,
-              "refId": "A"
-            }
-          ],
-          "thresholds": "0,1",
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "light-ui",
-          "type": "singlestat",
-          "valueFontSize": "100%",
-          "valueMaps": [
-            {
-              "op": "=",
-              "text": "0",
-              "value": "null"
-            }
-          ],
-          "valueName": "avg"
-        },
         {
           "cacheTimeout": null,
           "colorBackground": false,
@@ -1815,7 +1730,7 @@ data:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum(namespace_pod_container:container_cpu_usage_seconds_total:sum_rate{namespace=\"osm\"}) by (pod)",
+              "expr": "sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace=\"osm\"}) by (pod)",
               "instant": false,
               "intervalFactor": 4,
               "legendFormat": "{{pod}}",