Added dashboard for metrics

Change-Id: I8e70e7a1aeed1b1bb74fcbdef2c3bdc980cfb7dc
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 890e03b..e0e3e15 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC

 kubeVersion: ">=1.18.0"

 type: application

-version: 0.0.4

+version: 0.0.5

 appVersion: v0.0.0

 keywords:

   - aether

diff --git a/chronos-umbrella/files/dashboards/site/chronos-dashboard.json b/chronos-umbrella/files/dashboards/site/chronos-dashboard.json
new file mode 100644
index 0000000..d68c659
--- /dev/null
+++ b/chronos-umbrella/files/dashboards/site/chronos-dashboard.json
@@ -0,0 +1,498 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 1,
+  "iteration": 1639387947854,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 12,
+      "panels": [],
+      "repeat": "datasource",
+      "title": "Chronos",
+      "type": "row"
+    },
+    {
+      "datasource": "${datasource}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 16,
+        "x": 0,
+        "y": 1
+      },
+      "id": 2,
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true,
+        "text": {}
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "device_connected_status",
+          "format": "time_series",
+          "instant": false,
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Device Status",
+      "type": "gauge"
+    },
+    {
+      "datasource": "${datasource}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 8,
+        "x": 16,
+        "y": 1
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "slice_throughput_packets",
+          "interval": "",
+          "legendFormat": "{{slice}}",
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Slice Throughput Packets",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${datasource}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 2,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 16,
+        "x": 0,
+        "y": 7
+      },
+      "id": 10,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "slice_latency_end_to_end_milliseconds",
+          "interval": "",
+          "legendFormat": "{{slice}}, {{site}}",
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Slice Latency End-to-End Milliseconds",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${datasource}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 5,
+        "w": 8,
+        "x": 16,
+        "y": 7
+      },
+      "id": 6,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "slice_throughput_bytes",
+          "interval": "",
+          "legendFormat": "{{slice}}",
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "title": "Slice Throughput Bytes",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${datasource}",
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "stepBefore",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 14,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "device_connection_event_core",
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "queryType": "randomWalk",
+          "refId": "A"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_connection_event_ran",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "refId": "B"
+        },
+        {
+          "exemplar": true,
+          "expr": "device_connection_event_fabric",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "{{iccid}}",
+          "refId": "C"
+        }
+      ],
+      "title": "device_connection_event",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 20
+      },
+      "id": 4,
+      "title": "Row title",
+      "type": "row"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 30,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": "datasource-chronos",
+          "value": "datasource-chronos"
+        },
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "includeAll": false,
+        "label": null,
+        "multi": false,
+        "name": "datasource",
+        "options": [],
+        "query": "prometheus",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Chronos Dashboard",
+  "uid": "F_ubZr27z",
+  "version": 1
+}
\ No newline at end of file
diff --git a/chronos-umbrella/files/dashboards/site/site-availability.json b/chronos-umbrella/files/dashboards/site/site-availability.json
deleted file mode 100644
index 4a1f028..0000000
--- a/chronos-umbrella/files/dashboards/site/site-availability.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{

-    

-        "annotations": {

-            "list": [

-                {

-                    "builtIn": 1,

-                    "datasource": "-- Grafana --",

-                    "enable": true,

-                    "hide": true,

-                    "iconColor": "rgba(0, 211, 255, 1)",

-                    "name": "Annotations & Alerts",

-                    "type": "dashboard"

-                }

-            ]

-        },

-        "description": "",

-        "editable": false,

-        "gnetId": null,

-        "graphTooltip": 0,

-        "links": [],

-        "panels": [

-            {

-                "datasource": "$ds",

-                "description": "Cluster Availability",

-                "fieldConfig": {

-                    "defaults": {

-                        "color": {

-                            "mode": "palette-classic"

-                        },

-                        "custom": {

-                            "axisLabel": "",

-                            "axisPlacement": "auto",

-                            "barAlignment": 0,

-                            "drawStyle": "line",

-                            "fillOpacity": 0,

-                            "gradientMode": "none",

-                            "hideFrom": {

-                                "legend": false,

-                                "tooltip": false,

-                                "viz": false

-                            },

-                            "lineInterpolation": "linear",

-                            "lineWidth": 1,

-                            "pointSize": 5,

-                            "scaleDistribution": {

-                                "type": "linear"

-                            },

-                            "showPoints": "auto",

-                            "spanNulls": false,

-                            "stacking": {

-                                "group": "A",

-                                "mode": "none"

-                            },

-                            "thresholdsStyle": {

-                                "mode": "off"

-                            }

-                        },

-                        "mappings": [],

-                        "thresholds": {

-                            "mode": "absolute",

-                            "steps": [

-                                {

-                                    "color": "green",

-                                    "value": null

-                                },

-                                {

-                                    "color": "red",

-                                    "value": 80

-                                }

-                            ]

-                        }

-                    },

-                    "overrides": []

-                },

-                "gridPos": {

-                    "h": 8,

-                    "w": 12,

-                    "x": 0,

-                    "y": 0

-                },

-                "id": 1,

-                "options": {

-                    "legend": {

-                        "calcs": [],

-                        "displayMode": "list",

-                        "placement": "bottom"

-                    },

-                    "tooltip": {

-                        "mode": "single"

-                    }

-                },

-                "targets": [

-                    {

-                        "exemplar": true,

-                        "expr": "sum by (node) (kube_node_status_condition{condition=~\"Ready\",status=~\"true\"})",

-                        "interval": "",

-                        "legendFormat": "{{node}}",

-                        "queryType": "randomWalk",

-                        "refId": "A"

-                    }

-                ],

-                "title": "Cluster Nodes Status",

-                "type": "timeseries"

-            }

-        ],

-        "refresh": "",

-        "schemaVersion": 30,

-        "style": "light",

-        "tags": [],

-        "templating": {

-            "list": [

-                {

-                    "label" : "Datasource",

-                    "multi" : false,

-                    "name" : "ds",

-                    "type" : "datasource",

-                    "query": "prometheus",

-                    "queryValue": "",

-                    "refresh": 1,

-                    "regex": ""

-                }

-            ]

-        },

-        "time": {

-            "from": "now-15m",

-            "to": "now"

-        },

-        "timepicker": {},

-        "timezone": "",

-        "title": "Cluster Health",

-        "uid": "site-availability",

-        "version": 1

-    }

-

-

diff --git a/chronos-umbrella/files/dashboards/site/site-monitoring.json b/chronos-umbrella/files/dashboards/site/site-monitoring.json
deleted file mode 100644
index 65535d6..0000000
--- a/chronos-umbrella/files/dashboards/site/site-monitoring.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{

-    

-        "annotations": {

-            "list": [

-                {

-                    "builtIn": 1,

-                    "datasource": "-- Grafana --",

-                    "enable": true,

-                    "hide": true,

-                    "iconColor": "rgba(0, 211, 255, 1)",

-                    "name": "Annotations & Alerts",

-                    "type": "dashboard"

-                }

-            ]

-        },

-        "description": "",

-        "editable": false,

-        "gnetId": null,

-        "graphTooltip": 0,

-        "links": [],

-        "panels": [

-            {

-                "datasource": "$ds",

-                "description": "E2E Tests",

-                "fieldConfig": {

-                    "defaults": {

-                        "color": {

-                            "mode": "palette-classic"

-                        },

-                        "custom": {

-                            "axisLabel": "",

-                            "axisPlacement": "auto",

-                            "barAlignment": 0,

-                            "drawStyle": "line",

-                            "fillOpacity": 0,

-                            "gradientMode": "none",

-                            "hideFrom": {

-                                "legend": false,

-                                "tooltip": false,

-                                "viz": false

-                            },

-                            "lineInterpolation": "linear",

-                            "lineWidth": 1,

-                            "pointSize": 5,

-                            "scaleDistribution": {

-                                "type": "linear"

-                            },

-                            "showPoints": "auto",

-                            "spanNulls": false,

-                            "stacking": {

-                                "group": "A",

-                                "mode": "none"

-                            },

-                            "thresholdsStyle": {

-                                "mode": "off"

-                            }

-                        },

-                        "mappings": [],

-                        "thresholds": {

-                            "mode": "absolute",

-                            "steps": [

-                                {

-                                    "color": "green",

-                                    "value": null

-                                },

-                                {

-                                    "color": "red",

-                                    "value": 80

-                                }

-                            ]

-                        }

-                    },

-                    "overrides": []

-                },

-                "gridPos": {

-                    "h": 9,

-                    "w": 12,

-                    "x": 0,

-                    "y": 0

-                },

-                "id": 1,

-                "options": {

-                    "legend": {

-                        "calcs": [],

-                        "displayMode": "list",

-                        "placement": "bottom"

-                    },

-                    "tooltip": {

-                        "mode": "single"

-                    }

-                },

-                "targets": [

-                    {

-                        "exemplar": true,

-                        "expr": "sum by (name) (aetheredge_e2e_tests_ok{name=~\"$agents\"})",

-                        "interval": "",

-                        "legendFormat": "{{name}}",

-                        "queryType": "randomWalk",

-                        "refId": "A"

-                    }

-                ],

-                "title": "Monitoring agents E2E Test",

-                "type": "timeseries"

-            }

-        ],

-        "refresh": "",

-        "schemaVersion": 30,

-        "style": "light",

-        "tags": [],

-        "templating": {

-            "list": [

-                {

-                    "label" : "Agents",

-                    "multi" : true,

-                    "name" : "agents",

-                    "type" : "query",

-                    "datasource": "$ds",

-                    "definition": "label_values(aetheredge_e2e_tests_ok, name)",

-                    "query": {

-                        "query": "label_values(aetheredge_e2e_tests_ok, name)",

-                        "refId": "StandardVariableQuery"

-                    },

-                    "refresh": 1,  

-                    "sort" : 1

-                },

-		{

-                    "label" : "Datasource",

-                    "multi" : false,

-                    "name" : "ds",

-                    "type" : "datasource",

-                    "query": "prometheus",

-                    "queryValue": "",

-                    "refresh": 1,

-                    "regex": ""

-                }

-	    ] 

-        },

-        "time": {

-            "from": "now-15m",

-            "to": "now"

-        },

-        "timepicker": {},

-        "timezone": "",

-        "title": "E2E Tests",

-        "uid": "site-monitoring",

-        "version": 1

-    }

-

-

diff --git a/chronos-umbrella/files/dashboards/site/site-small-cells.json b/chronos-umbrella/files/dashboards/site/site-small-cells.json
deleted file mode 100644
index 910e8d3..0000000
--- a/chronos-umbrella/files/dashboards/site/site-small-cells.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{

-    

-        "annotations": {

-            "list": [

-                {

-                    "builtIn": 1,

-                    "datasource": "-- Grafana --",

-                    "enable": true,

-                    "hide": true,

-                    "iconColor": "rgba(0, 211, 255, 1)",

-                    "name": "Annotations & Alerts",

-                    "type": "dashboard"

-                }

-            ]

-        },

-        "description": "",

-        "editable": false,

-        "gnetId": null,

-        "graphTooltip": 0,

-        "links": [],

-        "panels": [

-            {

-                "datasource": "$ds",

-                "description": "Small Cells connectivity on MME",

-                "fieldConfig": {

-                    "defaults": {

-                        "color": {

-                            "mode": "palette-classic"

-                        },

-                        "custom": {

-                            "axisLabel": "",

-                            "axisPlacement": "auto",

-                            "barAlignment": 0,

-                            "drawStyle": "line",

-                            "fillOpacity": 0,

-                            "gradientMode": "none",

-                            "hideFrom": {

-                                "legend": false,

-                                "tooltip": false,

-                                "viz": false

-                            },

-                            "lineInterpolation": "linear",

-                            "lineWidth": 1,

-                            "pointSize": 5,

-                            "scaleDistribution": {

-                                "type": "linear"

-                            },

-                            "showPoints": "auto",

-                            "spanNulls": false,

-                            "stacking": {

-                                "group": "A",

-                                "mode": "none"

-                            },

-                            "thresholdsStyle": {

-                                "mode": "off"

-                            }

-                        },

-                        "mappings": [],

-                        "thresholds": {

-                            "mode": "absolute",

-                            "steps": [

-                                {

-                                    "color": "green",

-                                    "value": null

-                                },

-                                {

-                                    "color": "red",

-                                    "value": 80

-                                }

-                            ]

-                        }

-                    },

-                    "overrides": []

-                },

-                "gridPos": {

-                    "h": 9,

-                    "w": 12,

-                    "x": 0,

-                    "y": 0

-                },

-                "id": 1,

-                "options": {

-                    "legend": {

-                        "calcs": [],

-                        "displayMode": "list",

-                        "placement": "bottom"

-                    },

-                    "tooltip": {

-                        "mode": "single"

-                    }

-                },

-                "targets": [

-                    {

-                        "exemplar": true,

-                        "expr": "sum by (enbname) (mme_number_of_enb_attached{enb_state=\"Active\", enbname=~\"$enb\"})",

-                        "interval": "",

-                        "legendFormat": "{{enbname}}",

-                        "queryType": "randomWalk",

-                        "refId": "A"

-                    }

-                ],

-                "title": "Site Small Cells connectivity status",

-                "type": "timeseries"

-            }

-        ],

-        "refresh": "",

-        "schemaVersion": 30,

-        "style": "light",

-        "tags": [],

-        "templating": {

-            "list": [

-                {

-                    "label" : "ENB",

-                    "multi" : true,

-                    "name" : "enb",

-                    "type" : "query",

-                    "datasource": "$ds",

-                    "definition": "label_values(mme_number_of_enb_attached, enbname)",

-                    "query": {

-                        "query": "label_values(mme_number_of_enb_attached, enbname)",

-                        "refId": "StandardVariableQuery"

-                    },

-                    "refresh": 1,  

-                    "sort" : 1

-                },

-		{

-                    "label" : "Datasource",

-                    "multi" : false,

-                    "name" : "ds",

-                    "type" : "datasource",

-                    "query": "prometheus",

-                    "queryValue": "",

-                    "refresh": 1,

-                    "regex": ""

-                }

-	    ] 

-        },

-        "time": {

-            "from": "now-15m",

-            "to": "now"

-        },

-        "timepicker": {},

-        "timezone": "",

-        "title": "ENB Status",

-        "uid": "site-small-cell",

-        "version": 1

-    }

-

-

diff --git a/chronos-umbrella/files/dashboards/ue/ue-connectivity.json b/chronos-umbrella/files/dashboards/ue/ue-connectivity.json
deleted file mode 100644
index c9f0423..0000000
--- a/chronos-umbrella/files/dashboards/ue/ue-connectivity.json
+++ /dev/null
@@ -1,147 +0,0 @@
-{

- 

-    "annotations": {

-      "list": [

-        {

-          "builtIn": 1,

-          "datasource": "-- Grafana --",

-          "enable": true,

-          "hide": true,

-          "iconColor": "rgba(0, 211, 255, 1)",

-          "name": "Annotations & Alerts",

-          "type": "dashboard"

-        }

-      ]

-    },

-    "editable": false,

-    "gnetId": null,

-    "graphTooltip": 0,

-    "links": [],

-    "panels": [

-      {

-        "datasource": "$ds",

-        "description": "UE Connectivity",

-        "fieldConfig": {

-          "defaults": {

-            "color": {

-              "mode": "palette-classic"

-            },

-            "custom": {

-              "axisLabel": "",

-              "axisPlacement": "auto",

-              "barAlignment": 0,

-              "drawStyle": "line",

-              "fillOpacity": 0,

-              "gradientMode": "none",

-              "hideFrom": {

-                "legend": false,

-                "tooltip": false,

-                "viz": false

-              },

-              "lineInterpolation": "linear",

-              "lineWidth": 1,

-              "pointSize": 5,

-              "scaleDistribution": {

-                "type": "linear"

-              },

-              "showPoints": "auto",

-              "spanNulls": false,

-              "stacking": {

-                "group": "A",

-                "mode": "none"

-              },

-              "thresholdsStyle": {

-                "mode": "off"

-              }

-            },

-            "mappings": [],

-            "thresholds": {

-              "mode": "absolute",

-              "steps": [

-                {

-                  "color": "green",

-                  "value": null

-                },

-                {

-                  "color": "red",

-                  "value": 80

-                }

-              ]

-            }

-          },

-          "overrides": []

-        },

-        "gridPos": {

-          "h": 8,

-          "w": 12,

-          "x": 0,

-          "y": 0

-        },

-        "id": 1,

-        "options": {

-          "legend": {

-            "calcs": [],

-            "displayMode": "list",

-            "placement": "bottom"

-          },

-          "tooltip": {

-            "mode": "single"

-          }

-        },

-        "targets": [

-          {

-            "exemplar": true,

-            "expr": "subscribers_info{imsi=\"$imsi\"}",

-            "interval": "",

-            "legendFormat": "Connectivity",

-            "queryType": "randomWalk",

-            "refId": "A"

-          }

-        ],

-        "title": "UE $imsi Connectivity",

-        "type": "timeseries"

-      }

-    ],

-    "refresh": "",

-    "schemaVersion": 30,

-    "style": "light",

-    "tags": [],

-    "templating": {

-      "list": [

-          {

-                    "label" : "IMSI",

-                    "multi" : false,

-                    "name" : "imsi",

-                    "type" : "query",

-                    "datasource": "$ds",

-                    "definition": "label_values(subscribers_info, imsi)",

-                    "query": {

-                        "query": "label_values(subscribers_info, imsi)",

-                        "refId": "StandardVariableQuery"

-                    },

-                    "refresh": 1,  

-                    "sort" : 1

-        },

-	{

-                    "label" : "Datasource",

-                    "multi" : false,

-                    "name" : "ds",

-                    "type" : "datasource",

-                    "query": "prometheus",

-                    "queryValue": "",

-                    "refresh": 1,

-                    "regex": ""

-        }

-      ]

-    },

-    "time": {

-      "from": "now-15m",

-      "to": "now"

-    },

-    "timepicker": {},

-    "timezone": "",

-    "title": "UE Connectivity",

-    "uid": "ue-conn",

-    "version": 1

-  }

-

diff --git a/chronos-umbrella/templates/NOTES.txt b/chronos-umbrella/templates/NOTES.txt
index 6bbb75c..879d855 100644
--- a/chronos-umbrella/templates/NOTES.txt
+++ b/chronos-umbrella/templates/NOTES.txt
@@ -12,14 +12,3 @@
   $ helm -n {{.Release.Namespace}} get all {{ .Release.Name }}

   $ watch kubectl -n {{.Release.Namespace}} get pods

 

-You can attach to:

-* Aether CLI pod with

-$ kubectl -n {{.Release.Namespace}} exec -it $(kubectl -n {{.Release.Namespace}} get pods -l type=cli -o name) -- /bin/sh

-* Aether Portal at http://<server_IP>:31190

-

-If you are using KinD as a Kubernetes server, you will have to use a "port-forward" to access the Aether ROC GUI e.g.

-$ kubectl -n {{.Release.Namespace}} port-forward service/aether-roc-gui 8183:80

-and then access the GUI at

-* http://localhost:8183

-

-The aether-roc-api is then available at http://localhost:8183/aether-roc-api

diff --git a/chronos-umbrella/templates/dashboards-templated.yaml b/chronos-umbrella/templates/dashboards-templated.yaml
new file mode 100644
index 0000000..ec7f7cd
--- /dev/null
+++ b/chronos-umbrella/templates/dashboards-templated.yaml
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-dashboards-templated
+  namespace: {{ .Release.Namespace }}
+  labels:
+          chronos_dashboard: "chronos-dashboard"
+data:
+{{ (.Files.Glob "files/dashboards/**/*.json").AsConfig | indent 2 }}
diff --git a/chronos-umbrella/templates/datasources-templated.yaml b/chronos-umbrella/templates/datasources-templated.yaml
new file mode 100644
index 0000000..8268d68
--- /dev/null
+++ b/chronos-umbrella/templates/datasources-templated.yaml
@@ -0,0 +1,24 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-datasources-templated
+  namespace: {{ .Release.Namespace }}
+  labels:
+          chronos_datasource: "chronos-datasource"
+data:
+  prom-datasources.yaml: |
+     apiVersion: 1
+     datasources:
+     {{- range .Values.grafana.source }}
+     - name: datasource-{{ .name }}
+       url: {{ .protocol }}://{{ .service }}:{{ .port }}
+       type: prometheus
+       access: proxy
+       jsonData:
+         oauthPassThru: true
+     {{- end }}
+
diff --git a/chronos-umbrella/values.yaml b/chronos-umbrella/values.yaml
index 34af676..94e32e3 100644
--- a/chronos-umbrella/values.yaml
+++ b/chronos-umbrella/values.yaml
@@ -30,15 +30,16 @@
     service: chronos-umbrella-prometheus-chronos-server

 

 grafana:

+  adminPassword: admin@123

   sidecar:

     dashboards:

        enabled: true

        label: chronos_dashboard

-       labelValue: chronos-exporter-gui

+       labelValue: chronos-dashboard

     datasources:

        enabled: true

        label: chronos_datasource

-       labelValue: chronos-exporter-gui

+       labelValue: chronos-datasource

   source:

   - name: chronos

     protocol: http

@@ -57,7 +58,7 @@
      disable_login_form: false

      oauth_auto_login: false

     auth.anonymous:

-      enabled: true

+      enabled: false

       hide_version: false

 # Disabled other auth types for the moment - see aether-roc-gui/docs/grafana.md

     auth.proxy: