Merge pull request #243 from EdurtIO/develop

Develop

Author: qianmoQ

README.md

@@ -12,6 +12,12 @@
 [中文](http://dbm-zh.edurt.io/) <br />
 [English](https://dbm.edurt.io/)
 
+## Security
+
+---
+
+[![OSCS Status](https://www.oscs1024.com/platform/badge/qianmoQ/dbm.git.svg?size=small)](https://www.murphysec.com/dr/jv6PXUWIeGXUsjTRup)
+
 ## Contributors
 
 ---
@@ -90,6 +96,7 @@ Here are some of the major database solutions that are supported:
   <img src="./src/shared/assets/integrate/presto.png" alt="Presto" class="a" width="152" height="46"/>
   <img src="./src/shared/assets/integrate/mysql.png" alt="MySQL" class="a" width="auto" height="50"/>
   <img src="./src/shared/assets/integrate/postgresql.png" alt="PostgreSQL" class="a" width="auto" height="50"/>
+  <img src="./src/shared/assets/integrate/druid.png" alt="Druid" class="a" width="auto" height="34"/>
 </p>
 
 ## Features

docs/docs/assets/images/others/management/datasource/druid/img.png

@@ -90,4 +90,13 @@ The current Trino release is version <img src="https://img.shields.io/github/v/r
     * **Issues**: [GitHub issues](https://github.com/trinodb/trino/issues)
     * **Source Code**: [Code](https://github.com/trinodb/trino)
     * **YouTube channel** [YouTube channel](https://www.youtube.com/c/trinodb)
+
+- __Druid__
+
+    ---
+
+    * **Documentation**: [trino.io](https://druid.apache.org/docs/latest/design/)
+    * **Issues**: [GitHub issues](https://github.com/apache/druid/issues)
+    * **Source Code**: [Code](https://github.com/apache/druid)
+    * **Meetups** [Meetups](https://www.meetup.com/topics/apache-druid/)
 </div>

docs/docs/assets/images/others/management/datasource/druid/img_1.png

@@ -0,0 +1,57 @@
+---
+template: overrides/main.html
+---
+
+!!! note "Apache Druid"
+
+    It is mainly used to describe how the software builds the Apache Druid data source for subsequent operations.
+
+!!! warning "System requirements"
+
+    \>= `1.21.0`
+
+### Supported Versions
+
+---
+
+| Version  | Tested?                                     |
+|----------|---------------------------------------------|
+| `0.23.x` | :material-checkbox-marked-circle:{.success} |
+
+!!! note "Supported versions"
+
+    Most versions have been tested, please submit issues for non-adapted versions.
+
+### Created a Source
+
+---
+
+After entering the data source management page, click the Add data source button.
+
+![img.png](../../../assets/images/others/management/datasource/druid/img.png)
+
+Select the Apache Druid icon in the `Basic` type (The last one).
+
+After selecting the type, click the `Next` button at the bottom to configure the relevant information.
+
+![img_1.png](../../../assets/images/others/management/datasource/druid/img_1.png)
+
+!!! note "Supported protocols"
+
+    - [x] `HTTP`
+
+#### HTTP Protocol
+
+---
+
+!!! note "HTTP Protocol"
+
+    Use the HTTP interface provided by Apache Druid to connect to the service.
+
+| Parameter | Description                                                                                         | Required | Unique | Default |
+|-----------|-----------------------------------------------------------------------------------------------------|----------|--------|---------|
+| `Alias`   | The alias of the data source, which will be displayed later in the selected data source on the page | Yes      | Yes    |         |
+| `Host`    | The host of the Apache Druid server                                                                 | Yes      | Yes    |         |
+| `Port`    | The port of the Apache Druid server                                                                 | Yes      | Yes    | `8123`  |
+
+When we have configured the above parameters, click the `Test` button at the bottom. If the service can be accessed normally, the `OK` button can be used. Click it and it will be saved.

docs/docs/assets/integrate/Druid.svg

@@ -0,0 +1,66 @@
+---
+template: overrides/main.html
+icon: material/gesture-tap-button
+---
+
+DBM Version for `1.21.0` is released!
+
+Release Time: `2022-07-25`
+
+#### General
+
+---
+
+- Add a new code editor layout
+- Fix the style of the tree menu on the left side of metadata management is confused
+- The new query dynamically loads the service according to the plug-in
+
+#### Security
+
+---
+
+- Upgrade moment to `2.29.4`
+- Upgrade dexie to `3.2.2`
+- Fix some dependent version security
+
+#### Dependencies
+
+---
+
+- Bump rxjs from 6.6.7 to 7.5.6
+
+#### ClickHouse
+
+---
+
+- Support `MaterializedPostgreSQL` database engine
+
+#### Trino & Presto
+
+---
+
+- Support the currently stopped running process [issues-158](https://github.com/EdurtIO/dbm/issues/158)
+
+#### MySQL
+
+---
+
+- Support the currently stopped running process [issues-180](https://github.com/EdurtIO/dbm/issues/180)
+
+#### PostgreSQL
+
+---
+
+- Support metadata management to create database, filter database
+- Support metadata management to create table
+- Support metadata management to delete database
+
+#### Apache Druid
+
+---
+
+- Support Druid (query and data source management)
+
+---
+
+- @qianmoQ

docs/docs/download.md

@@ -125,6 +125,17 @@ <h1 class="font-center">Supported Databases</h1>
                 PostgreSQL is a powerful, open source object-relational database system that uses and extends the SQL language combined with many features that safely store and scale the most complicated data workloads.
               </div>
             </li>
+            <li>
+              <div class="font-center">
+                <span class="twemoji">
+                  <img src="/assets/integrate/Druid.svg" width="30" height="100" />
+                </span>
+                <strong class="font-center">Apache Druid</strong>
+              </div>
+              <div class="top-margin">
+                Druid is a high performance real-time analytics database. Druid's main value add is to reduce time to insight and action.
+              </div>
+            </li>
           </ul>
         </div>
       </div>

docs/docs/reference/management/datasource/druid.md

@@ -25,7 +25,7 @@ theme:
     - content.code.annotate
     - content.tabs.link
     #    - header.autohide
-    #    - navigation.expand
+    - navigation.expand
     - navigation.indexes
     #    - navigation.instant
     - navigation.sections
@@ -132,6 +132,7 @@ plugins:
           Datasource_Presto_Trino: Presto & Trino (Experimental)
           Datasource_ClickHouse: ClickHouse
           Datasource_PostgreSQL: PostgreSQL (Experimental)
+          Datasource_Druid: Druid (Experimental)
         zh:
           Home: 主页
           Documentation: 文档
@@ -154,6 +155,7 @@ plugins:
           Datasource_Presto_Trino: Presto & Trino (Experimental)
           Datasource_ClickHouse: ClickHouse
           Datasource_PostgreSQL: PostgreSQL (Experimental)
+          Datasource_Druid: Druid (Experimental)
   - redirects:
       redirect_maps:
         release-latest.md: release/1.20.0-20220706.md
@@ -172,13 +174,15 @@ nav:
             - Datasource_Presto_Trino: reference/management/datasource/presto_trino.md
             - Datasource_MySQL: reference/management/datasource/mysql.md
             - Datasource_PostgreSQL: reference/management/datasource/postgresql.md
+            - Datasource_Druid: reference/management/datasource/druid.md
       - Monitor:
           - Processor: reference/monitor/monitor-processor.md
           - Connection: reference/monitor/monitor_connection.md
           - Mutations: reference/monitor/monitor_mutations.md
           - Query: reference/monitor/monitor_query.md
   - Release Note:
-      - 1.20.0 (latest): release/1.20.0-20220706.md
+      - 1.21.0 (latest): release/1.21.0-20220725.md
+      - 1.20.0: release/1.20.0-20220706.md
       - 1.19.0: release/1.19.0-20220623.md
       - 1.18.0: release/1.18.0-20220610.md
       - 1.17.0: release/1.17.0-20220529.md

docs/docs/release/1.21.0-20220725.md

@@ -19,7 +19,7 @@
 # IN THE SOFTWARE.
 
 # Direct dependencies
-mkdocs>=1.2.2
+mkdocs>=1.3.0
 Pygments>=2.4
 markdown>=3.2
 pymdown-extensions>=7.0