From b5fa5ff429df5f74247dca6b3b6ac0aea7334a24 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 27 Mar 2024 16:02:04 +1100 Subject: [PATCH 1/2] Adds config override for data-pipelines --- images/php/settings.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/php/settings.php b/images/php/settings.php index 9f4be90f..1b3b6640 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -346,6 +346,9 @@ $config['elasticsearch_connector.cluster.elasticsearch_bay']['options']['use_authentication'] = 0; } +// Override data_pipelines url. +$config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = getenv('SEARCH_URL') ? sprintf('https://%s', getenv('SEARCH_URL')) : "http://elasticsearch:9200"; + // Configure tide_logs. if (getenv('TIDE_LOGS_UDPLOG_HOST')) { $config['tide_logs.settings']['host'] = getenv('TIDE_LOGS_UDPLOG_HOST'); From 26772dcb26bd09447d163bce86ee2dd9569a861a Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Wed, 27 Mar 2024 16:23:58 +1100 Subject: [PATCH 2/2] Updated data pipeline pattern for generic projects. --- images/php/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/settings.php b/images/php/settings.php index 1b3b6640..a36ba07a 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -347,7 +347,7 @@ } // Override data_pipelines url. -$config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = getenv('SEARCH_URL') ? sprintf('https://%s', getenv('SEARCH_URL')) : "http://elasticsearch:9200"; +$config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) ? sprintf('https://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')) : "http://elasticsearch:9200"; // Configure tide_logs. if (getenv('TIDE_LOGS_UDPLOG_HOST')) {