From bce270eecfc855ffa63816c4bf87da28aaac6165 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 15 Apr 2024 12:52:27 +0100 Subject: Move olli to monitoring namespace --- kubernetes/namespaces/default/olli/README.md | 13 ------------- kubernetes/namespaces/default/olli/configmap.yaml | 9 --------- kubernetes/namespaces/default/olli/secrets.yaml | Bin 305 -> 0 bytes kubernetes/namespaces/monitoring/olli/README.md | 13 +++++++++++++ kubernetes/namespaces/monitoring/olli/configmap.yaml | 10 ++++++++++ kubernetes/namespaces/monitoring/olli/secrets.yaml | Bin 0 -> 308 bytes 6 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 kubernetes/namespaces/default/olli/README.md delete mode 100644 kubernetes/namespaces/default/olli/configmap.yaml delete mode 100644 kubernetes/namespaces/default/olli/secrets.yaml create mode 100644 kubernetes/namespaces/monitoring/olli/README.md create mode 100644 kubernetes/namespaces/monitoring/olli/configmap.yaml create mode 100644 kubernetes/namespaces/monitoring/olli/secrets.yaml (limited to 'kubernetes/namespaces') diff --git a/kubernetes/namespaces/default/olli/README.md b/kubernetes/namespaces/default/olli/README.md deleted file mode 100644 index ff748d5..0000000 --- a/kubernetes/namespaces/default/olli/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Olli - -This folder contains the deployment information for [Olli](https://github.com/python-discord/olli), our Loki-Discord relay. - -The deployment manifest is located within the repository. - -The rest of the configuration can be applied through `kubectl apply -f .` in this directory. - -A secret called `olli-env` with the following a key `WEBHOOK_URL` with the configured Discord webhook. - -| Key | Description | -| --------------| -------------------------- | -| `WEBHOOK_URL` | The Discord webhook to use | diff --git a/kubernetes/namespaces/default/olli/configmap.yaml b/kubernetes/namespaces/default/olli/configmap.yaml deleted file mode 100644 index cf1e7fd..0000000 --- a/kubernetes/namespaces/default/olli/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: olli-config-env -data: - LOKI_API_URL: http://loki.loki.svc.cluster.local:3100 - LOKI_JOBS: default/bot,default/site,default/sir-lancebot,default/sir-robin,default/metricity,default/snekbox,default/quackstack,default/black-knight - SERVICE_INTERVAL_MINUTES: '30' - SERVICE_TOKENS: '[{"token":"CRITICAL","color":"#ff5f5f"},{"token":"ERROR","color":"#ff5f5f"},{"token":"WARN","color":"#ffe24d","case_sensitive":true}]' diff --git a/kubernetes/namespaces/default/olli/secrets.yaml b/kubernetes/namespaces/default/olli/secrets.yaml deleted file mode 100644 index f0f71dc..0000000 Binary files a/kubernetes/namespaces/default/olli/secrets.yaml and /dev/null differ diff --git a/kubernetes/namespaces/monitoring/olli/README.md b/kubernetes/namespaces/monitoring/olli/README.md new file mode 100644 index 0000000..ff748d5 --- /dev/null +++ b/kubernetes/namespaces/monitoring/olli/README.md @@ -0,0 +1,13 @@ +# Olli + +This folder contains the deployment information for [Olli](https://github.com/python-discord/olli), our Loki-Discord relay. + +The deployment manifest is located within the repository. + +The rest of the configuration can be applied through `kubectl apply -f .` in this directory. + +A secret called `olli-env` with the following a key `WEBHOOK_URL` with the configured Discord webhook. + +| Key | Description | +| --------------| -------------------------- | +| `WEBHOOK_URL` | The Discord webhook to use | diff --git a/kubernetes/namespaces/monitoring/olli/configmap.yaml b/kubernetes/namespaces/monitoring/olli/configmap.yaml new file mode 100644 index 0000000..ecedb90 --- /dev/null +++ b/kubernetes/namespaces/monitoring/olli/configmap.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: olli-config-env + namespace: monitoring +data: + LOKI_API_URL: http://loki.loki.svc.cluster.local:3100 + LOKI_JOBS: default/bot,default/site,default/sir-lancebot,default/sir-robin,default/metricity,default/snekbox,default/quackstack,default/black-knight + SERVICE_INTERVAL_MINUTES: '30' + SERVICE_TOKENS: '[{"token":"CRITICAL","color":"#ff5f5f"},{"token":"ERROR","color":"#ff5f5f"},{"token":"WARN","color":"#ffe24d","case_sensitive":true}]' diff --git a/kubernetes/namespaces/monitoring/olli/secrets.yaml b/kubernetes/namespaces/monitoring/olli/secrets.yaml new file mode 100644 index 0000000..8e3ef0b Binary files /dev/null and b/kubernetes/namespaces/monitoring/olli/secrets.yaml differ -- cgit v1.2.3