From 66a3cab720d2d376d30b1ada1f2a527002df0091 Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Mon, 14 Dec 2020 17:44:55 +0900
Subject: [PATCH 1/7] Add log viewer for monitor

---
 .../monitor/provision/docker-compose.yml      | 13 ++++++++++++-
 .../nginx/html_templates/index.html.j2        |  2 ++
 .../monitor/provision/nginx/proxies.conf      | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index a773f1dee..d9b12d7da 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -45,14 +45,25 @@ services:
     restart: always
 
   nginx:
-    image: nginx:1.15.9
+    image: nginx:1.19.5
     ports:
       - "80:80"
     volumes:
       - ./nginx/proxies.conf:/etc/nginx/conf.d/proxies.conf
       - ./nginx/html:/usr/share/nginx/html
+      - /log:/log
     restart: always
     depends_on:
       - prometheus
       - alertmanager
       - grafana
+
+  logs:
+    image: gvalkov/tailon:latest
+    ports:
+      - 8080:8080
+    volumes:
+      - /log:/log
+    command:
+      - "/log/*/*.log"
+    restart: always
diff --git a/modules/universal/monitor/provision/nginx/html_templates/index.html.j2 b/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
index c70177fba..db0657f1f 100644
--- a/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
+++ b/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
@@ -18,6 +18,7 @@
             <li><a class="service" name="grafana" target="frame-grafana" href="http://grafana.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Grafana</a></li>
             <li><a class="service" name="prometheus" target="frame-prometheus" href="http://prometheus.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Prometheus</a></li>
             <li><a class="service" name="alertmanager" target="frame-alertmanager" href="http://alertmanager.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Alertmanager</a></li>
+            <li><a class="service" name="logs" target="frame-logs" href="http://logs.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Logs</a></li>
           </ul>
         </nav>
       </aside>
@@ -25,6 +26,7 @@
         <iframe class="frame" name="frame-grafana"></iframe>
         <iframe class="frame" name="frame-prometheus"></iframe>
         <iframe class="frame" name="frame-alertmanager"></iframe>
+        <iframe class="frame" name="frame-logs"></iframe>
       </main>
     </div>
     <script src="./dashboard.js"></script>
diff --git a/modules/universal/monitor/provision/nginx/proxies.conf b/modules/universal/monitor/provision/nginx/proxies.conf
index 1c747cddb..d110a97a9 100644
--- a/modules/universal/monitor/provision/nginx/proxies.conf
+++ b/modules/universal/monitor/provision/nginx/proxies.conf
@@ -18,3 +18,22 @@ server {
         proxy_pass http://alertmanager:9093;
     }
 }
+
+server {
+    server_name  logs.localhost.scalar-labs.com;
+
+    root /log;
+
+    location /viewer {
+        proxy_pass http://logs:8080;
+        break;
+    }
+
+    location / {
+        autoindex on;
+        autoindex_exact_size off;
+        autoindex_format html;
+        autoindex_localtime on;
+        break;
+    }
+}

From 66a727e1aa9ea2877611f1236b726c46c9e6e7b9 Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Wed, 16 Dec 2020 14:51:14 +0900
Subject: [PATCH 2/7] Fix to use tailon

---
 .../monitor/provision/docker-compose.yml       |  5 ++++-
 .../nginx/html_templates/index.html.j2         |  4 ++--
 .../monitor/provision/nginx/proxies.conf       | 18 +++++++-----------
 .../monitor/provision/tailon/config.toml       | 10 ++++++++++
 4 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 modules/universal/monitor/provision/tailon/config.toml

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index d9b12d7da..87c534034 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -58,12 +58,15 @@ services:
       - alertmanager
       - grafana
 
-  logs:
+  tailon:
     image: gvalkov/tailon:latest
     ports:
       - 8080:8080
     volumes:
       - /log:/log
+      - ./tailon/config.toml:/tailon/config.toml
     command:
+      - "-c"
+      - "/tailon/config.toml"
       - "/log/*/*.log"
     restart: always
diff --git a/modules/universal/monitor/provision/nginx/html_templates/index.html.j2 b/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
index db0657f1f..81fb2e534 100644
--- a/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
+++ b/modules/universal/monitor/provision/nginx/html_templates/index.html.j2
@@ -18,7 +18,7 @@
             <li><a class="service" name="grafana" target="frame-grafana" href="http://grafana.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Grafana</a></li>
             <li><a class="service" name="prometheus" target="frame-prometheus" href="http://prometheus.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Prometheus</a></li>
             <li><a class="service" name="alertmanager" target="frame-alertmanager" href="http://alertmanager.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Alertmanager</a></li>
-            <li><a class="service" name="logs" target="frame-logs" href="http://logs.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Logs</a></li>
+            <li><a class="service" name="tailon" target="frame-tailon" href="http://tailon.localhost.scalar-labs.com:{{ dashboard_local_forwarding_port }}/">Tailon</a></li>
           </ul>
         </nav>
       </aside>
@@ -26,7 +26,7 @@
         <iframe class="frame" name="frame-grafana"></iframe>
         <iframe class="frame" name="frame-prometheus"></iframe>
         <iframe class="frame" name="frame-alertmanager"></iframe>
-        <iframe class="frame" name="frame-logs"></iframe>
+        <iframe class="frame" name="frame-tailon"></iframe>
       </main>
     </div>
     <script src="./dashboard.js"></script>
diff --git a/modules/universal/monitor/provision/nginx/proxies.conf b/modules/universal/monitor/provision/nginx/proxies.conf
index d110a97a9..6d27802d0 100644
--- a/modules/universal/monitor/provision/nginx/proxies.conf
+++ b/modules/universal/monitor/provision/nginx/proxies.conf
@@ -20,20 +20,16 @@ server {
 }
 
 server {
-    server_name  logs.localhost.scalar-labs.com;
+    server_name  tailon.localhost.scalar-labs.com;
 
-    root /log;
-
-    location /viewer {
-        proxy_pass http://logs:8080;
-        break;
+    location /tailon/ws {
+        proxy_pass http://tailon:8080/tailon/ws;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 
     location / {
-        autoindex on;
-        autoindex_exact_size off;
-        autoindex_format html;
-        autoindex_localtime on;
-        break;
+        proxy_pass http://tailon:8080;
     }
 }
diff --git a/modules/universal/monitor/provision/tailon/config.toml b/modules/universal/monitor/provision/tailon/config.toml
new file mode 100644
index 000000000..06fd4960a
--- /dev/null
+++ b/modules/universal/monitor/provision/tailon/config.toml
@@ -0,0 +1,10 @@
+title = "Tailon file viewer"
+relative-root = "/"
+listen-addr = ":8088"
+allow-download = true
+allow-commands = ["tail"]
+
+[commands]
+
+	[commands.tail]
+	action = ["tail", "-n", "$lines", "-F", "$path"]

From e505a0264259951c01485b424cb042809b32ca39 Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Wed, 16 Dec 2020 14:54:31 +0900
Subject: [PATCH 3/7] Fix format

---
 modules/universal/monitor/provision/nginx/proxies.conf | 8 --------
 modules/universal/monitor/provision/tailon/config.toml | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/universal/monitor/provision/nginx/proxies.conf b/modules/universal/monitor/provision/nginx/proxies.conf
index 6d27802d0..80639aa65 100644
--- a/modules/universal/monitor/provision/nginx/proxies.conf
+++ b/modules/universal/monitor/provision/nginx/proxies.conf
@@ -21,14 +21,6 @@ server {
 
 server {
     server_name  tailon.localhost.scalar-labs.com;
-
-    location /tailon/ws {
-        proxy_pass http://tailon:8080/tailon/ws;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
-
     location / {
         proxy_pass http://tailon:8080;
     }
diff --git a/modules/universal/monitor/provision/tailon/config.toml b/modules/universal/monitor/provision/tailon/config.toml
index 06fd4960a..777b74b07 100644
--- a/modules/universal/monitor/provision/tailon/config.toml
+++ b/modules/universal/monitor/provision/tailon/config.toml
@@ -6,5 +6,5 @@ allow-commands = ["tail"]
 
 [commands]
 
-	[commands.tail]
-	action = ["tail", "-n", "$lines", "-F", "$path"]
+  [commands.tail]
+  action = ["tail", "-n", "$lines", "-F", "$path"]

From c6a27fc4fc82a73609b8e7c53d36303e2e7d8ef2 Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Wed, 16 Dec 2020 14:55:44 +0900
Subject: [PATCH 4/7] Delete log mount

---
 modules/universal/monitor/provision/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index 87c534034..9d3a7f9d9 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -51,7 +51,6 @@ services:
     volumes:
       - ./nginx/proxies.conf:/etc/nginx/conf.d/proxies.conf
       - ./nginx/html:/usr/share/nginx/html
-      - /log:/log
     restart: always
     depends_on:
       - prometheus

From eab31e4c071c2d9366c6d28148efd3716634007a Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Wed, 16 Dec 2020 16:41:04 +0900
Subject: [PATCH 5/7] Fix log mount path

---
 modules/universal/monitor/provision/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index 9d3a7f9d9..93d7ebfea 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -62,10 +62,10 @@ services:
     ports:
       - 8080:8080
     volumes:
-      - /log:/log
+      - /log:/tailon/log
       - ./tailon/config.toml:/tailon/config.toml
     command:
       - "-c"
       - "/tailon/config.toml"
-      - "/log/*/*.log"
+      - "/tailon/log/*/*.log"
     restart: always

From 349fd0c72055066b48bf024f14c5e6335ff7c46a Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Thu, 17 Dec 2020 16:06:55 +0900
Subject: [PATCH 6/7] Fix to use tailon 1.4.3

---
 .../monitor/provision/docker-compose.yml      | 21 ++++++++++++-------
 .../monitor/provision/tailon/config.toml      | 10 ---------
 2 files changed, 14 insertions(+), 17 deletions(-)
 delete mode 100644 modules/universal/monitor/provision/tailon/config.toml

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index 93d7ebfea..9ea70a7dd 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.1"
+version: "3.7"
 
 volumes:
   prometheus_data: {}
@@ -58,14 +58,21 @@ services:
       - grafana
 
   tailon:
-    image: gvalkov/tailon:latest
+    image: port22/tailon:latest
     ports:
       - 8080:8080
     volumes:
-      - /log:/tailon/log
-      - ./tailon/config.toml:/tailon/config.toml
+      - /log:/log
+      - ./tailon/config.yaml:/tailon/config.yaml
     command:
-      - "-c"
-      - "/tailon/config.toml"
-      - "/tailon/log/*/*.log"
+      - "/usr/local/bin/tailon"
+      - "-b"
+      - "0.0.0.0:8080"
+      - "-t"
+      - "9999"
+      - "-a"
+      - "-f"
+      - "/log/*/*.log"
+      - "-m"
+      - "tail"
     restart: always
diff --git a/modules/universal/monitor/provision/tailon/config.toml b/modules/universal/monitor/provision/tailon/config.toml
deleted file mode 100644
index 777b74b07..000000000
--- a/modules/universal/monitor/provision/tailon/config.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-title = "Tailon file viewer"
-relative-root = "/"
-listen-addr = ":8088"
-allow-download = true
-allow-commands = ["tail"]
-
-[commands]
-
-  [commands.tail]
-  action = ["tail", "-n", "$lines", "-F", "$path"]

From 648cfbd1bf51cf9ada391267334e18c385665e5a Mon Sep 17 00:00:00 2001
From: tei-k <tei@leosys.space>
Date: Fri, 18 Dec 2020 11:35:10 +0900
Subject: [PATCH 7/7] Revert compose and nginx version

---
 modules/universal/monitor/provision/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/universal/monitor/provision/docker-compose.yml b/modules/universal/monitor/provision/docker-compose.yml
index 9ea70a7dd..4199f3e02 100644
--- a/modules/universal/monitor/provision/docker-compose.yml
+++ b/modules/universal/monitor/provision/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.1"
 
 volumes:
   prometheus_data: {}
@@ -45,7 +45,7 @@ services:
     restart: always
 
   nginx:
-    image: nginx:1.19.5
+    image: nginx:1.15.9
     ports:
       - "80:80"
     volumes: