From bd5c2cb1d8979356153850eabbe8f6e179da7699 Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Mon, 15 Apr 2019 12:26:23 +0300 Subject: [PATCH 1/6] Add link to Limassol meetup --- website/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/index.html b/website/index.html index f89d622566e..bfbfe2b1829 100644 --- a/website/index.html +++ b/website/index.html @@ -92,6 +92,11 @@
+
+
+ Upcoming ClickHouse Community Meetup: Limassol on May 7 +
+

ClickHouse. Just makes you think faster.

From 76e44259465ce02e7aa63d59115475d4c4e3aca1 Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Mon, 15 Apr 2019 12:26:39 +0300 Subject: [PATCH 2/6] Add link to MaxMind integration guide --- docs/en/interfaces/third-party/integrations.md | 3 +++ docs/fa/interfaces/third-party/integrations.md | 3 +++ docs/ru/interfaces/third-party/integrations.md | 3 +++ docs/zh/interfaces/third-party/integrations.md | 4 +++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md index 97468341529..6533145c866 100644 --- a/docs/en/interfaces/third-party/integrations.md +++ b/docs/en/interfaces/third-party/integrations.md @@ -51,6 +51,9 @@ - [loghouse](https://github.com/flant/loghouse) (for [Kubernetes](https://kubernetes.io)) - [logagent](https://www.sematext.com/logagent) - [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/) +- Geo + - [MaxMind](https://dev.maxmind.com/geoip/) + - [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip) ## Programming Language Ecosystems diff --git a/docs/fa/interfaces/third-party/integrations.md b/docs/fa/interfaces/third-party/integrations.md index c9aebd9b235..b1d806f776e 100644 --- a/docs/fa/interfaces/third-party/integrations.md +++ b/docs/fa/interfaces/third-party/integrations.md @@ -52,6 +52,9 @@ - [loghouse](https://github.com/flant/loghouse) (برای [Kubernetes](https://kubernetes.io)) - [logagent](https://www.sematext.com/logagent) - [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/) +- جغرافیایی + - [MaxMind](https://dev.maxmind.com/geoip/) + - [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip) ## اکوسیستم زبان برنامه نویسی diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md index 2f619d353a7..43d736c8e7c 100644 --- a/docs/ru/interfaces/third-party/integrations.md +++ b/docs/ru/interfaces/third-party/integrations.md @@ -50,6 +50,9 @@ - [loghouse](https://github.com/flant/loghouse) (для [Kubernetes](https://kubernetes.io)) - [logagent](https://www.sematext.com/logagent) - [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/) +- Гео + - [MaxMind](https://dev.maxmind.com/geoip/) + - [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip) ## Экосистемы вокруг языков программирования diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md index 971c393d193..fab2bdd07b0 100644 --- a/docs/zh/interfaces/third-party/integrations.md +++ b/docs/zh/interfaces/third-party/integrations.md @@ -49,6 +49,9 @@ - [loghouse](https://github.com/flant/loghouse) (对于 [Kubernetes](https://kubernetes.io)) - [logagent](https://www.sematext.com/logagent) - [logagent output-plugin-clickhouse](https://sematext.com/docs/logagent/output-plugin-clickhouse/) +- 地理 + - [MaxMind](https://dev.maxmind.com/geoip/) + - [clickhouse-maxmind-geoip](https://github.com/AlexeyKupershtokh/clickhouse-maxmind-geoip) ## 编程语言生态系统 @@ -75,5 +78,4 @@ - [Ecto](https://github.com/elixir-ecto/ecto) - [clickhouse_ecto](https://github.com/appodeal/clickhouse_ecto) - [来源文章](https://clickhouse.yandex/docs/zh/interfaces/third-party/integrations/) From 915401eb089042911355daa3fc2b9bd647b05c21 Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Wed, 17 Apr 2019 11:42:31 +0300 Subject: [PATCH 3/6] Merge two requirements.txt after #5021 --- docs/tools/README.md | 3 +-- docs/tools/requirements-py3.txt | 35 --------------------------------- docs/tools/requirements.txt | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 docs/tools/requirements-py3.txt diff --git a/docs/tools/README.md b/docs/tools/README.md index 627ae20e07f..6332a22f164 100644 --- a/docs/tools/README.md +++ b/docs/tools/README.md @@ -23,8 +23,7 @@ $ cd ClickHouse/docs/tools $ mkdir venv $ virtualenv venv $ source venv/bin/activate -$ pip install -r requirements.txt # for python2 -$ pip install -r requirements-py3.txt # for python3 +$ pip install -r requirements.txt ``` Then running `build.py` without args (there are some, check `build.py --help`) will generate `ClickHouse/docs/build` folder with complete static html website. diff --git a/docs/tools/requirements-py3.txt b/docs/tools/requirements-py3.txt deleted file mode 100644 index 6ac9a4a034c..00000000000 --- a/docs/tools/requirements-py3.txt +++ /dev/null @@ -1,35 +0,0 @@ -alabaster==0.7.10 -Babel==2.5.1 -backports-abc==0.5 -beautifulsoup4==4.6.3 -certifi==2017.11.5 -chardet==3.0.4 -click==6.7 -CommonMark==0.5.4 -cssmin==0.2.0 -docutils==0.14 -futures==3.1.1 -htmlmin==0.1.12 -idna==2.6 -imagesize==0.7.1 -Jinja2==2.10 -jsmin==2.2.2 -livereload==2.5.1 -Markdown==2.6.11 -MarkupSafe==1.0 -mkdocs==1.0.4 -Pygments==2.2.0 -python-slugify==1.2.6 -pytz==2017.3 -PyYAML==3.12 -recommonmark==0.4.0 -requests==2.21.0 -singledispatch==3.4.0.3 -six==1.11.0 -snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 -tornado==5.1 -typing==3.6.2 -Unidecode==1.0.23 -urllib3==1.23 diff --git a/docs/tools/requirements.txt b/docs/tools/requirements.txt index f0df3b8ff36..6ac9a4a034c 100644 --- a/docs/tools/requirements.txt +++ b/docs/tools/requirements.txt @@ -8,7 +8,7 @@ click==6.7 CommonMark==0.5.4 cssmin==0.2.0 docutils==0.14 -futures==3.2.0 +futures==3.1.1 htmlmin==0.1.12 idna==2.6 imagesize==0.7.1 From f46a18a492db270ef75cc0e0078a7b75baa9607f Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Wed, 17 Apr 2019 12:02:04 +0300 Subject: [PATCH 4/6] Add Beijing Meetup link to front page --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index bfbfe2b1829..cbb8e60efe8 100644 --- a/website/index.html +++ b/website/index.html @@ -94,7 +94,7 @@
- Upcoming ClickHouse Community Meetup: Limassol on May 7 + Upcoming ClickHouse Community Meetups: Limassol on May 7 and Beijing on June 8
From 17b2def426140063356d968cb8aef869693cced1 Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Mon, 29 Apr 2019 19:48:23 +0300 Subject: [PATCH 5/6] [docs] a bit less confusing --- docs/tools/mkdocs-material-theme/partials/language/en.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tools/mkdocs-material-theme/partials/language/en.html b/docs/tools/mkdocs-material-theme/partials/language/en.html index bcd2debaac5..47e40c800bd 100644 --- a/docs/tools/mkdocs-material-theme/partials/language/en.html +++ b/docs/tools/mkdocs-material-theme/partials/language/en.html @@ -7,7 +7,7 @@ "footer.next": "Next", "meta.comments": "Comments", "meta.source": "Source", - "nav.latest": "latest", + "nav.latest": "master", "nav.multi_page": "Multi page version", "nav.pdf": "PDF version", "nav.release": "Release", From b1831a9ab52b9e386acf295643b307e584eeb31d Mon Sep 17 00:00:00 2001 From: Ivan Blinkov Date: Mon, 29 Apr 2019 19:50:02 +0300 Subject: [PATCH 6/6] Add link to horgh-replicator --- docs/en/interfaces/third-party/integrations.md | 1 + docs/fa/interfaces/third-party/integrations.md | 1 + docs/ru/interfaces/third-party/integrations.md | 1 + docs/zh/interfaces/third-party/integrations.md | 1 + 4 files changed, 4 insertions(+) diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md index 6533145c866..7c302884631 100644 --- a/docs/en/interfaces/third-party/integrations.md +++ b/docs/en/interfaces/third-party/integrations.md @@ -9,6 +9,7 @@ - [MySQL](https://www.mysql.com) - [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support) - [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader) + - [horgh-replicator](https://github.com/larsnovikov/horgh-replicator) - [PostgreSQL](https://www.postgresql.org) - [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw) - [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (uses [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) diff --git a/docs/fa/interfaces/third-party/integrations.md b/docs/fa/interfaces/third-party/integrations.md index b1d806f776e..e7def6bca58 100644 --- a/docs/fa/interfaces/third-party/integrations.md +++ b/docs/fa/interfaces/third-party/integrations.md @@ -11,6 +11,7 @@ - [MySQL](https://www.mysql.com) - [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support) - [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader) + - [horgh-replicator](https://github.com/larsnovikov/horgh-replicator) - [PostgreSQL](https://www.postgresql.org) - [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw) - [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (استفاده می کند [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md index 43d736c8e7c..a00239b1579 100644 --- a/docs/ru/interfaces/third-party/integrations.md +++ b/docs/ru/interfaces/third-party/integrations.md @@ -8,6 +8,7 @@ - [MySQL](https://www.mysql.com) - [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support) - [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader) + - [horgh-replicator](https://github.com/larsnovikov/horgh-replicator) - [PostgreSQL](https://www.postgresql.org) - [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw) - [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (использует [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm)) diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md index fab2bdd07b0..3e9fcfcd410 100644 --- a/docs/zh/interfaces/third-party/integrations.md +++ b/docs/zh/interfaces/third-party/integrations.md @@ -8,6 +8,7 @@ - [MySQL](https://www.mysql.com) - [ProxySQL](https://github.com/sysown/proxysql/wiki/ClickHouse-Support) - [clickhouse-mysql-data-reader](https://github.com/Altinity/clickhouse-mysql-data-reader) + - [horgh-replicator](https://github.com/larsnovikov/horgh-replicator) - [PostgreSQL](https://www.postgresql.org) - [clickhousedb_fdw](https://github.com/Percona-Lab/clickhousedb_fdw) - [infi.clickhouse_fdw](https://github.com/Infinidat/infi.clickhouse_fdw) (使用 [infi.clickhouse_orm](https://github.com/Infinidat/infi.clickhouse_orm))