From 1a14633a643f64ed150f26f0bda2b83b6ec82e59 Mon Sep 17 00:00:00 2001 From: Md Nadim Hossain Date: Tue, 26 Sep 2023 15:26:59 +1000 Subject: [PATCH 1/2] [R20-1508] Added datapipeline env vars. --- images/php/settings.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/images/php/settings.php b/images/php/settings.php index 9f4be90f..f05e0c5d 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -85,9 +85,6 @@ // The default number of entities to update in a batch process. $settings['entity_update_batch_size'] = 50; -// The token for the bay_monitoring Healthz endpoint. -$settings['baywatch.healthz_key'] = getenv('BAY_HEALTHZ_TOKEN'); - // Environment indicator settings. $config['environment_indicator.indicator']['name'] = isset($settings['environment']) ? $settings['environment'] : 'local'; $config['environment_indicator.indicator']['bg_color'] = !empty($config['environment_indicator.indicator']['bg_color']) ? $config['environment_indicator.indicator']['bg_color'] : 'green'; @@ -346,6 +343,11 @@ $config['elasticsearch_connector.cluster.elasticsearch_bay']['options']['use_authentication'] = 0; } +// Override data_pipelines url. +if (isset($config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'])) { + $config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) ? sprintf('http://%s.%s', getenv('SEARCH_HASH'), 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 4ebc87b943d1b4dbdfe2c1f404ab02dd9714b82f Mon Sep 17 00:00:00 2001 From: Md Nadim Hossain Date: Tue, 26 Sep 2023 15:34:50 +1000 Subject: [PATCH 2/2] Add missing code. --- images/php/settings.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/php/settings.php b/images/php/settings.php index f05e0c5d..85d651ef 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -85,6 +85,9 @@ // The default number of entities to update in a batch process. $settings['entity_update_batch_size'] = 50; +// The token for the bay_monitoring Healthz endpoint. +$settings['baywatch.healthz_key'] = getenv('BAY_HEALTHZ_TOKEN'); + // Environment indicator settings. $config['environment_indicator.indicator']['name'] = isset($settings['environment']) ? $settings['environment'] : 'local'; $config['environment_indicator.indicator']['bg_color'] = !empty($config['environment_indicator.indicator']['bg_color']) ? $config['environment_indicator.indicator']['bg_color'] : 'green';