Skip to content

Commit f483df3

Browse files
committed
Revert ":alembic: Add vector-dev logging aggregator /w loki, graylog via host ports (#1233)"
This reverts commit a8cc860.
1 parent a8cc860 commit f483df3

File tree

3 files changed

+15
-30
lines changed

3 files changed

+15
-30
lines changed

services/logging/docker-compose.yml.j2

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
memory: 300M
1919
cpus: "0.1"
2020
networks:
21-
logging:
21+
graylog:
2222
aliases:
2323
- mongo # needed because of graylog configuration
2424

@@ -46,7 +46,7 @@ services:
4646
memory: 1G
4747
cpus: "0.1"
4848
networks:
49-
logging:
49+
graylog:
5050
# Graylog: https://hub.docker.com/r/graylog/graylog/
5151
graylog:
5252
image: graylog/graylog:6.0.5
@@ -71,18 +71,12 @@ services:
7171
networks:
7272
public:
7373
monitoring:
74-
logging:
74+
graylog:
7575
aliases:
7676
- graylog
7777
ports:
78-
- target: 12201
79-
published: 12203
80-
protocol: udp
81-
mode: host
82-
- target: 12202
83-
published: 12202
84-
protocol: udp
85-
mode: host
78+
- 12201:12201/udp
79+
- 12202:12202/udp
8680
deploy:
8781
replicas: 1
8882
restart_policy:
@@ -106,23 +100,19 @@ services:
106100
- traefik.http.middlewares.graylog_replace_regex.replacepathregex.replacement=/$${1}
107101
- traefik.http.routers.graylog.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, graylog_replace_regex
108102
vector:
109-
image: timberio/vector:0.50.X-debian
103+
image: timberio/vector:0.49.X-debian
110104
ports:
111-
- target: 12201
112-
published: 12201
113-
protocol: udp
114-
mode: host
105+
- "12200:12201/udp" # GELF input
115106
volumes:
116107
- /var/run/docker.sock:/var/run/docker.sock:ro
117108
environment:
118109
- VECTOR_CONFIG=/etc/vector/vector.yaml
119110
- VECTOR_LOG=info
120-
- VECTOR_LOG_DESTINATION=${VECTOR_LOG_DESTINATION}
121111
configs:
122112
- source: vector_config
123113
target: /etc/vector/vector.yaml
124114
deploy:
125-
replicas: 1
115+
replicas: 0
126116
resources:
127117
limits:
128118
cpus: "1.0"
@@ -131,15 +121,11 @@ services:
131121
memory: 256M
132122
labels: []
133123
networks:
134-
logging:
124+
- monitoring
125+
- graylog
135126

136127
loki:
137-
image: grafana/loki:3.5.7
138-
ports:
139-
- target: 3100
140-
published: 12204
141-
protocol: tcp
142-
mode: host
128+
image: grafana/loki:3.5.4
143129
configs:
144130
- source: loki_config
145131
target: /etc/loki/loki.yaml
@@ -155,7 +141,7 @@ services:
155141
deploy:
156142
placement:
157143
constraints: []
158-
replicas: 1
144+
replicas: 0
159145
restart_policy:
160146
condition: any
161147
delay: 5s
@@ -186,7 +172,7 @@ volumes:
186172
graylog_journal:
187173

188174
networks:
189-
logging:
175+
graylog:
190176
public:
191177
external: true
192178
name: ${PUBLIC_NETWORK}

services/logging/template.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ S3_FORCE_PATH_STYLE_LOKI=${S3_FORCE_PATH_STYLE_LOKI}
2424
S3_REGION_LOKI=${S3_REGION_LOKI}
2525
S3_SECRET_KEY_LOKI=${S3_SECRET_KEY_LOKI}
2626
STORAGE_DOMAIN=${STORAGE_DOMAIN}
27-
VECTOR_LOG_DESTINATION=${VECTOR_LOG_DESTINATION}

services/logging/vector.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ sinks:
5858
loki:
5959
type: loki
6060
inputs: ["process_logs"]
61-
endpoint: "http://${VECTOR_LOG_DESTINATION:?err}:12204"
61+
endpoint: "http://loki:3100"
6262
encoding:
6363
codec: json
6464
labels:
@@ -76,7 +76,7 @@ sinks:
7676
graylog:
7777
type: socket
7878
inputs: ["process_logs"]
79-
address: "${VECTOR_LOG_DESTINATION:?err}:12203"
79+
address: "logging_graylog:12201"
8080
mode: udp
8181
encoding:
8282
codec: gelf

0 commit comments

Comments
 (0)