diff options
| author | jianlong <[email protected]> | 2021-09-01 14:10:01 +0800 |
|---|---|---|
| committer | jianlong <[email protected]> | 2021-09-01 14:10:01 +0800 |
| commit | 077502f73b1c4895c0dc1da689a4c4c8ba81d038 (patch) | |
| tree | 85430fcbb746f4cdb29d8c5f06959ce9e0a3ad73 | |
| parent | 8b15e21e1739bf765402c7673a75e716792a47b4 (diff) | |
配置文件更改
1. clickhouse冷热数据分离配置, 抽取到components.yml中
#===========================Clickhouse===============================#
#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略
clickhouse_ssd_path: /ssd_data/clickhouse/
| -rw-r--r-- | .idea/workspace.xml | 256 | ||||
| -rw-r--r-- | configurations/components.yml | 5 | ||||
| -rw-r--r-- | configurations/config.yml | 4 |
3 files changed, 61 insertions, 204 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2ddb202..b436fbf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,184 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="55c8c5b9-9b57-431e-a0ed-0064b85979fa" name="Default Changelist" comment="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. storm替换flink(但是storm并未完全移除,可通过改变配置部署) 3. 新增dos定时任务和dos数据流 4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务"> + <list default="true" id="55c8c5b9-9b57-431e-a0ed-0064b85979fa" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/install.sh" beforeDir="false" afterPath="$PROJECT_DIR$/install.sh" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/inventories/pro/group_vars/all" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/inventories/pro/hosts" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Arangodb.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Arangodb.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Clickhouse.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Clickhouse.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Druid.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/HBase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/HBase.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Hadoop.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Hadoop.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Kafka.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Kafka.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Mariadb.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Mariadb.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Nacos.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Nacos.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Spark.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Spark.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Storm.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Storm.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/Zookeeper.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/Zookeeper.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/check-components.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/check-components.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/check-services.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/check-services.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/environment.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/environment.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-chproxy.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-chproxy.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-gateway-keepalive.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-gateway-keepalive.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-gateway-nginx.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-gateway-nginx.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-gohangout.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-gohangout.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-hos-keepalive.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-hos-keepalive.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-hos-nginx.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-hos-nginx.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-hos-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-hos-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-job-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-job-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-qgw-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-qgw-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/galaxy-report-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/galaxy-report-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-clickhouse.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-clickhouse.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-druid.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-galaxy-gateway-keepalive.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-galaxy-gateway-keepalive.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-galaxy-hos-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-galaxy-hos-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-galaxy-job-service.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-galaxy-job-service.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-hbase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-hbase.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-kafka.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-kafka.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-spark.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-spark.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/init-storm.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/init-storm.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/menu/commonMenu" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/menu/commonMenu" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/menu/homePage" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/menu/homePage" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/check/check-components/tasks/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/check/check-components/tasks/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/check/check-services/tasks/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/check/check-services/tasks/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/arangodb/files/arangodb.tar.gz" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/arangodb/files/arangodb.tar.gz" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/arangodb/files/conf.bak.tar" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/arangodb/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/arangodb/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/tasks/install_clickhouse.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/config.xml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/start_exporter.sh.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/templates/start_exporter.sh.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/common/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/data/tasks/install_clickhouse.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/data/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/data/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/clickhouse/query/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/clickhouse/query/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/druid/tasks/install_druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/druid/tasks/install_druid.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/druid/templates/keepdruidall.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/druid/templates/keepdruidall.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/hadoop/tasks/install_hadoop.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/hadoop/tasks/install_hadoop.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/components/mariadb/install-mariadb-cluster/tasks/install-mariadb.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/clickhouse/templates/create_ck_table.sql" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/clickhouse/templates/create_ck_table.sql" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/clickhouse/templates/create_ck_table.sql_21.06" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/clickhouse/templates/dll.sql" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_segments-tsg-21.05.sql" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_segments-tsg3.0.sql" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_segments-tsg3.0.sql" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/initData.sh" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_client_internal_ip_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_proxy_event_hits_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_proxy_event_urls_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_security_event_hits_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_security_event_urls_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_server_external_ip_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_sys_storage_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_client_ip_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_external_host_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_internal_host_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_server_ip_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_urls_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_user_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_top_website_domain_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_traffic_app_stat_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_traffic_metrics_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_traffic_protocol_stat_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_traffic_summary_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_user_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/init_website_domain_hot_log.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/initDruidData/tasks.txt" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/rule/common_task.txt" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/rule/common_task.txt" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/tasks/traffic_summary_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/tasks/traffic_summary_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/topology_list.txt" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/files/druid_topology/topology_list.txt" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments.zip" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments.zip" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/client_internal_ip_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_39.273Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/proxy_event_hits_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_41.641Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/proxy_event_urls_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_43.849Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/security_event_hits_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_46.392Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/security_event_urls_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_48.458Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/server_external_ip_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_50.092Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/sys_storage_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_52.202Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_client_ip_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_53.675Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_external_host_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_55.845Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_internal_host_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_58.433Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_server_ip_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_13_59.654Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_urls_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_01.484Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_user_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_04.063Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/top_website_domain_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_06.100Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/traffic_app_stat_log/30000101T000000.000Z_30000102T000000.000Z/2021-07-02T02_43_09.615Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/traffic_metrics_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_08.462Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/traffic_protocol_stat_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_09.706Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/traffic_summary_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_12.193Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/user_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_14.350Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/files/segments/website_domain_hot_log/30000101T000000.000Z_30000102T000000.000Z/2021-04-02T03_14_16.425Z/0_index.zip" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/druid/templates/ingestionTask.sh.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/druid/templates/ingestionTask.sh.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/galaxy-job-service/templates/xxl_job.sql.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/galaxy-job-service/templates/xxl_job.sql.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/hbase/templates/create-hbase-table.sh.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/hbase/templates/create-hbase-table.sh.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/kafka/templates/create_topic.sh.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/kafka/templates/create_topic.sh.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/spark/templates/application.properties.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/spark/templates/application.properties.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/ACTIVE-DEFENCE-EVENT-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/ACTIVE-DEFENCE-EVENT-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/CONNECTION-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/CONNECTION-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/GTPC-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/GTPC-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-CHARTS_CONNECTION-RECORD-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-CHARTS_CONNECTION-RECORD-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-CHARTS_LIVE-SESSION-RECORD-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-CHARTS_LIVE-SESSION-RECORD-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-SESSION-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/LIVE-SESSION-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/PROXY-EVENT-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/PROXY-EVENT-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/RADIUS-ON-OFF.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/RADIUS-ON-OFF.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/RADIUS-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/RADIUS-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SECURITY-EVENT-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SECURITY-EVENT-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SUBSCRUBER-HBASE.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SUBSCRUBER-HBASE.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SYS-PACKET-CAPTURE-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/SYS-PACKET-CAPTURE-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/TRANSACTION-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/TRANSACTION-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/VOIP-RECORD-COMPLETED-LOG.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/VOIP-RECORD-COMPLETED-LOG.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/init/storm/templates/VOIP-RELATION.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/init/storm/templates/VOIP-RELATION.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-chproxy/templates/config.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-chproxy/templates/config.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gateway-keepalive/tasks/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gateway-keepalive/tasks/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gateway-keepalive/templates/kp_daemon.sh.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gateway-keepalive/templates/kp_daemon.sh.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/files/start_all.sh" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/files/start_all.sh" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/tasks/load_gohangout.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/tasks/load_gohangout.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_active_defence_event_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_active_defence_event_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_connection_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_connection_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_gtpc_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_gtpc_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_live_session_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_live_session_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_proxy_event_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_proxy_event_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_radius_onff_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_radius_onff_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_radius_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_radius_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_security_event_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_security_event_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_sys_packet_capture_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_sys_packet_capture_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_transaction_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_transaction_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_voip_record_log_tsgv3.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-gohangout/templates/k2ck_voip_record_log_tsgv3.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/application.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/application.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/galaxy-hos-service.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/galaxy-hos-service.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/log4j2-dev.xml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/log4j2-dev.xml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/tmp/application.properties.j2" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/templates/tmp/galaxy-hos-service.j2" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-hos-service/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/templates/galaxy-job-executor.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/templates/galaxy-job-executor.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/templates/xxl_job.sql.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/templates/xxl_job.sql.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-job-service/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/ck-filter.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/ck-filter.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/ck-queries-template.sql" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/ck-queries-template.sql" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_common_client_ip.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_common_client_ip.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_common_server_ip.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_common_server_ip.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_common_subscriber_id.json" beforeDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_http_domain.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/connection_record_log_http_domain.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/druid-filter.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/druid-filter.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/engine-filter.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/engine-filter.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/gtpc_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/gtpc_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/liveChart_history.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/liveChart_history.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/liveChart_live.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/liveChart_live.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/live_session_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/live_session_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/meta_data.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/meta_data.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/proxy_event_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/proxy_event_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/radius_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/radius_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/security_event_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/security_event_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/sys_packet_capture_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/sys_packet_capture_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/transaction_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/transaction_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/version.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/version.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/voip_record_log.json" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/files/config/voip_record_log.json" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/templates/galaxy-qgw-service.yml.j2" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/templates/galaxy-qgw-service.yml.j2" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/vars/main.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/roles/services/galaxy-qgw-service/vars/main.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/test.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/test.yml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/parcels/test1.yml" beforeDir="false" afterPath="$PROJECT_DIR$/parcels/test1.yml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/configurations/components.yml" beforeDir="false" afterPath="$PROJECT_DIR$/configurations/components.yml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/configurations/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/configurations/config.yml" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -188,11 +14,29 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="true"> + <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/install.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="689"> - <caret line="53" column="22" lean-forward="true" selection-start-line="53" selection-start-column="22" selection-end-line="53" selection-end-column="22" /> + <state relative-caret-position="301"> + <caret line="651" column="19" selection-start-line="651" selection-start-column="19" selection-end-line="651" selection-end-column="19" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/configurations/config.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="472"> + <caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" /> + </state> + </provider> + </entry> + </file> + <file pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/configurations/components.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="398"> + <caret line="151" column="37" lean-forward="true" selection-start-line="151" selection-start-column="37" selection-end-line="151" selection-end-column="37" /> </state> </provider> </entry> @@ -202,18 +46,17 @@ <component name="Git.Settings"> <option name="ROOT_SYNC" value="DONT_SYNC" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> - <option name="PUSH_TAGS"> - <GitPushTagMode /> - </option> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/README.md" /> + <option value="$PROJECT_DIR$/configurations/config.yml" /> + <option value="$PROJECT_DIR$/configurations/components.yml" /> </list> </option> </component> - <component name="ProjectFrameBounds" fullScreen="true"> + <component name="ProjectFrameBounds" extendedState="6" fullScreen="true"> <option name="width" value="2560" /> <option name="height" value="1440" /> </component> @@ -232,7 +75,7 @@ <path> <item name="Galaxy-auto-deploy-cluster" type="b2602c69:ProjectViewProjectNode" /> <item name="Galaxy-auto-deploy-cluster" type="462c0819:PsiDirectoryNode" /> - <item name="parcels" type="462c0819:PsiDirectoryNode" /> + <item name="configurations" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> @@ -276,7 +119,8 @@ <workItem from="1629774458891" duration="812000" /> <workItem from="1629854869947" duration="503000" /> <workItem from="1630466216768" duration="33000" /> - <workItem from="1630466362401" duration="562000" /> + <workItem from="1630466362401" duration="1497000" /> + <workItem from="1630476153920" duration="196000" /> </task> <task id="LOCAL-00001" summary="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. 抽取后的变量放回各自的roles中(因不想对客户暴露) 3. clickhous初始化脚本关于bifang-maridb的部分变量化 4. 修复一些小bug"> <created>1629774644583</created> @@ -285,16 +129,24 @@ <option name="project" value="LOCAL" /> <updated>1629774644583</updated> </task> - <option name="localTasksCounter" value="2" /> + <task id="LOCAL-00002" summary="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. storm替换flink(但是storm并未完全移除,可通过改变配置部署) 3. 新增dos定时任务和dos数据流 4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务"> + <created>1630467044101</created> + <option name="number" value="00002" /> + <option name="presentableId" value="LOCAL-00002" /> + <option name="project" value="LOCAL" /> + <updated>1630467044101</updated> + </task> + <option name="localTasksCounter" value="3" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="3617000" /> + <option name="totallyTimeSpent" value="4748000" /> </component> <component name="ToolWindowManager"> <frame x="0" y="0" width="2560" height="1440" extended-state="0" /> + <editor active="true" /> <layout> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26171565" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26370135" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Favorites" order="2" side_tool="true" /> <window_info anchor="bottom" id="Message" order="0" /> @@ -322,23 +174,29 @@ </component> <component name="VcsManagerConfiguration"> <MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. 抽取后的变量放回各自的roles中(因不想对客户暴露) 3. clickhous初始化脚本关于bifang-maridb的部分变量化 4. 修复一些小bug" /> - <option name="LAST_COMMIT_MESSAGE" value="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. 抽取后的变量放回各自的roles中(因不想对客户暴露) 3. clickhous初始化脚本关于bifang-maridb的部分变量化 4. 修复一些小bug" /> + <MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. storm替换flink(但是storm并未完全移除,可通过改变配置部署) 3. 新增dos定时任务和dos数据流 4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务" /> + <option name="LAST_COMMIT_MESSAGE" value="1. 新增自动检测安装ansible(本地yum源的方式实现) 2. storm替换flink(但是storm并未完全移除,可通过改变配置部署) 3. 新增dos定时任务和dos数据流 4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务" /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/README.md" /> <entry file="file://$PROJECT_DIR$/install.sh"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="689"> - <caret line="53" column="22" lean-forward="true" selection-start-line="53" selection-start-column="22" selection-end-line="53" selection-end-column="22" /> + <state relative-caret-position="301"> + <caret line="651" column="19" selection-start-line="651" selection-start-column="19" selection-end-line="651" selection-end-column="19" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/README.md"> - <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> - <state split_layout="SECOND"> - <first_editor relative-caret-position="1005"> - <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" /> - </first_editor> - <second_editor /> + <entry file="file://$PROJECT_DIR$/configurations/config.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="472"> + <caret line="64" lean-forward="true" selection-start-line="64" selection-end-line="64" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/configurations/components.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="398"> + <caret line="151" column="37" lean-forward="true" selection-start-line="151" selection-start-column="37" selection-end-line="151" selection-end-column="37" /> </state> </provider> </entry> diff --git a/configurations/components.yml b/configurations/components.yml index 24a0ada..c58503f 100644 --- a/configurations/components.yml +++ b/configurations/components.yml @@ -146,7 +146,6 @@ storm_worker_max_mem: 1024 #单个worker内存大小，单位：MB storm_worker_min_mem: 1024 - #===========================Flink================================# #网络缓存大小 taskmanager_memory_network_min: 512m @@ -172,3 +171,7 @@ galaxy_mariadb_port: 3306 #mariadb 用户 galaxy_mariadb_username: root +#===========================Clickhouse===============================# +#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘 +clickhouse_ssd_path: /ssd_data/clickhouse/ + diff --git a/configurations/config.yml b/configurations/config.yml index 1ee5618..b16f4fa 100644 --- a/configurations/config.yml +++ b/configurations/config.yml @@ -63,10 +63,6 @@ hos_keepalive_interface: eth0 #若 hos_keepalive_need 配置no则此处 可不进行修改 hos_keepalive_router_id: 62 -#============================clickhouse===============================# -#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘 -clickhouse_ssd_path: /ssd_data/clickhouse/ - #============================Kafka===============================# #任务消费kafka地址,若无特殊情况为本安装集群kafka地址，格式:kafkaip1:9092,kafkaip2:9092,kafkaip3:9092..... kafka_source_servers: 192.168.45.37:9092,192.168.45.38:9092,192.168.45.39:9092 |