From 2133bee35bdf1354e0e24f68d772f33146c610c0 Mon Sep 17 00:00:00 2001
From: Marcus Noble <github@marcusnoble.co.uk>
Date: Tue, 26 Jul 2022 15:18:59 +0100
Subject: [PATCH] Point at new distributed loki

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>
---
 manifests/auth-proxy/non-auth-proxy.yaml | 24 ++++++++++++++++++++----
 manifests/monitoring-civo/promtail.yaml  |  3 +++
 manifests/monitoring/promtail.yaml       |  3 +++
 manifests/proxy-civo/non-auth-proxy.yaml | 21 ++++++++++++++++++++-
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/manifests/auth-proxy/non-auth-proxy.yaml b/manifests/auth-proxy/non-auth-proxy.yaml
index ae1ab34..6030aa7 100644
--- a/manifests/auth-proxy/non-auth-proxy.yaml
+++ b/manifests/auth-proxy/non-auth-proxy.yaml
@@ -11,12 +11,11 @@ data:
       "tekton-el.auth-proxy.svc": "tekton-el.cluster.local",
       "home.auth-proxy.svc": "home.cluster.local",
       "home.cluster.fun": "home.cluster.local",
-      "tasks.cluster.fun": "tasks.cluster.local",
-      "api.tasks.cluster.fun": "api.tasks.cluster.local",
-      "mealie.cluster.fun": "mealie.cluster.local",
       "vmcluster.auth-proxy.svc": "vmcluster.cluster.local",
       "loki.auth-proxy.svc": "loki-write.cluster.local",
-      "loki.auth-proxy.svc:80": "loki-write.cluster.local"
+      "loki.auth-proxy.svc:80": "loki-write.cluster.local",
+      "loki-distributed.auth-proxy.svc": "loki-loki.cluster.local",
+      "loki-distributed.auth-proxy.svc:80": "loki-loki.cluster.local"
     }
 ---
 apiVersion: apps/v1
@@ -127,6 +126,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  name: loki-distributed
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: prometheus
   namespace: auth-proxy
diff --git a/manifests/monitoring-civo/promtail.yaml b/manifests/monitoring-civo/promtail.yaml
index 647d117..3f47eb2 100644
--- a/manifests/monitoring-civo/promtail.yaml
+++ b/manifests/monitoring-civo/promtail.yaml
@@ -64,6 +64,9 @@ data:
     - url: http://loki.proxy-civo.svc:80/loki/api/v1/push
       external_labels:
         kubernetes_cluster: civo
+    - url: http://loki-distributed.proxy-civo.svc:80/loki/api/v1/push
+      external_labels:
+        kubernetes_cluster: civo
     target_config:
       sync_period: 10s
     scrape_configs:
diff --git a/manifests/monitoring/promtail.yaml b/manifests/monitoring/promtail.yaml
index ebcb7cc..6b74568 100644
--- a/manifests/monitoring/promtail.yaml
+++ b/manifests/monitoring/promtail.yaml
@@ -64,6 +64,9 @@ data:
     - url: http://loki.auth-proxy.svc:80/loki/api/v1/push
       external_labels:
         kubernetes_cluster: scaleway
+    - url: http://loki-distributed.auth-proxy.svc:80/loki/api/v1/push
+      external_labels:
+        kubernetes_cluster: scaleway
     target_config:
       sync_period: 10s
     scrape_configs:
diff --git a/manifests/proxy-civo/non-auth-proxy.yaml b/manifests/proxy-civo/non-auth-proxy.yaml
index e2b4fc2..6b79fdb 100644
--- a/manifests/proxy-civo/non-auth-proxy.yaml
+++ b/manifests/proxy-civo/non-auth-proxy.yaml
@@ -20,7 +20,9 @@ data:
     {
       "vmcluster.proxy-civo.svc": "vmcluster.cluster.local",
       "loki.proxy-civo.svc": "loki-write.cluster.local",
-      "loki.proxy-civo.svc:80": "loki-write.cluster.local"
+      "loki.proxy-civo.svc:80": "loki-write.cluster.local",
+      "loki-distributed.proxy-civo.svc": "loki-loki.cluster.local",
+      "loki-distributed.proxy-civo.svc:80": "loki-loki.cluster.local"
     }
 ---
 apiVersion: apps/v1
@@ -114,6 +116,23 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  name: loki-distributed
+  namespace: proxy-civo
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: prometheus
   namespace: proxy-civo