diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index 6dba980..129a0f7 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -31,5 +31,4 @@ jobs: with: push: true tags: | - ghcr.io/sekoia-io/sekoiaio-docker-concentrator:latest - ghcr.io/sekoia-io/sekoiaio-docker-concentrator:2.1 + ghcr.io/sekoia-io/sekoiaio-docker-concentrator:2.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7223d79..b904a6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes with sekoiaio concentrator will be documented in this file. +## [2.2] + +- Remove queue for performance + ## [2.1] - Add local timestamp in rsyslog header instead of received timestamp diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 708f947..803cbc5 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,16 +1,12 @@ version: "3.9" services: rsyslog: - image: ghcr.io/sekoia-io/sekoiaio-docker-concentrator:2.1 - environment: - - MEMORY_MESSAGES=2000000 - - DISK_SPACE=180g + image: ghcr.io/sekoia-io/sekoiaio-docker-concentrator:2.2 ports: - "20516-20566:20516-20566" - "20516-20566:20516-20566/udp" volumes: - ./intakes.yaml:/intakes.yaml - ./conf:/etc/rsyslog.d - - ./disk_queue:/var/spool/rsyslog restart: always pull_policy: always \ No newline at end of file diff --git a/rsyslog.conf b/rsyslog.conf index 2a9c74f..cad555c 100644 --- a/rsyslog.conf +++ b/rsyslog.conf @@ -33,25 +33,6 @@ module( dirCreateMode="0755" ) -# Define main queue -main_queue( - # file name template, also enables disk mode for the memory queue - queue.filename="sekoia_queue" - - # allocate memory dynamically for the queue. Better for handling spikes - queue.type="LinkedList" - - # maximum disk space used for the disk part of the queue - queue.maxDiskSpace="${DISK_SPACE}" - - # how many messages (messages, not bytes!) to hold in memory - queue.size="${MEMORY_MESSAGES}" - - # save the queue contents when stopping rsyslog - queue.saveOnShutdown="on" -) - - # # Include all config files in /etc/rsyslog.d/ #