From bf4ecb69879c1e67ded3016056a61ef36b62e745 Mon Sep 17 00:00:00 2001
From: Chris <stofflees@gmail.com>
Date: Mon, 7 Dec 2020 22:02:06 +0000
Subject: [PATCH] Add server and container monitoring

---
 docker-compose.yml | 15 +++++++++++++++
 nginx.conf         | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ebf80e..5e07d05 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -122,6 +122,20 @@ services:
     depends_on:
       - db
 
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:v0.37.0
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    privileged: true
+    devices:
+      - /dev/kmsg
+    networks:
+      - nginx
+
   db:
     image: mariadb
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
@@ -157,6 +171,7 @@ services:
       - nextcloud
       - gitea
       - collabora
+      - cadvisor
       - certs
     ports:
       - 80:80
diff --git a/nginx.conf b/nginx.conf
index 4d8bb40..fc68524 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -442,6 +442,26 @@ http {
         }
     }
 
+    upstream cadvisor-handler {
+        server cadvisor:8080;
+    }
+
+    server {
+        listen 443 ssl http2;
+
+        ssl_certificate /etc/nginx/certs/scarif.local.crt;
+        ssl_certificate_key /etc/nginx/certs/scarif.local.key;
+
+        gzip_types text/plain text/css application/json application/x-javascript
+                   text/xml application/xml application/xml+rss text/javascript;
+
+        server_name monitoring.scarif.local;
+
+        location / {
+            proxy_pass http://cadvisor-handler;
+        }
+    }
+
     server {
         listen 80 default_server;
         listen [::]:80 default_server;