Merge branch 'master' of github.com:Altinity/clickhouse-grafana into v4

Altinity · Jan 20, 2025 · 2eb7e50 · 2eb7e50
2 parents 8869965 + 441aaf2
commit 2eb7e50
Show file tree

Hide file tree

Showing 8 changed files with 3,428 additions and 15 deletions.
diff --git a/.github/workflows/testflows.yml b/.github/workflows/testflows.yml
@@ -53,16 +53,11 @@ jobs:
         if: always()
         run: tests/testflows/infra/create-report.sh
 
-      - name: Report typescript coverage
-        uses: coverallsapp/github-action@v2
-        with:
-          file: tests/testflows/coverage/lcov.info
 
-      - name: Report golang coverage
+      - name: Report coverage
         uses: coverallsapp/github-action@v2
         with:
-          file: go_coverage/coverage.txt
-          format: golang
+          files: tests/testflows/coverage/lcov.info go_coverage/coverage.txt
 
       - uses: actions/upload-artifact@v4
         if: always()

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -22,6 +22,7 @@ services:
       - /var/log/clickhouse-server
       - ./docker/clickhouse/init_schema.sql:/docker-entrypoint-initdb.d/init_schema.sql
       - ./docker/clickhouse/low_memory.xml:/etc/clickhouse-server/config.d/low_memory.xml
+      - ./docker/clickhouse/macros.xml:/etc/clickhouse-server/config.d/macros.xml
       - ./docker/clickhouse/allow_deprecated_error_prone_window_functions.xml:/etc/clickhouse-server/users.d/allow_deprecated_error_prone_window_functions.xml
       - ./docker/clickhouse/postgres_dictionary.xml:/etc/clickhouse-server/postgres_dictionary.xml
       - ./docker/clickhouse/listen_ports.xml:/etc/clickhouse-server/config.d/listen_ports.xml

diff --git a/docker/clickhouse/macros.xml b/docker/clickhouse/macros.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+  <macros><cluster>default</cluster></macros>
+</clickhouse>