summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjianlong <[email protected]>2021-09-01 14:13:18 +0800
committerjianlong <[email protected]>2021-09-01 14:13:18 +0800
commitef85bb4824cc5967a3243e4c5b8606161c0c2638 (patch)
tree42cd930f8ef6c6906b83af790efb94342208e583
parent077502f73b1c4895c0dc1da689a4c4c8ba81d038 (diff)
配置文件更改
1. clickhouse冷热数据分离配置, 抽取到components.yml中 #===========================Clickhouse===============================# #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略 clickhouse_ssd_path: /ssd_data/clickhouse/
-rw-r--r--.idea/workspace.xml46
-rw-r--r--configurations/components.yml2
2 files changed, 23 insertions, 25 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b436fbf..4083680 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,6 @@
<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$/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" />
@@ -23,20 +22,11 @@
</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 relative-caret-position="787">
+ <caret line="175" column="42" lean-forward="true" selection-start-line="175" selection-start-column="42" selection-end-line="175" selection-end-column="42" />
</state>
</provider>
</entry>
@@ -120,7 +110,7 @@
<workItem from="1629854869947" duration="503000" />
<workItem from="1630466216768" duration="33000" />
<workItem from="1630466362401" duration="1497000" />
- <workItem from="1630476153920" duration="196000" />
+ <workItem from="1630476153920" duration="570000" />
</task>
<task id="LOCAL-00001" summary="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. 抽取后的变量放回各自的roles中(因不想对客户暴露)&#10;3. clickhous初始化脚本关于bifang-maridb的部分变量化&#10;4. 修复一些小bug">
<created>1629774644583</created>
@@ -136,11 +126,18 @@
<option name="project" value="LOCAL" />
<updated>1630467044101</updated>
</task>
- <option name="localTasksCounter" value="3" />
+ <task id="LOCAL-00003" summary="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10; #===========================Clickhouse===============================#&#10; #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10; clickhouse_ssd_path: /ssd_data/clickhouse/">
+ <created>1630476601335</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1630476601335</updated>
+ </task>
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="4748000" />
+ <option name="totallyTimeSpent" value="5122000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="2560" height="1440" extended-state="0" />
@@ -175,28 +172,29 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. 抽取后的变量放回各自的roles中(因不想对客户暴露)&#10;3. clickhous初始化脚本关于bifang-maridb的部分变量化&#10;4. 修复一些小bug" />
<MESSAGE value="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. storm替换flink(但是storm并未完全移除,可通过改变配置部署)&#10;3. 新增dos定时任务和dos数据流&#10;4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务" />
- <option name="LAST_COMMIT_MESSAGE" value="1. 新增自动检测安装ansible(本地yum源的方式实现)&#10;2. storm替换flink(但是storm并未完全移除,可通过改变配置部署)&#10;3. 新增dos定时任务和dos数据流&#10;4. ck新增表, 服务镜像配置更新, druid新增任务/更新任务" />
+ <MESSAGE value="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10; #===========================Clickhouse===============================#&#10; #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10; clickhouse_ssd_path: /ssd_data/clickhouse/" />
+ <option name="LAST_COMMIT_MESSAGE" value="配置文件更改&#10;1. clickhouse冷热数据分离配置, 抽取到components.yml中&#10; #===========================Clickhouse===============================#&#10; #ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径下面的'/'不可省略&#10; clickhouse_ssd_path: /ssd_data/clickhouse/" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/README.md" />
- <entry file="file://$PROJECT_DIR$/install.sh">
+ <entry file="file://$PROJECT_DIR$/configurations/config.yml">
<provider selected="true" editor-type-id="text-editor">
- <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 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/config.yml">
+ <entry file="file://$PROJECT_DIR$/install.sh">
<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 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$/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 relative-caret-position="787">
+ <caret line="175" column="42" lean-forward="true" selection-start-line="175" selection-start-column="42" selection-end-line="175" selection-end-column="42" />
</state>
</provider>
</entry>
diff --git a/configurations/components.yml b/configurations/components.yml
index c58503f..7540c54 100644
--- a/configurations/components.yml
+++ b/configurations/components.yml
@@ -172,6 +172,6 @@ galaxy_mariadb_port: 3306
galaxy_mariadb_username: root
#===========================Clickhouse===============================#
-#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘
+#ssd磁盘挂载的目录, 如果没有ssd磁盘可选择一块普通磁盘, 路径后面的'/'不可省略
clickhouse_ssd_path: /ssd_data/clickhouse/