From 76998e656ef92795ab5e0d2ca151fe10bff77f49 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Wed, 9 Jul 2025 21:45:50 -0500 Subject: [PATCH] ceph monitor --- .../templates/external-secret.yaml | 37 +++++++++++++++ .../templates/service-monitor.yaml | 29 ++++++++++-- .../cl01tl/monitoring/s3-exporter/values.yaml | 46 +++++++++++++++++++ 3 files changed, 109 insertions(+), 3 deletions(-) diff --git a/clusters/cl01tl/monitoring/s3-exporter/templates/external-secret.yaml b/clusters/cl01tl/monitoring/s3-exporter/templates/external-secret.yaml index d1778e7f0..8d8fd1769 100644 --- a/clusters/cl01tl/monitoring/s3-exporter/templates/external-secret.yaml +++ b/clusters/cl01tl/monitoring/s3-exporter/templates/external-secret.yaml @@ -1,5 +1,42 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret +metadata: + name: s3-ceph-directus-secret + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: s3-ceph-directus-secret + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + data: + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/directus/ceph + metadataPolicy: None + property: AWS_ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/directus/ceph + metadataPolicy: None + property: AWS_SECRET_ACCESS_KEY + - secretKey: BUCKET_HOST + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /cl01tl/directus/ceph + metadataPolicy: None + property: BUCKET_HOST + +--- +apiVersion: external-secrets.io/v1 +kind: ExternalSecret metadata: name: s3-do-home-infra-secret namespace: {{ .Release.Namespace }} diff --git a/clusters/cl01tl/monitoring/s3-exporter/templates/service-monitor.yaml b/clusters/cl01tl/monitoring/s3-exporter/templates/service-monitor.yaml index ed8f7cdb5..d3b2783d8 100644 --- a/clusters/cl01tl/monitoring/s3-exporter/templates/service-monitor.yaml +++ b/clusters/cl01tl/monitoring/s3-exporter/templates/service-monitor.yaml @@ -1,16 +1,39 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: s3-exporter + name: s3-exporter-digital-ocean namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: s3-exporter + app.kubernetes.io/name: s3-exporter-digital-ocean app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Name }} spec: selector: matchLabels: - app.kubernetes.io/name: s3-exporter + app.kubernetes.io/name: s3-exporter-digital-ocean + app.kubernetes.io/instance: {{ .Release.Name }} + # matchExpressions: + # - { key: app.kubernetes.io/controller, operator: In, values: [digital-ocean] } + endpoints: + - port: metrics + interval: 120s + scrapeTimeout: 30s + path: /metrics + +--- +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: s3-exporter-ceph-directus + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: s3-exporter-ceph-directus + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Name }} +spec: + selector: + matchLabels: + app.kubernetes.io/name: s3-exporter-ceph-directus app.kubernetes.io/instance: {{ .Release.Name }} # matchExpressions: # - { key: app.kubernetes.io/controller, operator: In, values: [digital-ocean] } diff --git a/clusters/cl01tl/monitoring/s3-exporter/values.yaml b/clusters/cl01tl/monitoring/s3-exporter/values.yaml index 77eac0b33..90ea8c0d5 100644 --- a/clusters/cl01tl/monitoring/s3-exporter/values.yaml +++ b/clusters/cl01tl/monitoring/s3-exporter/values.yaml @@ -39,6 +39,45 @@ s3-exporter: requests: cpu: 10m memory: 64Mi + ceph-directus: + type: deployment + replicas: 1 + strategy: Recreate + revisionHistoryLimit: 3 + containers: + main: + image: + repository: molu8bits/s3bucket_exporter + tag: 1.0.2 + pullPolicy: IfNotPresent + env: + - name: S3_NAME + value: ceph-directus + - name: S3_ENDPOINT + valueFrom: + secretKeyRef: + name: s3-ceph-directus-secret + key: BUCKET_HOST + - name: S3_ACCESS_KEY + valueFrom: + secretKeyRef: + name: s3-ceph-directus-secret + key: AWS_ACCESS_KEY_ID + - name: S3_SECRET_KEY + valueFrom: + secretKeyRef: + name: s3-ceph-directus-secret + key: AWS_SECRET_ACCESS_KEY + - name: S3_REGION + value: us-east-1 + - name: LOG_LEVEL + value: debug + - name: S3_FORCE_PATH_STYLE + value: true + resources: + requests: + cpu: 10m + memory: 64Mi service: digital-ocean: controller: digital-ocean @@ -47,3 +86,10 @@ s3-exporter: port: 9655 targetPort: 9655 protocol: TCP + ceph-directus: + controller: ceph-directus + ports: + metrics: + port: 9655 + targetPort: 9655 + protocol: TCP