Updating the scripts to match the new connection with QuestDB. (42c44ecc) · Commits · TFS / controller

deploy.sh

+15 −5

Original line number	Diff line number	Diff line
		@@ -224,6 +224,8 @@ if [[ "$TFS_COMPONENTS" == "webui" ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
		# Updated Grafana API URL
		GRAFANA_URL_UPDATED="http://${GRAFANA_USERNAME}:${TFS_GRAFANA_PASSWORD}@${GRAFANA_HOSTNAME}:${GRAFANA_PORT}${GRAFANA_BASEURL}"

		echo "export GRAFANA_URL_UPDATED=${GRAFANA_URL_UPDATED}" >> $ENV_VARS_SCRIPT

		echo "Connecting to grafana at URL: ${GRAFANA_URL_DEFAULT}..."

		# Configure Grafana Admin Password
		@@ -239,14 +241,22 @@ if [[ "$TFS_COMPONENTS" == "webui" ]] && [[ "$TFS_COMPONENTS" == *"monitoring"
		# TODO: replace user, password and database by variables to be saved
		echo "Creating a datasource..."
		curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{
		"access" : "proxy",
		"type" : "postgres",
		"name" : "monitoringdb",
		"access" : "proxy",
		"url" : "monitoringservice:8812",
		"database" : "monitoring",
		"user" : "admin",
		"password" : "quest",
		"basicAuth" : false,
		"isDefault": true,
		"database" : "qdb",
		"sslmode" :"disable"
		"jsonData" : {
		"sslmode" : "disable",
		"postgresVersion" : 1100
		},
		"secureJsonFields" : {
		"password" : true
		}
		}' ${GRAFANA_URL_UPDATED}/api/datasources
		echo

scripts/show_logs_monitoring.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,4 +24,4 @@ export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
		# Automated steps start here
		########################################################################################################################

		kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringservice -c server
		kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringserver

src/webui/grafana_dashboard.json

+9 −9

Original line number	Diff line number	Diff line
		@@ -193,19 +193,19 @@
		"tags": [
		{
		"key": "device_id",
		"operator": "=~",
		"operator": "=",
		"value": "/^$device_id$/"
		},
		{
		"condition": "AND",
		"key": "endpoint_id",
		"operator": "=~",
		"operator": "=",
		"value": "/^$endpoint_id$/"
		},
		{
		"condition": "AND",
		"key": "kpi_sample_type",
		"operator": "=~",
		"operator": "=",
		"value": "/^$kpi_sample_type$/"
		}
		]
		@@ -236,7 +236,7 @@
		]
		},
		"datasource": null,
		"definition": "SHOW TAG VALUES FROM samples WITH KEY=\"device_id\"",
		"definition": "SELECT DISTINCT device_id FROM monitoring;",
		"description": null,
		"error": null,
		"hide": 0,
		@@ -245,7 +245,7 @@
		"multi": true,
		"name": "device_id",
		"options": [],
		"query": "SHOW TAG VALUES FROM samples WITH KEY=\"device_id\"",
		"query": "SELECT DISTINCT device_id FROM monitoring;",
		"refresh": 2,
		"regex": "",
		"skipUrlSync": false,
		@@ -264,7 +264,7 @@
		]
		},
		"datasource": null,
		"definition": "SHOW TAG VALUES FROM samples WITH KEY=\"endpoint_id\" WHERE \"device_id\"=~/^$device_id$/",
		"definition": "SELECT DISTINCT endpoint_id FROM monitoring WHERE device_id IN (${device_id})",
		"description": null,
		"error": null,
		"hide": 0,
		@@ -273,7 +273,7 @@
		"multi": true,
		"name": "endpoint_id",
		"options": [],
		"query": "SHOW TAG VALUES FROM samples WITH KEY=\"endpoint_id\" WHERE \"device_id\"=~/^$device_id$/",
		"query": "SELECT DISTINCT endpoint_id FROM monitoring WHERE device_id IN (${device_id})",
		"refresh": 2,
		"regex": "",
		"skipUrlSync": false,
		@@ -292,7 +292,7 @@
		]
		},
		"datasource": null,
		"definition": "SHOW TAG VALUES FROM samples WITH KEY=\"kpi_sample_type\"",
		"definition": "SELECT DISTINCT kpi_sample_type FROM monitoring;",
		"description": null,
		"error": null,
		"hide": 0,
		@@ -301,7 +301,7 @@
		"multi": true,
		"name": "kpi_sample_type",
		"options": [],
		"query": "SHOW TAG VALUES FROM samples WITH KEY=\"kpi_sample_type\"",
		"query": "SELECT DISTINCT kpi_sample_type FROM monitoring;",
		"refresh": 2,
		"regex": "",
		"skipUrlSync": false,