From a4a8d9ed19c6db853dff95794fd5b43383f612a0 Mon Sep 17 00:00:00 2001 From: nilsver Date: Mon, 13 Jan 2025 12:23:36 +0000 Subject: [PATCH] add external memcached --- resources/recipes/configure.rb | 17 +++++++++-------- resources/recipes/prepare_system.rb | 12 +++++++++--- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index a2aef44..039c3ad 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -22,6 +22,12 @@ # action :nothing # end +begin + external_services = data_bag_item('rBglobal', 'external_services') +rescue + external_services = {} +end + rb_common_config 'Configure common' do action :configure end @@ -243,7 +249,7 @@ end memcached_config 'Configure Memcached' do - if manager_services['memcached'] + if manager_services['memcached'] && external_services['memcached'] == 'onpremise' memory node['redborder']['memory_services']['memcached']['memory'] ipaddress node['ipaddress_sync'] action [:add, :register] @@ -346,6 +352,7 @@ port node['redborder']['webui']['port'] webui_version node['redborder']['webui']['version'] redborder_version node['redborder']['repo']['version'] + elasticache_hosts node['redborder']['memcached']['hosts'] action [:add, :register, :configure_rsa] else action [:remove, :deregister] @@ -453,6 +460,7 @@ device_nodes node.run_state['sensors_info_all']['device-sensor'] intrusion_incidents_priority_filter node['redborder']['intrusion_incidents_priority_filter'] vault_incidents_priority_filter node['redborder']['vault_incidents_priority_filter'] + memcached_server node['redborder']['memcached']['hosts'] logstash_pipelines node.run_state['pipelines'] split_traffic_logstash split_traffic split_intrusion_logstash split_intrusion @@ -613,13 +621,6 @@ end end -# Determine external -begin - external_services = data_bag_item('rBglobal', 'external_services') -rescue - external_services = {} -end - postgresql_config 'Configure postgresql' do if manager_services['postgresql'] && external_services['postgresql'] == 'onpremise' cdomain node['redborder']['cdomain'] diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb index 05dd2f2..e088fbd 100644 --- a/resources/recipes/prepare_system.rb +++ b/resources/recipes/prepare_system.rb @@ -89,10 +89,16 @@ elasticache = {} end -if !elasticache.empty? - node.default['redborder']['memcached']['server_list'] = getElasticacheNodes(elasticache['cfg_address'], elasticache['cfg_port']) +# Previous code treated memcached hosts as an array of strings, but now it is a single string. +# if !elasticache.empty? +# node.default['redborder']['memcached']['server_list'] = getElasticacheNodes(elasticache['cfg_address'], elasticache['cfg_port']) +# node.default['redborder']['memcached']['port'] = elasticache['cfg_port'] +# node.default['redborder']['memcached']['hosts'] = joinHostArray2port(node['redborder']['memcached']['server_list'], node['redborder']['memcached']['port']).join(',') +# node.default['redborder']['memcached']['elasticache'] = true +if !elasticache.empty? && !elasticache['cfg_address'].nil? && !elasticache['cfg_port'].nil? + node.default['redborder']['memcached']['server_list'] = elasticache['cfg_address'] node.default['redborder']['memcached']['port'] = elasticache['cfg_port'] - node.default['redborder']['memcached']['hosts'] = joinHostArray2port(node['redborder']['memcached']['server_list'], node['redborder']['memcached']['port']).join(',') + node.default['redborder']['memcached']['hosts'] = "#{elasticache['cfg_address']}:#{elasticache['cfg_port']}" node.default['redborder']['memcached']['elasticache'] = true else memcached_hosts = []