Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 28de30c

Browse files
authored
Update configs and README.md with Yandex -> ClickHouse, Inc changes (#85)
* Update README with ClickHouse, Inc. changes With the move to a new company structure the links have changed and documentation will need to be updated. Change-Id: Ib682d9a7f204e4fdb6ed228443f119fb652011b4 * Update meta info and remove yandex mention Yandex is no longer involved with ClickHouse, instead it is managed as it's own company called ClickHouse, Inc. Change-Id: I7cad3269b90d7ef0d8d59577cb9874f619fb99ea * Update link in apt.yaml Change-Id: Ia0a54e69a29f607d0d29d313aa1d68191b5fbbcc * Update link in dnf.yaml Change-Id: I66b377b5803a7187023b5aa8d988a21a2b33be92 * Update link in yum.yml Change-Id: I606f7c88c332820c2e9e248494c5c7d42f2f4a62 * Update config.j2 with yandex rename Change-Id: Id0888d4afe2e574bfeba348099f9eefff36582bd * Update dicts.j2 with yandex rename Change-Id: Ic02c90da2d4cb237bf2f2c0c29e0c24423eec45d * Update macros.j2 with yandex rename Change-Id: I1ad641d2342985a6147acd492300a0c96837e9a1 * Update remote_servers.j2 with yandex rename Change-Id: If78a3d74c61781396635776056a7063145179ff7 * Update users.j2 with yandex rename Change-Id: Ia25a6a01cff932233d60af21c4d5e84b2b2e153a * Update zookeeper-servers.j2 with yandex rename Change-Id: Ia752e2c3c9d26b42c8a8e3fc3d2d6d1c5138aa91
1 parent 7d3e49a commit 28de30c

File tree

14 files changed

+31
-32
lines changed

14 files changed

+31
-32
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ F: Flag for remove clickhouse from host(disabled by default)
170170
clickhouse_remove: no
171171
```
172172
173-
F: You can manage [Kafka configuration](https://clickhouse.yandex/docs/en/operations/table_engines/kafka/#configuration)
173+
F: You can manage [Kafka configuration](https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/#configuration)
174174
```yaml
175175
# global configuration
176176
clickhouse_kafka_config:
@@ -214,7 +214,7 @@ clickhouse_ldap_user_directories:
214214
prefix: "clickhouse_
215215
```
216216
217-
F: You can manage Merge Tree config. For the list of available parameters, see [MergeTreeSettings.h](https://github.com/yandex/ClickHouse/blob/master/dbms/src/Storages/MergeTree/MergeTreeSettings.h).
217+
F: You can manage Merge Tree config. For the list of available parameters, see [MergeTree tables settings](https://clickhouse.com/docs/en/operations/settings/merge-tree-settings/).
218218
```yaml
219219
clickhouse_merge_tree_config:
220220
max_suspicious_broken_parts: 5
@@ -326,7 +326,7 @@ BSD
326326
Author Information
327327
------------------
328328
329-
[ClickHouse](https://clickhouse.yandex/docs/en/index.html) by [Yandex LLC](https://yandex.ru/company/).
329+
[ClickHouse](https://clickhouse.com/docs/en/index.html) by [ClickHouse, Inc.](https://clickhouse.com/company/).
330330
331331
Role by [AlexeySetevoi](https://github.com/AlexeySetevoi).
332332

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ galaxy_info:
22
role_name: clickhouse
33
namespace: alexeysetevoi
44
author: Alexey V. Bobrov
5-
description: Role for installation and managing Yandex.ClickHouse
5+
description: Role for installation and managing ClickHouse
66

77
license: MIT
88

tasks/install/apt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Install by APT | Apt-key add repo key
66
apt_key:

tasks/install/dnf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Install by YUM | Ensure clickhouse repo GPG key imported
66
rpm_key:

tasks/install/yum.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Install by YUM | Ensure clickhouse repo GPG key imported
66
rpm_key:

tasks/remove/apt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Uninstall by APT | Package uninstallation
66
apt:

tasks/remove/dnf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Uninstall by YUM | Ensure clickhouse package uninstalled
66
dnf:

tasks/remove/yum.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
#Main installation actions
3-
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation
3+
#https://clickhouse.com/docs/en/getting-started/#installation
44

55
- name: Uninstall by YUM | Ensure clickhouse package uninstalled
66
yum:

templates/config.j2

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#jinja2: trim_blocks: True, lstrip_blocks: True
22
<?xml version="1.0"?>
33
{{ ansible_managed | comment('xml') }}
4-
<yandex>
4+
<clickhouse>
55
<logger>
66
<!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
77
<level>{{ clickhouse_logger.level }}</level>
@@ -61,7 +61,7 @@
6161
This setting could be used to switch replication to another network interface.
6262
-->
6363
<!--
64-
<interserver_http_host>example.yandex.ru</interserver_http_host>
64+
<interserver_http_host>example.clickhouse.com</interserver_http_host>
6565
-->
6666
{% if clickhouse_interserver_http_host is defined %}
6767
<interserver_http_host>{{ clickhouse_interserver_http_host }}</interserver_http_host>
@@ -146,27 +146,26 @@
146146
<mlock_executable>{{ clickhouse_mlock_status }}</mlock_executable>
147147

148148
<!-- Configuration of clusters that could be used in Distributed tables.
149-
https://clickhouse.yandex/docs/en/table_engines/distributed/
149+
https://clickhouse.com/docs/en/engines/table-engines/special/distributed/
150150
-->
151151
<remote_servers incl="clickhouse_remote_servers" />
152152

153153

154154
<!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
155155
By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
156-
Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
156+
Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
157157
-->
158158

159159
<!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
160160
Optional. If you don't use replicated tables, you could omit that.
161161
162-
See https://clickhouse.yandex/docs/en/table_engines/replication/
162+
See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
163163
-->
164164
<zookeeper incl="zookeeper-servers" optional="true" />
165165

166166
<!-- Substitutions for parameters of replicated tables.
167167
Optional. If you don't use replicated tables, you could omit that.
168-
169-
See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
168+
See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
170169
-->
171170
<macros incl="macros" optional="true" />
172171

@@ -175,7 +174,7 @@
175174
<builtin_dictionaries_reload_interval>{{ clickhouse_config.builtin_dictionaries_reload_interval }}</builtin_dictionaries_reload_interval>
176175

177176
<!-- If true, dictionaries are created lazily on first use. Otherwise they are initialised on server startup. Default: true -->
178-
<!-- See also: https://clickhouse.tech/docs/en/operations/server-configuration-parameters/settings/#server_configuration_parameters-dictionaries_lazy_load -->
177+
<!-- See also: https://clickhouse.com/docs/en/operations/server-configuration-parameters/settings/#server_configuration_parameters-dictionaries_lazy_load -->
179178
<dictionaries_lazy_load>{{ clickhouse_config.dictionaries_lazy_load }}</dictionaries_lazy_load>
180179

181180
<!-- Maximum session timeout, in seconds. Default: 3600. -->
@@ -256,7 +255,7 @@
256255
<database>system</database>
257256
<table>query_log</table>
258257
<!--
259-
PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
258+
PARTITION BY expr https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
260259
Example:
261260
event_date
262261
toMonday(event_date)
@@ -291,7 +290,7 @@
291290

292291

293292
<!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
294-
See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
293+
See https://clickhouse.com/docs/en/dicts/internal_dicts/
295294
-->
296295

297296
<!-- Path to file with region hierarchy. -->
@@ -302,7 +301,7 @@
302301

303302

304303
<!-- Configuration of external dictionaries. See:
305-
https://clickhouse.yandex/docs/en/dicts/external_dicts/
304+
https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
306305
-->
307306
<dictionaries_config>*_dictionary.xml</dictionaries_config>
308307

@@ -512,4 +511,4 @@
512511
</s3>
513512
{% endif %}
514513

515-
</yandex>
514+
</clickhouse>

templates/dicts.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
{{ ansible_managed | comment('xml') }}
3-
<yandex>
3+
<clickhouse>
44
{% for dict in clickhouse_dicts %}
55
<dictionary>
66
<name>{{ clickhouse_dicts[dict].name }}</name>
@@ -42,4 +42,4 @@
4242
</structure>
4343
</dictionary>
4444
{% endfor %}
45-
</yandex>
45+
</clickhouse>

0 commit comments

Comments
 (0)