From 9d530c96e8811aa2313b9d1b1c0d6eaba2593898 Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Tue, 29 Aug 2023 09:13:03 -0400
Subject: [PATCH] Elastic logging, grafana version bump, placeholders in
 docker-compose

---
 docker-compose.yml              | 46 +++++++++++++++++++++++++++++++--
 files/elasticsearch/logging.yml | 15 +++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 files/elasticsearch/logging.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 524ed05..3144131 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
     security_opt:
       - no-new-privileges:true
     pids_limit: 100
-    read_only: true
+    read_only: false
     tmpfs:
       - /tmp
       - /var/run/postgresql
@@ -51,6 +51,48 @@ services:
       interval: 10s
       timeout: 3s
       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:
     platform: linux/amd64
     container_name: cs-repro-openldap
@@ -71,7 +113,7 @@ services:
       - ./volumes/prometheus:/prometheus
   grafana:
     container_name: cs-repro-grafana
-    image: grafana/grafana:7.5.7
+    image: grafana/grafana:10.0.4
     ports:
       - 3000:3000
     restart: unless-stopped
diff --git a/files/elasticsearch/logging.yml b/files/elasticsearch/logging.yml
new file mode 100644
index 0000000..7881b17
--- /dev/null
+++ b/files/elasticsearch/logging.yml
@@ -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"
\ No newline at end of file