Merge branch 'master' into pyroscope-2

# Conflicts:
#	lib/db/clickhouse.js
#	lib/db/maintain/index.js
#	qryn_bun.mjs

.github/workflows/build_release.yml

@@ -18,11 +18,7 @@ jobs:
         with:
           ref: ${{ github.ref }}
       - name: Update Package to Release version
-        uses: pocket-apps/action-update-version@v1
-        with:
-          files: 'package.json'
-          version-regexp: '\d+.\d+.\d+'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+        uses: technote-space/[email protected]
       - name: Check NPM secret presence
         id: checksecrets
         shell: bash
@@ -34,7 +30,7 @@ jobs:
           fi
         env:
           SECRET: ${{ secrets.NPM_TOKEN }}
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         if: ${{ steps.checksecrets.outputs.secretspresent }}
         with:
           node-version: 18
@@ -135,16 +131,16 @@ jobs:
            platforms: amd64, arm64
       - name: Set up Docker Buildx
         if: ${{ steps.checkdocker.outputs.secretspresent }}
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3.0.0
       - name: Login to DockerHub
         if: ${{ steps.checkdocker.outputs.secretspresent }}
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}  
       - name: Build and push to Docker Hub (bun)
         if: ${{ steps.checkdocker.outputs.secretspresent }}
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           platforms: linux/amd64, linux/arm64
           file: ./Dockerfile_bun
@@ -159,7 +155,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push to GHCR (bun)
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           platforms: linux/amd64, linux/arm64
           file: ./Dockerfile_bun

.github/workflows/node-clickhouse-cluster.js.yml

@@ -0,0 +1,56 @@
+# This workflow will validate qryn using nodejs + clickhouse
+
+name: QRYN CI
+
+on:
+  push:
+    branches: [ master, beta ]
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+      - '**.yaml'
+  pull_request:
+    branches: [ master, beta ]
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+      - '**.yaml'
+  workflow_dispatch:
+    inputs:
+      clickhouse_tag:
+        description: 'Tag for ClickHouse (23.8-alpine)'
+        required: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18, 16.x, 20]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/[email protected]
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm install
+    - run: npm run postinstall
+    - run: git submodule init
+    - run: git submodule update
+    - run: docker-compose -f docker/e2e/docker-compose-cluster.yaml up -d
+    - run: sleep 5
+    - name: Workflow Telemetry
+      uses: runforesight/[email protected]      
+    - env:
+        CLUSTER_NAME: test_cluster_two_shards
+        CLICKHOUSE_DB: qryn
+        CLICKHOUSE_TSDB: qryn
+      run: node qryn.mjs >/dev/stdout &
+    - env:
+        CLICKHOUSE_DB: qryn
+        CLICKHOUSE_TSDB: qryn
+        INTEGRATION_E2E: 1
+        CLOKI_EXT_URL: 127.0.0.1:3100
+      run: npm run test --forceExit

Dockerfile

@@ -3,7 +3,11 @@ FROM node:20-slim
 
 COPY . /app
 WORKDIR /app
-RUN npm install
+
+RUN groupadd -r qryn && useradd -r -g qryn -m qryn && chown -R qryn:qryn /app
+USER qryn
+
+RUN npm install --omit=dev
 
 # Expose Ports
 EXPOSE 3100

Dockerfile_bun

@@ -3,6 +3,10 @@ FROM oven/bun:latest
 
 COPY . /app
 WORKDIR /app
+
+RUN groupadd -r qryn && useradd -r -g qryn -m qryn && chown -R qryn:qryn /app
+USER qryn
+
 RUN rm -rf package-lock.json
 RUN bun install
 

README.md

@@ -127,7 +127,7 @@ The Tempo datasource can be used to natively query _traces_ including _**TraceQL
 
 ### 📚 Other Vendors
 
-**qryn** can ingest data using the [InfluxDB, DataDog, Elastic](https://qryn.metrico.in/#/support) and other vendors.
+**qryn** can ingest data using formats from [InfluxDB, DataDog, Elastic](https://qryn.metrico.in/#/support) and other vendors.
 
 
 <br>
@@ -174,7 +174,7 @@ Whether it's code, documentation or grammar, we ❤️ all contributions. Not su
 
 #### License
 
-<img src="https://camo.githubusercontent.com/473b62766b498e4f2b008ada39f1d56fb3183649f24447866e25d958ac3fd79a/68747470733a2f2f7777772e676e752e6f72672f67726170686963732f6167706c76332d3135357835312e706e67">
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/0/06/AGPLv3_Logo.svg/2560px-AGPLv3_Logo.svg.png" width=200>
 
 ©️ QXIP BV, released under the GNU Affero General Public License v3.0. See [LICENSE](LICENSE) for details.