diff --git a/deploy.sh b/deploy.sh
index 4d79635e12a544a21a0c7f86f96694fc05c923a7..c5dee68a06e000bf7df90ef437e77c14232f2cec 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -252,7 +252,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
"isDefault": true,
"jsonData" : {
"sslmode" : "disable",
- "postgresVersion" : 1100
+ "postgresVersion" : 1100,
+ "tlsAuth" : false,
+ "tlsAuthWithCACert": false,
+ "tlsConfigurationMethod": "file-path",
+ "tlsSkipVerify": true
},
"secureJsonFields" : {
"password" : true
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index 0ebb811159641904271a2884739b65485abef356..0dba6104d8e78e8365eb9a9dc6ff5e681e0bc57e 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -40,7 +40,7 @@ spec:
- name: LOG_LEVEL
value: "DEBUG"
- name: WEBUISERVICE_SERVICE_BASEURL_HTTP
- value: "/"
+ value: "/webui/"
readinessProbe:
httpGet:
path: /healthz/ready
@@ -61,7 +61,7 @@ spec:
cpu: 700m
memory: 1024Mi
- name: grafana
- image: grafana/grafana:8.2.6
+ image: grafana/grafana:8.5.11
imagePullPolicy: IfNotPresent
ports:
- containerPort: 3000
diff --git a/src/webui/grafana_backup_dashboard.json b/src/webui/grafana_backup_dashboard.json
new file mode 100644
index 0000000000000000000000000000000000000000..58a856a6c50de422b1f6bde1e2799d53762db916
--- /dev/null
+++ b/src/webui/grafana_backup_dashboard.json
@@ -0,0 +1,320 @@
+{
+ "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,
+ "fiscalYearStartMonth": 0,
+ "gnetId": null,
+ "graphTooltip": 0,
+ "id": 1,
+ "iteration": 1664282779131,
+ "links": [],
+ "liveNow": false,
+ "panels": [
+ {
+ "datasource": null,
+ "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": "smooth",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byRegexp",
+ "options": ".* PACKETS_.*"
+ },
+ "properties": [
+ {
+ "id": "custom.axisPlacement",
+ "value": "left"
+ },
+ {
+ "id": "unit",
+ "value": "pps"
+ },
+ {
+ "id": "custom.axisLabel",
+ "value": "Packets / sec"
+ },
+ {
+ "id": "custom.axisSoftMin",
+ "value": 0
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byRegexp",
+ "options": ".* BYTES_.*"
+ },
+ "properties": [
+ {
+ "id": "custom.axisPlacement",
+ "value": "right"
+ },
+ {
+ "id": "unit",
+ "value": "Bps"
+ },
+ {
+ "id": "custom.axisLabel",
+ "value": "Bytes / sec"
+ },
+ {
+ "id": "custom.axisSoftMin",
+ "value": 0
+ }
+ ]
+ }
+ ]
+ },
+ "gridPos": {
+ "h": 19,
+ "w": 24,
+ "x": 0,
+ "y": 0
+ },
+ "id": 2,
+ "options": {
+ "legend": {
+ "calcs": [
+ "first",
+ "min",
+ "mean",
+ "max",
+ "lastNotNull"
+ ],
+ "displayMode": "table",
+ "placement": "right"
+ },
+ "tooltip": {
+ "mode": "multi"
+ }
+ },
+ "targets": [
+ {
+ "format": "time_series",
+ "group": [],
+ "hide": false,
+ "metricColumn": "kpi_value",
+ "rawQuery": false,
+ "rawSql": "SELECT\n timestamp AS \"time\",\n kpi_value AS metric,\n kpi_value AS \"kpi_value\"\nFROM monitoring\nWHERE\n $__timeFilter(timestamp) AND\n device_id = $device_id AND\n endpoint_id = $endpoint_id\nORDER BY 1,2",
+ "refId": "A",
+ "select": [
+ [
+ {
+ "params": [
+ "kpi_value"
+ ],
+ "type": "column"
+ },
+ {
+ "params": [
+ "avg"
+ ],
+ "type": "aggregate"
+ },
+ {
+ "params": [
+ "kpi_value"
+ ],
+ "type": "alias"
+ }
+ ]
+ ],
+ "table": "monitoring",
+ "timeColumn": "timestamp",
+ "where": [
+ {
+ "name": "$__timeFilter",
+ "params": [],
+ "type": "macro"
+ },
+ {
+ "name": "",
+ "params": [
+ "device_id",
+ "=",
+ "$device_id"
+ ],
+ "type": "expression"
+ },
+ {
+ "name": "",
+ "params": [
+ "endpoint_id",
+ "=",
+ "$endpoint_id"
+ ],
+ "type": "expression"
+ }
+ ]
+ }
+ ],
+ "title": "L3 Monitoring Packets/Bytes Received/Sent",
+ "transformations": [],
+ "type": "timeseries"
+ }
+ ],
+ "refresh": "",
+ "schemaVersion": 32,
+ "style": "dark",
+ "tags": [],
+ "templating": {
+ "list": [
+ {
+ "allValue": null,
+ "current": {
+ "selected": true,
+ "text": [
+ "R1-EMU"
+ ],
+ "value": [
+ "R1-EMU"
+ ]
+ },
+ "datasource": null,
+ "definition": "SELECT DISTINCT device_id FROM monitoring;",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "Device",
+ "multi": true,
+ "name": "device_id",
+ "options": [],
+ "query": "SELECT DISTINCT device_id FROM monitoring;",
+ "refresh": 2,
+ "regex": "",
+ "skipUrlSync": false,
+ "sort": 0,
+ "type": "query"
+ },
+ {
+ "allValue": null,
+ "current": {
+ "selected": true,
+ "text": [
+ "13/1/2"
+ ],
+ "value": [
+ "13/1/2"
+ ]
+ },
+ "datasource": null,
+ "definition": "SELECT DISTINCT endpoint_id FROM monitoring WHERE device_id IN (${device_id})",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "EndPoint",
+ "multi": true,
+ "name": "endpoint_id",
+ "options": [],
+ "query": "SELECT DISTINCT endpoint_id FROM monitoring WHERE device_id IN (${device_id})",
+ "refresh": 2,
+ "regex": "",
+ "skipUrlSync": false,
+ "sort": 0,
+ "type": "query"
+ },
+ {
+ "allValue": null,
+ "current": {
+ "selected": true,
+ "text": [
+ "All"
+ ],
+ "value": [
+ "$__all"
+ ]
+ },
+ "datasource": null,
+ "definition": "SELECT DISTINCT kpi_sample_type FROM monitoring;",
+ "description": null,
+ "error": null,
+ "hide": 0,
+ "includeAll": true,
+ "label": "Kpi Sample Type",
+ "multi": true,
+ "name": "kpi_sample_type",
+ "options": [],
+ "query": "SELECT DISTINCT kpi_sample_type FROM monitoring;",
+ "refresh": 2,
+ "regex": "",
+ "skipUrlSync": false,
+ "sort": 0,
+ "type": "query"
+ }
+ ]
+ },
+ "time": {
+ "from": "now-5m",
+ "to": "now"
+ },
+ "timepicker": {},
+ "timezone": "",
+ "title": "L3 Monitoring",
+ "uid": "tf-l3-monit",
+ "version": 3
+ }
\ No newline at end of file