Skip to content

Commit 8f007fc

Browse files
committed
Merge remote-tracking branch 'upstream/main' into add-ha-rabbit
2 parents 9ad628f + 10bfcd6 commit 8f007fc

31 files changed

+526
-65
lines changed

scripts/deployments/deploy_everything_locally.bash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ if [ "$start_opsstack" -eq 0 ]; then
243243
call_make "." up-"$stack_target";
244244
popd
245245

246-
# -------------------------------- GRAYLOG -------------------------------
247-
log_info "starting graylog..."
248-
service_dir="${repo_basedir}"/services/graylog
246+
# -------------------------------- LOGGING -------------------------------
247+
log_info "starting logging..."
248+
service_dir="${repo_basedir}"/services/logging
249249
pushd "${service_dir}"
250250
call_make "." up-"$stack_target"
251251
sleep 1
-284 KB
Binary file not shown.

services/graylog/docker-compose.aws.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

services/graylog/docker-compose.dalco.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

services/graylog/docker-compose.master.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
services:
2+
mongodb:
3+
deploy:
4+
placement:
5+
constraints:
6+
- node.labels.logging==true
7+
elasticsearch:
8+
deploy:
9+
placement:
10+
constraints:
11+
- node.labels.logging==true
12+
graylog:
13+
deploy:
14+
placement:
15+
constraints:
16+
- node.labels.logging==true
17+
18+
fluentd:
19+
deploy:
20+
placement:
21+
constraints:
22+
- node.labels.logging==true
23+
24+
loki:
25+
deploy:
26+
placement:
27+
constraints:
28+
- node.labels.logging==true

0 commit comments

Comments
 (0)