Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
c9c70d6
Arch Linux Certificates Customization
mrnicegyu11 Dec 3, 2024
7b8be53
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 5, 2024
bcd61cd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 12, 2024
58e1030
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Dec 13, 2024
ed8d479
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jan 10, 2025
dda6e01
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 4, 2025
f6f4f36
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Feb 25, 2025
5dca5c3
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 13, 2025
4a653ef
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 20, 2025
3a21f0f
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Mar 28, 2025
48fbbca
Fix pgsql exporter failure
mrnicegyu11 Apr 24, 2025
08c57db
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 May 6, 2025
5ecbfec
[Kubernetes] Introduce on-prem persistent Storage (Longhorn) :tada: …
YuryHrytsuk May 6, 2025
3ea41b5
Experimental: Try to add tracing to simcore-traefik on master
mrnicegyu11 May 9, 2025
29f2f2e
Fixes https://github.com/ITISFoundation/osparc-simcore/issues/7363
mrnicegyu11 May 14, 2025
cdef57f
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 May 21, 2025
c0f393e
t push
mrnicegyu11 May 23, 2025
34a86fd
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 2, 2025
df3f5df
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 3, 2025
ac44663
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 8, 2025
4100b87
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 21, 2025
759f657
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 21, 2025
d60fd0c
t checkout -b 2025/redactoMerge remote-tracking branch 'upstream/main'
mrnicegyu11 Jul 25, 2025
a1e36c7
Merge branch 'ITISFoundation:main' into main
mrnicegyu11 Jul 30, 2025
b856eb0
Arch Linux Certificates Customization - 2
mrnicegyu11 Jul 30, 2025
81ce9fb
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 7, 2025
0e32699
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 19, 2025
a5b9950
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 25, 2025
70695e2
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Aug 27, 2025
786a5d9
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Sep 10, 2025
038be52
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Sep 10, 2025
f78e959
Change fluentd for fluentbit
mrnicegyu11 Sep 10, 2025
6e24233
fix
mrnicegyu11 Sep 10, 2025
f611220
Merge branch 'main' into 2025/add/fluentbit
mrnicegyu11 Sep 12, 2025
f43f0fa
Switch fluentbit for vectordev
mrnicegyu11 Sep 12, 2025
38f3448
fix
mrnicegyu11 Sep 12, 2025
07639fd
fix
mrnicegyu11 Sep 12, 2025
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
2 changes: 1 addition & 1 deletion services/logging/docker-compose.aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
constraints:
- node.labels.logging==true

fluentd:
vector:
deploy:
placement:
constraints:
Expand Down
2 changes: 1 addition & 1 deletion services/logging/docker-compose.dalco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
constraints:
- node.labels.logging==true

fluentd:
vector:
deploy:
placement:
constraints:
Expand Down
2 changes: 1 addition & 1 deletion services/logging/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
placement:
constraints: []

fluentd:
vector:
deploy:
placement:
constraints: []
2 changes: 1 addition & 1 deletion services/logging/docker-compose.master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
constraints:
- node.labels.logging==true

fluentd:
vector:
deploy:
placement:
constraints:
Expand Down
52 changes: 19 additions & 33 deletions services/logging/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ services:
graylog:
image: graylog/graylog:6.0.5
init: true
# user: "1000:1001"
configs:
- source: graylog_config
target: /files/osparc-custom-content-pack-v2.json
Expand All @@ -76,7 +75,7 @@ services:
aliases:
- graylog
ports:
- 12201:12201/udp
- 12200:12201/udp
- 12202:12202/udp
deploy:
replicas: 1
Expand All @@ -100,42 +99,29 @@ services:
- traefik.http.middlewares.graylog_replace_regex.replacepathregex.regex=^/graylog/?(.*)$$
- traefik.http.middlewares.graylog_replace_regex.replacepathregex.replacement=/$${1}
- traefik.http.routers.graylog.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, graylog_replace_regex
fluentd:
image: itisfoundation/fluentd:v1.16.9-1.0
configs:
- source: fluentd_config
target: /fluentd/etc/fluent.conf
environment:
- GRAYLOG_HOST=graylog
- GRAYLOG_PORT=12201
- LOKI_URL=http://loki:3100
- FLUENTD_HOSTNAME={% raw %}{{.Node.Hostname}}{% endraw %}
vector:
image: timberio/vector:0.49.X-debian
ports:
- "24224:24224/tcp"
- "12201:12201/udp" # GELF input
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
environment:
- VECTOR_CONFIG=/etc/vector/vector.yaml
- VECTOR_LOG=info
configs:
- source: vector_config
target: /etc/vector/vector.yaml
deploy:
#mode: global # Run on all nodes
restart_policy:
condition: on-failure
resources:
limits:
cpus: '1.0'
memory: 1G
reservations:
cpus: '0.5'
cpus: "1.0"
memory: 512M
update_config:
parallelism: 1
delay: 10s
order: start-first
reservations:
memory: 256M
labels: []
networks:
- monitoring
- graylog
healthcheck:
test: ["CMD", "curl", "-f", "http://0.0.0.0:24220/api/plugins"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s

loki:
image: grafana/loki:3.5.4
Expand Down Expand Up @@ -196,9 +182,9 @@ configs:
graylog_config:
name: ${STACK_NAME}_graylog_config_{{ "./data/contentpacks/osparc-custom-content-pack-v2.json" | sha256file | substring(0,10) }}
file: ./data/contentpacks/osparc-custom-content-pack-v2.json
fluentd_config:
name: ${STACK_NAME}_fluentd_config_{{ "./fluentd/fluent.conf" | sha256file | substring(0,10) }}
file: ./fluentd/fluent.conf
vector_config:
name: ${STACK_NAME}_vector_config_{{ "./vector.yaml" | sha256file | substring(0,10) }}
file: ./vector.yaml
loki_config:
name: ${STACK_NAME}_loki_config_{{ "./loki.yaml" | sha256file | substring(0,10) }}
file: ./loki.yaml
28 changes: 0 additions & 28 deletions services/logging/fluentd/Dockerfile

This file was deleted.

9 changes: 0 additions & 9 deletions services/logging/fluentd/Makefile

This file was deleted.

5 changes: 0 additions & 5 deletions services/logging/fluentd/README.md

This file was deleted.

131 changes: 0 additions & 131 deletions services/logging/fluentd/fluent.conf

This file was deleted.

98 changes: 98 additions & 0 deletions services/logging/vector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Vector configuration to replace Fluent Bit
# Ingests GELF logs from Docker daemon and forwards to Loki and Graylog

sources:
# Receive GELF messages from Docker containers via UDP
docker_gelf:
type: socket
address: "0.0.0.0:12201"
mode: udp
decoding:
codec: gelf
framing:
method: chunked_gelf
# Auto-detect compression (gzip, zlib, or uncompressed)
decompression: Auto

transforms:
# Process and enrich the logs
process_logs:
type: remap
inputs: ["docker_gelf"]
source: |
if !exists(.host) {
.host = get_hostname!()
}

# Map short_message to message for Loki compatibility
if exists(.short_message) {
.message = .short_message
}

# Handle container name - GELF uses _container_name (with underscore prefix)
if exists(._container_name) {
.container_name = ._container_name
} else {
.container_name = "unknown"
}

# Handle container ID
if exists(._container_id) {
.container_id = ._container_id
} else {
.container_id = "unknown"
}

# Handle image name
if exists(._image_name) {
.image_name = ._image_name
} else {
.image_name = "unknown"
}

# Add processing metadata
.processed_by = "vector"

sinks:
# Send to Loki
loki:
type: loki
inputs: ["process_logs"]
endpoint: "http://loki:3100"
encoding:
codec: json
labels:
job: "docker"
source: "vector"
# Simple field references - defaults are set in transform above
host: "{{ host }}"
container_name: "{{ container_name }}"
# Remove label fields from the log line to avoid duplication
remove_label_fields: true
healthcheck:
enabled: true

# Send to Graylog via GELF over UDP (not TCP with framing)
graylog:
type: socket
inputs: ["process_logs"]
address: "logging_graylog:12201"
mode: udp
encoding:
codec: gelf
healthcheck:
enabled: true

# Temporary: Output to console for debugging
#console_debug:
# type: console
# inputs: ["process_logs"]
# encoding:
# codec: json

# Global configuration
api:
enabled: true
address: "0.0.0.0:8686"

data_dir: "/var/lib/vector"
Loading