Added promtail

apps/grafana/release.yaml

@@ -65,12 +65,6 @@ spec:
       enabled: true
       existingSecret: grafana-ldap-toml
 
-    sidecar:
-      datasources:
-        enabled: true
-        searchNamespace: ALL
-        labelValue: "1"
-
     extraSecretMounts:
       - name: postgres-app-mount
         secretName: postgres-app

infra/loki/loki/kustomization.yaml

@@ -3,10 +3,10 @@ kind: Kustomization
 namespace: loki
 resources:
   - ./namespace.yaml
-  - ./object-bucket-claim.yaml
+  - ./object-bucket-claim-chunks.yaml
+  - ./object-bucket-claim-ruler.yaml
   - ./helm-repository.yaml
   - ./helm-release.yaml
-
 configurations:
   - ../../../common/name-reference/helm-release.yaml
 
@@ -14,9 +14,3 @@ configMapGenerator:
   - name: loki-values
     files:
       - ./values.yaml
-  - name: grafana-datasource
-    options:
-      labels:
-        grafana_datasource: "1"
-    files:
-      - ./loki-datasource.yaml

infra/loki/loki/loki-datasource.yaml

@@ -1,8 +0,0 @@
-apiVersion: 1
-datasources:
-  - name: Loki
-    type: loki
-    access: proxy
-    url: http://loki-gateway.loki.svc.cluster.local
-    uid: "loki"
-    jsonData: {}

infra/loki/loki/object-bucket-claim-chunks.yaml

@@ -1,7 +1,7 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: loki-bucket
+  name: chunks
 spec:
-  generateBucketName: loki
+  generateBucketName: chunks
   storageClassName: ceph-bucket

infra/loki/loki/object-bucket-claim-ruler.yaml

@@ -0,0 +1,7 @@
+apiVersion: objectbucket.io/v1alpha1
+kind: ObjectBucketClaim
+metadata:
+  name: ruler
+spec:
+  generateBucketName: ruler
+  storageClassName: ceph-bucket

infra/loki/loki/values.yaml

@@ -1,6 +1,21 @@
-loki:
-  auth_enabled: false
+global:
+  extraArgs:
+    - -config.expand-env=true
+  extraEnvFrom:
+    - secretRef:
+        name: chunks
+      prefix: CHUNKS_
+    - configMapRef:
+        name: chunks
+      prefix: CHUNKS_
+    - secretRef:
+        name: ruler
+      prefix: RULER_
+    - configMapRef:
+        name: ruler
+      prefix: RULER_
 
+loki:
   schemaConfig:
     configs:
       - from: "2024-04-01"
@@ -8,32 +23,33 @@ loki:
         object_store: s3
         schema: v13
         index:
-          prefix: index_
+          prefix: loki_index_
           period: 24h
-
+  pattern_ingester:
+    enabled: true
   limits_config:
-    split_queries_by_interval: "1h"
+    allow_structured_metadata: true
+    volume_enabled: true
     retention_period: 672h # 28 days retention
-  query_scheduler:
-    max_outstanding_requests_per_tenant: 2048
+  querier:
+    max_concurrent: 4
 
   storage:
     type: s3
     bucketNames:
-      chunks: "${BUCKET_NAME}"
-      ruler: "${BUCKET_NAME}"
-      admin: "${BUCKET_NAME}"
+      chunks: "${CHUNKS_BUCKET_NAME}"
+      ruler: "${RULER_BUCKET_NAME}"
     s3:
       # s3 URL can be used to specify the endpoint, access key, secret key, and bucket name this works well for S3 compatible storages or if you are hosting Loki on-premises and want to use S3 as the storage backend. Either use the s3 URL or the individual fields below (AWS endpoint, region, secret).
       # s3: s3://access_key:secret_access_key@custom_endpoint/bucket_name
       # AWS endpoint URL
-      endpoint: "${BUCKET_HOST}"
+      endpoint: "${CHUNKS_BUCKET_HOST}"
       # AWS region where the S3 bucket is located
-      region: "${BUCKET_REGION}"
+      region: "${CHUNKS_BUCKET_REGION}"
       # AWS secret access key
-      secretAccessKey: "${AWS_SECRET_ACCESS_KEY}"
+      secretAccessKey: "${CHUNKS_SECRET_ACCESS_KEY}"
       # AWS access key ID
-      accessKeyId: "${AWS_ACCESS_KEY_ID}"
+      accessKeyId: "${CHUNKS_ACCESS_KEY_ID}"
       # AWS signature version (e.g., v2 or v4)
       # signatureVersion: <your-signature-version>
       # Forces the path style for S3 (true/false)
@@ -42,34 +58,43 @@ loki:
       insecure: true
       # HTTP configuration settings
       # http_config: {}
+  # NOTE: Normally these values are set from loki.storage, however we do not use the same credentials so we have to overwrite the values
+  rulerConfig:
+    storage:
+      type: s3
+      s3:
+        bucketnames: ${RULER_BUCKET_NAME}
+        endpoint: ${RULER_BUCKET_HOST}
+        region: ${RULER_BUCKET_REGION}
+        secret_access_key: ${RULER_SECRET_ACCESS_KEY}
+        access_key_id: ${RULER_ACCESS_KEY_ID}
+        s3forcepathstyle: true
+        insecure: true
+
+deploymentMode: SimpleScalable
 
 backend:
-  replicas: 2
+  replicas: 3
 
-  extraArgs:
-    - -config.expand-env=true
+  # NOTE: There appears to be an error in the helm chart, it uses extraEnv instead of extraEnvFrom from global
   extraEnvFrom:
     - secretRef:
-        name: loki-bucket
+        name: chunks
+      prefix: CHUNKS_
     - configMapRef:
-        name: loki-bucket
+        name: chunks
+      prefix: CHUNKS_
+    - secretRef:
+        name: ruler
+      prefix: RULER_
+    - configMapRef:
+        name: ruler
+      prefix: RULER_
 read:
-  replicas: 2
-
-  extraArgs:
-    - -config.expand-env=true
-  extraEnvFrom:
-    - secretRef:
-        name: loki-bucket
-    - configMapRef:
-        name: loki-bucket
+  replicas: 3
 write:
-  replicas: 2
+  replicas: 3
 
-  extraArgs:
-    - -config.expand-env=true
-  extraEnvFrom:
-    - secretRef:
-        name: loki-bucket
-    - configMapRef:
-        name: loki-bucket
+# Disable minio storage
+minio:
+  enabled: false

infra/loki/promtail/helm-release.yaml

@@ -13,6 +13,3 @@ spec:
       version: 6.16.6
   interval: 15m
   timeout: 5m
-  valuesFrom:
-    - kind: ConfigMap
-      name: promtail-values

infra/loki/promtail/kustomization.yaml

@@ -3,11 +3,3 @@ kind: Kustomization
 namespace: loki
 resources:
   - ./helm-release.yaml
-
-configurations:
-  - ../../../common/name-reference/helm-release.yaml
-
-configMapGenerator:
-  - name: promtail-values
-    files:
-      - ./values.yaml

infra/loki/promtail/values.yaml

@@ -1,14 +0,0 @@
-initContainer:
-  # -- Specifies whether the init container for setting inotify max user instances is to be enabled
-  - name: init
-    # -- Docker registry, image and tag for the init container image
-    image: docker.io/busybox:1.33
-    # -- Docker image pull policy for the init container image
-    imagePullPolicy: IfNotPresent
-    # -- The inotify max user instances to configure
-    command:
-      - sh
-      - -c
-      - sysctl -w fs.inotify.max_user_instances=512
-    securityContext:
-      privileged: true