commit 41bfb04d311483d44d29aa4b8186126c2635657d
parent 6240307a0fb1c3318d1e72e80a32fd176783665a
Author: MTRNord <mtrnord1@gmail.com>
Date: Tue, 1 Apr 2025 00:01:03 +0200
Prepare monitoring element.io
Diffstat:
2 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/apps/2024_cluster/secrets/archivebox.yaml b/apps/2024_cluster/secrets/archivebox.yaml
@@ -5,7 +5,8 @@ metadata:
namespace: changedetection
type: Opaque
stringData:
- search_backend_password: ENC[AES256_GCM,data:aWBgiXfzCaxnaP7A5754RKLCl+HCYghFqHAMziUWz6Jj/Ej3HifJfDfrYGIGxWTxrkECNPdvqC8+WcuLGYFBKA==,iv:Pv1WgqIfy2sw6ij8PN6rG9VVkW4lzCRL2EuLTbirO9c=,tag:is6dPRXE18X1u9tjRA0VwQ==,type:str]
+ search_backend_password: ENC[AES256_GCM,data:cN+e8tZDEemq/5txJMaOg8cC5YuUCwi+yxc7Oobt0gK2IzSArpxwwNmDzzciaVLXCgntVC1wuQNwD3+QbneYpw==,iv:G/EWGhThBw8FbYh9FSVKPNM9GtwLyqiVcFSpzbBRGJw=,tag:C0954ia0iLoR8Pp8PRAHXQ==,type:str]
+ admin_password: ENC[AES256_GCM,data:De18lNgwvcnX,iv:jzGXdiPj95xyFWTgbhsfWhZi2+BywldXPYKDtVXlX1M=,tag:Jso82lMxdlTw7PbkXV5Z+g==,type:str]
sops:
kms: []
gcp_kms: []
@@ -15,14 +16,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5a28wRzEwUDVsMW16cG1Y
- Y1hsaDF5cUdoRlJPRVpQcGl3L290blhJWERFCk56NjlxRXV0TkQxMUxSMU0zckk1
- ZE5Fbjh3OFNhMFZ6NUkrbG42ZXBNMGMKLS0tICtKOFdvbHcrTlM3L3cyWjJJVUpp
- V1lCYkdoTjJnQmVPS0lLKzJBTDVMZVkK3hSndmPVfE7mgUyQJuZ7J7jgzwCAZr65
- 57/et1ulAPndjyz3xgMHNDygzEVwN1xBZX/uBEaWSUeKqKo3E4q+Pg==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEREVjbnhseUluQ2VuQXZC
+ eFY1aTBvNDZzSWVmNHBDLytFaW1zSlg4MUUwCnNCRTNUdUNKWVFKeTl2SkRkcDFX
+ S0svMmJJV1I4M2lxOHdvUmkwVHhSUlEKLS0tIER6T1JnbE05WGw5ZUZFSFA4ZHli
+ WFNpWTBLSWtCZHAwaHFlSk1HN3FoamsKL1xJorvL4xrOXu4XI2+uxPosTWU4EoPc
+ ajtSdNDwNi/1XzKIK9JnDPemPgEGW8XJfB80lMW3kRX0GpQHTvGXdQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-03-31T21:23:04Z"
- mac: ENC[AES256_GCM,data:XAjlhRX7BA3qQIjmhhjaMCtD7SEG6b0ymGmsvvV1YACJlMKKWbuLvthmDrO+6FG0ECNccIyVIFX/E2VTAzm0uEpv4Fld44MBsR6BEZGTBcYdfA3chyorVtZMX8rfZ8uyqdpsE7oF1WbL3DaoIo9kfaMQYGbxz+L3YTp8pmFP0Go=,iv:/Ysl4UOELncvYtqOBGKyaLnxrwBNfeT3eCqwoxODRtg=,tag:N86kDQuJor17klbn9wnfTQ==,type:str]
+ lastmodified: "2025-03-31T22:00:59Z"
+ mac: ENC[AES256_GCM,data:2hPObo3IHZMU3osQKRLtAiVexiIx9rUrgDtyY3aCJeQCABlqJa/zA6zFF6udDOvMwExpURX3ReTbGrJ8Kp8SKQ2zdIwXFe4CrBjPLM8ipZO7/hntol4V+kRWi4LW3gbzZ9GRWLm+AToPBRobxlPIQuWK/V3228TlWL0EzibKMJY=,iv:e+YpejTG0kqIsDxY+IUwu+dejLyi1+99igoNDS6TH74=,tag:8XHK+Zt2TG54ZPbNkQ9xnA==,type:str]
pgp: []
encrypted_regex: ^(adminPassword|adminEmail|jenkinsAdminEmail|securityRealm|gerrit.config|routing_key|DATABASE_URL|SMTP_PASSWORD|SECRET_KEY_BASE|admin_password|extraCommands|key|clickhouseDatabaseURL|databaseURL|client_id|client_secret|secret_key_base|otp_secret|private_key|public_key|primaryKey|deterministicKey|keyDerivationSalt|token|clientId|secretKey|installationId|installationKey|uriOverride|adminToken.value|password.value|sql_password|erlangCookie|AUTHENTICATION_PASSWORD|ROOM_API_SECRET_KEY|adminPassword|configPassword|adminUser|configUser|MAIL_PASSWORD|APP_KEY|api_key|api_secret|keys|livekit_key|livekit_secret|secret_key|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret|admin_token|integrationKey|rootPassword)$
version: 3.9.1
diff --git a/apps/base/element_changedetection/element_deployment.yaml b/apps/base/element_changedetection/element_deployment.yaml
@@ -31,20 +31,55 @@ spec:
labels:
app: element-changedetection
spec:
- securityContext:
- fsGroup: 911
- runAsUser: 911
- runAsGroup: 911
containers:
- - image: archivebox/sonic:latest
+ - image: archivebox/archivebox:latest
imagePullPolicy: Always
- name: element-changedetection-sonic
+ name: element-changedetection
+ command:
+ - /app/bin/docker_entrypoint.sh
+ args:
+ #- init
+ #- --setup
+ - server
+ - 0.0.0.0:8000
env:
+ - name: ADMIN_USERNAME
+ value: "MTRNord"
+ - name: ADMIN_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: element-changedetection
+ key: admin_password
+ - name: ALLOWED_HOSTS
+ value: "https://element-changes.midnightthoughts.space"
+ - name: CSRF_TRUSTED_ORIGINS
+ value: "https://element-changes.midnightthoughts.space"
+ - name: TZ
+ value: "Europe/Berlin"
+ - name: PUBLIC_INDEX
+ value: "True"
+ - name: PUBLIC_SNAPSHOTS
+ value: "False"
+ - name: PUBLIC_ADD_VIEW
+ value: "False"
+ - name: SEARCH_BACKEND_ENGINE
+ value: "sonic"
+ - name: SEARCH_BACKEND_HOST
+ value: "localhost"
- name: SEARCH_BACKEND_PASSWORD
valueFrom:
secretKeyRef:
name: element-changedetection
key: search_backend_password
+ livenessProbe:
+ failureThreshold: 3
+ httpGet:
+ path: /
+ port: 8000
+ readinessProbe:
+ httpGet:
+ path: /
+ port: 8000
resources:
requests:
ephemeral-storage: 1024Mi
@@ -53,26 +88,20 @@ spec:
limits:
ephemeral-storage: 2048Mi
cpu: 2000m
- memory: 3000Mi
- securityContext:
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- #add:
- # - SYS_ADMIN
- readOnlyRootFilesystem: true
- runAsNonRoot: true
+ memory: 2000Mi
volumeMounts:
- - mountPath: /var/lib/sonic/store
+ - mountPath: /data
name: element-changedetection-data
- subPath: sonic
- mountPath: /tmp
name: tmp
- image: archivebox/archivebox:latest
imagePullPolicy: Always
name: element-changedetection-scheduler
env:
+ - name: PUID
+ value: "911"
+ - name: PGID
+ value: "911"
- name: TIMEOUT
value: "120"
- name: SEARCH_BACKEND_ENGINE
@@ -84,8 +113,10 @@ spec:
secretKeyRef:
name: element-changedetection
key: search_backend_password
+ command:
+ - /app/bin/docker_entrypoint.sh
args:
- - scheduler
+ - schedule
- --foreground
- --update
- --every="15 * * * *"
@@ -98,54 +129,20 @@ spec:
ephemeral-storage: 2048Mi
cpu: 2000m
memory: 3000Mi
- securityContext:
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- add:
- - CHOWN
- readOnlyRootFilesystem: true
- runAsNonRoot: true
volumeMounts:
- mountPath: /data
name: element-changedetection-data
- mountPath: /tmp
name: tmp
- - image: archivebox/archivebox:latest
+ - image: archivebox/sonic:latest
imagePullPolicy: Always
- name: element-changedetection
+ name: element-changedetection-sonic
env:
- - name: ALLOWED_HOSTS
- value: "https://element-changes.midnightthoughts.space"
- - name: CSRF_TRUSTED_ORIGINS
- value: "https://element-changes.midnightthoughts.space"
- - name: TZ
- value: "Europe/Berlin"
- - name: PUBLIC_INDEX
- value: "True"
- - name: PUBLIC_SNAPSHOTS
- value: "False"
- - name: PUBLIC_ADD_VIEW
- value: "False"
- - name: SEARCH_BACKEND_ENGINE
- value: "sonic"
- - name: SEARCH_BACKEND_HOST
- value: "localhost"
- name: SEARCH_BACKEND_PASSWORD
valueFrom:
secretKeyRef:
name: element-changedetection
key: search_backend_password
- livenessProbe:
- failureThreshold: 3
- httpGet:
- path: /
- port: 8000
- readinessProbe:
- httpGet:
- path: /
- port: 8000
resources:
requests:
ephemeral-storage: 1024Mi
@@ -154,17 +151,20 @@ spec:
limits:
ephemeral-storage: 2048Mi
cpu: 2000m
- memory: 2000Mi
+ memory: 3000Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
- add:
- - CHOWN
+ #add:
+ # - SYS_ADMIN
readOnlyRootFilesystem: true
- runAsNonRoot: true
+ runAsNonRoot: false
volumeMounts:
+ - mountPath: /var/lib/sonic/store
+ name: element-changedetection-data
+ subPath: sonic
- mountPath: /data
name: element-changedetection-data
- mountPath: /tmp