mirror of
https://github.com/coltoneshaw/CS-Repro-Mattermost.git
synced 2025-12-23 10:01:30 +01:00
Elastic logging, grafana version bump, placeholders in docker-compose
This commit is contained in:
@@ -40,7 +40,7 @@ services:
|
|||||||
security_opt:
|
security_opt:
|
||||||
- no-new-privileges:true
|
- no-new-privileges:true
|
||||||
pids_limit: 100
|
pids_limit: 100
|
||||||
read_only: true
|
read_only: false
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /tmp
|
- /tmp
|
||||||
- /var/run/postgresql
|
- /var/run/postgresql
|
||||||
@@ -51,6 +51,48 @@ services:
|
|||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 3
|
retries: 3
|
||||||
|
# postgres-replica:
|
||||||
|
# container_name: cs-repro-postgres-replica
|
||||||
|
# environment:
|
||||||
|
# - POSTGRES_USER=mmuser
|
||||||
|
# - POSTGRES_PASSWORD=mmuser_password
|
||||||
|
# # - POSTGRES_DB=mattermost
|
||||||
|
# - LISTEN_ADDRESS="*"
|
||||||
|
# image: postgres:13-alpine
|
||||||
|
# restart: unless-stopped
|
||||||
|
# ports:
|
||||||
|
# - "5433:5432"
|
||||||
|
# security_opt:
|
||||||
|
# - no-new-privileges:true
|
||||||
|
# pids_limit: 100
|
||||||
|
# read_only: false
|
||||||
|
# tmpfs:
|
||||||
|
# - /tmp
|
||||||
|
# - /var/run/postgresql
|
||||||
|
# volumes:
|
||||||
|
# # - ./volumes/db-replica/var/lib/postgresql/data:/var/lib/postgresql/data
|
||||||
|
# - ./volumes/db-replica/data2:/var/lib/postgresql/data
|
||||||
|
# postgres-replica2:
|
||||||
|
# container_name: cs-repro-postgres-replica2
|
||||||
|
# environment:
|
||||||
|
# - POSTGRES_USER=mmuser
|
||||||
|
# - POSTGRES_PASSWORD=mmuser_password
|
||||||
|
# # - POSTGRES_DB=mattermost
|
||||||
|
# - LISTEN_ADDRESS="*"
|
||||||
|
# image: postgres:13-alpine
|
||||||
|
# restart: unless-stopped
|
||||||
|
# ports:
|
||||||
|
# - "5434:5432"
|
||||||
|
# security_opt:
|
||||||
|
# - no-new-privileges:true
|
||||||
|
# pids_limit: 100
|
||||||
|
# read_only: false
|
||||||
|
# tmpfs:
|
||||||
|
# - /tmp
|
||||||
|
# - /var/run/postgresql
|
||||||
|
# volumes:
|
||||||
|
# # - ./volumes/db-replica2/var/lib/postgresql/data:/var/lib/postgresql/data
|
||||||
|
# - ./volumes/db-replica2/data2:/var/lib/postgresql/data
|
||||||
openldap:
|
openldap:
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
container_name: cs-repro-openldap
|
container_name: cs-repro-openldap
|
||||||
@@ -71,7 +113,7 @@ services:
|
|||||||
- ./volumes/prometheus:/prometheus
|
- ./volumes/prometheus:/prometheus
|
||||||
grafana:
|
grafana:
|
||||||
container_name: cs-repro-grafana
|
container_name: cs-repro-grafana
|
||||||
image: grafana/grafana:7.5.7
|
image: grafana/grafana:10.0.4
|
||||||
ports:
|
ports:
|
||||||
- 3000:3000
|
- 3000:3000
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|||||||
15
files/elasticsearch/logging.yml
Normal file
15
files/elasticsearch/logging.yml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
# you can override this using by setting a system property, for example -Des.logger.level=DEBUG
|
||||||
|
es.logger.level: DEBUG
|
||||||
|
rootLogger: ${es.logger.level}, console
|
||||||
|
logger:
|
||||||
|
# log action execution errors for easier debugging
|
||||||
|
action: DEBUG
|
||||||
|
# reduce the logging for aws, too much is logged under the default INFO
|
||||||
|
com.amazonaws: WARN
|
||||||
|
|
||||||
|
appender:
|
||||||
|
console:
|
||||||
|
type: console
|
||||||
|
layout:
|
||||||
|
type: consolePattern
|
||||||
|
conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
|
||||||
Reference in New Issue
Block a user