Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deactivate rsyslog queue #17

Closed
wants to merge 2 commits into from
+6 −26
Closed

Deactivate rsyslog queue #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aa37aa
Remove main queue
penhouetp Dec 1, 2023
e178c67
update iamge name
rombernier Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build-docker-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
19 changes: 0 additions & 19 deletions rsyslog.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
#
Expand Down