chore: Update manifests after change
This commit is contained in:
@@ -164,10 +164,10 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
key: metric-token
|
key: metric-token
|
||||||
name: directus-metric-token
|
name: directus-metric-token
|
||||||
image: directus/directus:11.17.0
|
image: ghcr.io/directus/directus:11.17.0@sha256:076269ccbe7d4a0c44ce5f5b7f11e2ea5f7b3e4c4f704c0f88a52805e069c1c6
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
name: main
|
name: main
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
memory: 256Mi
|
memory: 1Gi
|
||||||
|
|||||||
@@ -14,22 +14,13 @@ spec:
|
|||||||
data:
|
data:
|
||||||
- secretKey: ACCESS_KEY_ID
|
- secretKey: ACCESS_KEY_ID
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /garage/home-infra/directus-assets
|
key: /garage/home-infra/directus-assets
|
||||||
metadataPolicy: None
|
|
||||||
property: ACCESS_KEY_ID
|
property: ACCESS_KEY_ID
|
||||||
- secretKey: ACCESS_SECRET_KEY
|
- secretKey: ACCESS_SECRET_KEY
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /garage/home-infra/directus-assets
|
key: /garage/home-infra/directus-assets
|
||||||
metadataPolicy: None
|
|
||||||
property: ACCESS_SECRET_KEY
|
property: ACCESS_SECRET_KEY
|
||||||
- secretKey: ACCESS_REGION
|
- secretKey: ACCESS_REGION
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /garage/home-infra/directus-assets
|
key: /garage/home-infra/directus-assets
|
||||||
metadataPolicy: None
|
|
||||||
property: ACCESS_REGION
|
property: ACCESS_REGION
|
||||||
|
|||||||
@@ -14,29 +14,17 @@ spec:
|
|||||||
data:
|
data:
|
||||||
- secretKey: admin-email
|
- secretKey: admin-email
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/config
|
key: /cl01tl/directus/config
|
||||||
metadataPolicy: None
|
|
||||||
property: admin-email
|
property: admin-email
|
||||||
- secretKey: admin-password
|
- secretKey: admin-password
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/config
|
key: /cl01tl/directus/config
|
||||||
metadataPolicy: None
|
|
||||||
property: admin-password
|
property: admin-password
|
||||||
- secretKey: secret
|
- secretKey: secret
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/config
|
key: /cl01tl/directus/config
|
||||||
metadataPolicy: None
|
|
||||||
property: secret
|
property: secret
|
||||||
- secretKey: key
|
- secretKey: key
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/config
|
key: /cl01tl/directus/config
|
||||||
metadataPolicy: None
|
|
||||||
property: key
|
property: key
|
||||||
|
|||||||
@@ -14,8 +14,5 @@ spec:
|
|||||||
data:
|
data:
|
||||||
- secretKey: metric-token
|
- secretKey: metric-token
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/metrics
|
key: /cl01tl/directus/metrics
|
||||||
metadataPolicy: None
|
|
||||||
property: metric-token
|
property: metric-token
|
||||||
|
|||||||
@@ -14,15 +14,9 @@ spec:
|
|||||||
data:
|
data:
|
||||||
- secretKey: OIDC_CLIENT_ID
|
- secretKey: OIDC_CLIENT_ID
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /authentik/oidc/directus
|
key: /authentik/oidc/directus
|
||||||
metadataPolicy: None
|
|
||||||
property: client
|
property: client
|
||||||
- secretKey: OIDC_CLIENT_SECRET
|
- secretKey: OIDC_CLIENT_SECRET
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /authentik/oidc/directus
|
key: /authentik/oidc/directus
|
||||||
metadataPolicy: None
|
|
||||||
property: secret
|
property: secret
|
||||||
|
|||||||
@@ -14,22 +14,13 @@ spec:
|
|||||||
data:
|
data:
|
||||||
- secretKey: default
|
- secretKey: default
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/valkey
|
key: /cl01tl/directus/valkey
|
||||||
metadataPolicy: None
|
|
||||||
property: password
|
property: password
|
||||||
- secretKey: user
|
- secretKey: user
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/valkey
|
key: /cl01tl/directus/valkey
|
||||||
metadataPolicy: None
|
|
||||||
property: user
|
property: user
|
||||||
- secretKey: password
|
- secretKey: password
|
||||||
remoteRef:
|
remoteRef:
|
||||||
conversionStrategy: Default
|
|
||||||
decodingStrategy: None
|
|
||||||
key: /cl01tl/directus/valkey
|
key: /cl01tl/directus/valkey
|
||||||
metadataPolicy: None
|
|
||||||
property: password
|
property: password
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ spec:
|
|||||||
name: directus
|
name: directus
|
||||||
namespace: directus
|
namespace: directus
|
||||||
port: 80
|
port: 80
|
||||||
weight: 100
|
weight: 1
|
||||||
matches:
|
matches:
|
||||||
- path:
|
- path:
|
||||||
type: PathPrefix
|
type: PathPrefix
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
apiVersion: monitoring.coreos.com/v1
|
||||||
|
kind: PodMonitor
|
||||||
|
metadata:
|
||||||
|
name: directus-valkey
|
||||||
|
labels:
|
||||||
|
helm.sh/chart: valkey-0.9.3
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
|
app.kubernetes.io/version: "9.0.3"
|
||||||
|
app.kubernetes.io/managed-by: Helm
|
||||||
|
app.kubernetes.io/part-of: valkey
|
||||||
|
app.kubernetes.io/component: podmonitor
|
||||||
|
spec:
|
||||||
|
podMetricsEndpoints:
|
||||||
|
- port: metrics
|
||||||
|
interval: 30s
|
||||||
|
namespaceSelector:
|
||||||
|
matchNames:
|
||||||
|
- directus
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
apiVersion: monitoring.coreos.com/v1
|
||||||
|
kind: PrometheusRule
|
||||||
|
metadata:
|
||||||
|
name: directus-valkey
|
||||||
|
labels:
|
||||||
|
helm.sh/chart: valkey-0.9.3
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
|
app.kubernetes.io/version: "9.0.3"
|
||||||
|
app.kubernetes.io/managed-by: Helm
|
||||||
|
app.kubernetes.io/part-of: valkey
|
||||||
|
spec:
|
||||||
|
groups:
|
||||||
|
- name: directus-valkey
|
||||||
|
rules:
|
||||||
|
- alert: ValkeyDown
|
||||||
|
annotations:
|
||||||
|
description: Valkey instance {{ $labels.instance }} is down.
|
||||||
|
summary: Valkey instance {{ $labels.instance }} down
|
||||||
|
expr: |
|
||||||
|
redis_up{service="directus-valkey-metrics"} == 0
|
||||||
|
for: 2m
|
||||||
|
labels:
|
||||||
|
severity: error
|
||||||
|
- alert: ValkeyMemoryHigh
|
||||||
|
annotations:
|
||||||
|
description: |
|
||||||
|
Valkey instance {{ $labels.instance }} is using {{ $value }}% of its available memory.
|
||||||
|
summary: Valkey instance {{ $labels.instance }} is using too much memory
|
||||||
|
expr: |
|
||||||
|
redis_memory_used_bytes{service="directus-valkey-metrics"} * 100
|
||||||
|
/
|
||||||
|
redis_memory_max_bytes{service="directus-valkey-metrics"}
|
||||||
|
> 90 <= 100
|
||||||
|
for: 2m
|
||||||
|
labels:
|
||||||
|
severity: error
|
||||||
|
- alert: ValkeyKeyEviction
|
||||||
|
annotations:
|
||||||
|
description: |
|
||||||
|
Valkey instance {{ $labels.instance }} has evicted {{ $value }} keys in the last 5 minutes.
|
||||||
|
summary: Valkey instance {{ $labels.instance }} has evicted keys
|
||||||
|
expr: |
|
||||||
|
increase(redis_evicted_keys_total{service="directus-valkey-metrics"}[5m]) > 0
|
||||||
|
for: 1s
|
||||||
|
labels:
|
||||||
|
severity: error
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: directus-valkey-metrics
|
||||||
|
labels:
|
||||||
|
helm.sh/chart: valkey-0.9.3
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
|
app.kubernetes.io/version: "9.0.3"
|
||||||
|
app.kubernetes.io/managed-by: Helm
|
||||||
|
app.kubernetes.io/component: metrics
|
||||||
|
app.kubernetes.io/part-of: valkey
|
||||||
|
annotations:
|
||||||
|
spec:
|
||||||
|
type: ClusterIP
|
||||||
|
ports:
|
||||||
|
- name: metrics
|
||||||
|
port: 9121
|
||||||
|
protocol: TCP
|
||||||
|
targetPort: metrics
|
||||||
|
selector:
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
apiVersion: monitoring.coreos.com/v1
|
||||||
|
kind: ServiceMonitor
|
||||||
|
metadata:
|
||||||
|
name: directus-valkey
|
||||||
|
labels:
|
||||||
|
helm.sh/chart: valkey-0.9.3
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
|
app.kubernetes.io/version: "9.0.3"
|
||||||
|
app.kubernetes.io/managed-by: Helm
|
||||||
|
app.kubernetes.io/part-of: valkey
|
||||||
|
app.kubernetes.io/component: service-monitor
|
||||||
|
spec:
|
||||||
|
endpoints:
|
||||||
|
- port: metrics
|
||||||
|
interval: 30s
|
||||||
|
namespaceSelector:
|
||||||
|
matchNames:
|
||||||
|
- directus
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app.kubernetes.io/name: valkey
|
||||||
|
app.kubernetes.io/instance: directus
|
||||||
|
app.kubernetes.io/component: metrics
|
||||||
@@ -106,6 +106,29 @@ spec:
|
|||||||
mountPath: /data
|
mountPath: /data
|
||||||
- name: valkey-acl
|
- name: valkey-acl
|
||||||
mountPath: /etc/valkey
|
mountPath: /etc/valkey
|
||||||
|
- name: metrics
|
||||||
|
image: ghcr.io/oliver006/redis_exporter:v1.82.0
|
||||||
|
imagePullPolicy: "IfNotPresent"
|
||||||
|
ports:
|
||||||
|
- name: metrics
|
||||||
|
containerPort: 9121
|
||||||
|
startupProbe:
|
||||||
|
tcpSocket:
|
||||||
|
port: metrics
|
||||||
|
livenessProbe:
|
||||||
|
tcpSocket:
|
||||||
|
port: metrics
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: metrics
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
cpu: 10m
|
||||||
|
memory: 64M
|
||||||
|
env:
|
||||||
|
- name: REDIS_ALIAS
|
||||||
|
value: directus-valkey
|
||||||
volumes:
|
volumes:
|
||||||
- name: scripts
|
- name: scripts
|
||||||
configMap:
|
configMap:
|
||||||
|
|||||||
@@ -59,12 +59,10 @@ spec:
|
|||||||
- name: WEBHOOK_SECRET
|
- name: WEBHOOK_SECRET
|
||||||
value: elastic-operator-webhook-cert
|
value: elastic-operator-webhook-cert
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits: {}
|
||||||
cpu: 1
|
|
||||||
memory: 1Gi
|
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 2m
|
||||||
memory: 150Mi
|
memory: 50Mi
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 9000
|
- containerPort: 9000
|
||||||
name: metrics
|
name: metrics
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: element-web
|
- name: element-web
|
||||||
securityContext: {}
|
securityContext: {}
|
||||||
image: "vectorim/element-web:v1.12.13"
|
image: "ghcr.io/element-hq/element-web:v1.12.13@sha256:5107e63026c13ed014f743e485821b7d4b56d275a41e76303859bb14f5f94eb6"
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: ELEMENT_WEB_PORT
|
- name: ELEMENT_WEB_PORT
|
||||||
@@ -47,8 +47,8 @@ spec:
|
|||||||
port: http
|
port: http
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 1m
|
||||||
memory: 128Mi
|
memory: 10Mi
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /app/config.json
|
- mountPath: /app/config.json
|
||||||
name: config
|
name: config
|
||||||
|
|||||||
Reference in New Issue
Block a user