diff --git a/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 b/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 index 16e2c27c..df843237 100644 --- a/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 +++ b/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 @@ -24,7 +24,7 @@ ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]} [LOG] NIC_NAME={{ firewall.capture_packet_plug_conf.LOG.NIC_NAME }} {% raw %} -BROKER_LIST={{ log_kafkabrokers.address | join(",") }} +BROKER_LIST={{ OLAP.kafka_broker.address_list | join(",") }} {% endraw %} FIELD_FILE=conf/capture_packet_log_field.conf diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 22045dfe..dbf8d8ff 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -44,7 +44,7 @@ MAX_SERVICE=1 LOG_LEVEL=30 LOG_PATH="./tsglog/tsglog" {% raw %} -BROKER_LIST="{{ log_kafkabrokers.address | join(",") }}" +BROKER_LIST="{{ OLAP.kafka_broker.address_list | join(",") }}" {% endraw %} COMMON_FIELD_FILE="tsgconf/tsg_log_field.conf" @@ -83,8 +83,8 @@ live_intervals_time = 30 [HOS_CONF] {% raw %} -hos_serverip="{{ firewall.hos_serverip }}" -hos_serverport={{ firewall.hos_serverport }} +hos_serverip="{{ OLAP.hos_server.ip }}" +hos_serverport={{ OLAP.hos_server.port }} {% endraw %} hos_accesskeyid="default" hos_secretkey="default" diff --git a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 index b044b0be..d46a350f 100644 --- a/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 +++ b/ansible/roles/telegraf_statistic/templates/telegraf_statistic.conf.j2.j2 @@ -23,7 +23,7 @@ [[outputs.kafka]] {% raw %} - brokers = [ "{{ log_kafkabrokers.address | join("\",\"") }}" ] + brokers = [ "{{ OLAP.kafka_broker.address_list | join("\",\"") }}" ] {% endraw %} topic = "TRAFFIC-METRICS-LOG" data_format = "json" diff --git a/ansible/roles/tfe/templates/tfe.conf.j2.j2 b/ansible/roles/tfe/templates/tfe.conf.j2.j2 index 28676683..51a9e5bc 100644 --- a/ansible/roles/tfe/templates/tfe.conf.j2.j2 +++ b/ansible/roles/tfe/templates/tfe.conf.j2.j2 @@ -91,7 +91,7 @@ key_log_file=log/sslkeylog.log mc_cache_enable=1 mc_cache_eth={{ tfe.tfe_conf.ssl.mc_cache_eth }} {% raw %} -mc_cache_broker_list={{ log_kafkabrokers.address | join(",") }} +mc_cache_broker_list={{ OLAP.kafka_broker.address_list | join(",") }} {% endraw %} mc_cache_topic=PXY-EXCH-INTERMEDIA-CERT @@ -165,7 +165,7 @@ stat_file=log/traffic_mirror.status enable=1 NIC_NAME={{ tfe.tfe_conf.kafka.NIC_NAME }} {% raw %} -kafka_brokerlist={{ log_kafkabrokers.address | join(",") }} +kafka_brokerlist={{ OLAP.kafka_broker.address_list | join(",") }} {% endraw %} kafka_topic=PROXY-EVENT-LOG device_id_filepath=/opt/tsg/etc/tsg_sn.json diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample index 245438e0..5d0e59fa 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample @@ -18,13 +18,15 @@ data_center: id: 1 -log_kafkabrokers: - address: ['1.1.1.1:9092','2.2.2.2:9092'] +OLAP: + kafka_broker: + address_list: ['1.1.1.1:9092','2.2.2.2:9092'] + hos_server: + ip: "127.0.0.1" + port: 9098 firewall: - hos_serverip: "192.168.40.223" - hos_serverport: 9098 APP_SKETCH_PUBLISH_TOPIC: "APP_SIGNATURE_ID" APP_SKETCH_BROKER_IP: "192.168.40.161" APP_SKETCH_BROKER_PORT: 1883