Revert "fix: remove filebeat and change group on Traefik templates (#101

)" This reverts commit f7d0d56.
camptocamp · Nov 10, 2023 · 9839b6f · 9839b6f
1 parent f7d0d56
commit 9839b6f
Show file tree

Hide file tree

Showing 15 changed files with 121 additions and 23 deletions.
diff --git a/README.adoc b/README.adoc
@@ -86,7 +86,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.2.0"`
+Default: `"v5.0.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -152,6 +152,14 @@ object({
 
 Default: `null`
 
+==== [[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+
+Description: n/a
+
+Type: `bool`
+
+Default: `false`
+
 ==== [[input_retention]] <<input_retention,retention>>
 
 Description: Logs retention period. To deactivate retention, pass 0s.
@@ -243,7 +251,7 @@ Description: Credentials to access the Loki ingress, if activated.
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.2.0"`
+|`"v5.0.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -306,6 +314,12 @@ object({
 |`null`
 |no
 
+|[[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+|n/a
+|`bool`
+|`false`
+|no
+
 |[[input_retention]] <<input_retention,retention>>
 |Logs retention period. To deactivate retention, pass 0s.
 |`string`

diff --git a/aks/README.adoc b/aks/README.adoc
@@ -101,7 +101,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.2.0"`
+Default: `"v5.0.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -167,6 +167,14 @@ object({
 
 Default: `null`
 
+==== [[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+
+Description: n/a
+
+Type: `bool`
+
+Default: `false`
+
 ==== [[input_retention]] <<input_retention,retention>>
 
 Description: Logs retention period. To deactivate retention, pass 0s.
@@ -278,7 +286,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.2.0"`
+|`"v5.0.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -341,6 +349,12 @@ object({
 |`null`
 |no
 
+|[[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+|n/a
+|`bool`
+|`false`
+|no
+
 |[[input_retention]] <<input_retention,retention>>
 |Logs retention period. To deactivate retention, pass 0s.
 |`string`

diff --git a/aks/main.tf b/aks/main.tf
@@ -50,8 +50,9 @@ module "loki-stack" {
   app_autosync        = var.app_autosync
   dependency_ids      = var.dependency_ids
 
-  retention = var.retention
-  ingress   = var.ingress
+  retention       = var.retention
+  ingress         = var.ingress
+  enable_filebeat = var.enable_filebeat
 
   helm_values = concat(local.helm_values, var.helm_values)
 }
diff --git a/charts/loki-microservice/Chart.lock b/charts/loki-microservice/Chart.lock
@@ -5,5 +5,8 @@ dependencies:
 - name: promtail
   repository: https://grafana.github.io/helm-charts
   version: 6.15.3
-digest: sha256:9be75b5f113d376b166deba73b98639c502dfb0f80b0dcec677cf2f3f62bcd0f
-generated: "2023-11-03T13:55:19.507104539+01:00"
+- name: filebeat
+  repository: https://helm.elastic.co
+  version: 7.17.3
+digest: sha256:02ff38d56014866298b0d3aa46b64df45c2c0f5d1b85368f2deb5ac16df9f76d
+generated: "2023-11-03T07:01:54.656363242Z"
diff --git a/charts/loki-microservice/Chart.yaml b/charts/loki-microservice/Chart.yaml
@@ -6,6 +6,10 @@ dependencies:
 - name: promtail
   repository: https://grafana.github.io/helm-charts
   version: 6.15.3
+- condition: filebeat.enabled
+  name: filebeat
+  repository: https://helm.elastic.co
+  version: 7.17.3
 description: |
   This chart installs loki-distributed.
   Loki is a log aggregation system made by Grafana Labs, and inspired by Prometheus.

diff --git a/charts/loki-microservice/charts/filebeat-7.17.3.tgz b/charts/loki-microservice/charts/filebeat-7.17.3.tgz
diff --git a/charts/loki-microservice/templates/ingressRoute.yaml b/charts/loki-microservice/templates/ingressRoute.yaml
@@ -14,7 +14,7 @@ spec:
     kind: ClusterIssuer
     name: {{ .clusterIssuer }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata:
   name: loki-frontend
@@ -36,7 +36,7 @@ spec:
     secretName: loki-frontend-tls
 {{- with .allowedIPs }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: ip-whitelist
@@ -48,7 +48,7 @@ spec:
     {{- end }}
 {{- end }}
 ---
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: basic-auth

diff --git a/eks/README.adoc b/eks/README.adoc
@@ -83,7 +83,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.2.0"`
+Default: `"v5.0.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -149,6 +149,14 @@ object({
 
 Default: `null`
 
+==== [[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+
+Description: n/a
+
+Type: `bool`
+
+Default: `false`
+
 ==== [[input_retention]] <<input_retention,retention>>
 
 Description: Logs retention period. To deactivate retention, pass 0s.
@@ -238,7 +246,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.2.0"`
+|`"v5.0.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -301,6 +309,12 @@ object({
 |`null`
 |no
 
+|[[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+|n/a
+|`bool`
+|`false`
+|no
+
 |[[input_retention]] <<input_retention,retention>>
 |Logs retention period. To deactivate retention, pass 0s.
 |`string`

diff --git a/eks/main.tf b/eks/main.tf
@@ -10,8 +10,9 @@ module "loki-stack" {
   app_autosync        = var.app_autosync
   dependency_ids      = var.dependency_ids
 
-  retention = var.retention
-  ingress   = var.ingress
+  retention       = var.retention
+  ingress         = var.ingress
+  enable_filebeat = var.enable_filebeat
 
   helm_values = concat(local.helm_values, var.helm_values)
 }
diff --git a/kind/README.adoc b/kind/README.adoc
@@ -85,7 +85,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.2.0"`
+Default: `"v5.0.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -151,6 +151,14 @@ object({
 
 Default: `null`
 
+==== [[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+
+Description: n/a
+
+Type: `bool`
+
+Default: `false`
+
 ==== [[input_retention]] <<input_retention,retention>>
 
 Description: Logs retention period. To deactivate retention, pass 0s.
@@ -242,7 +250,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.2.0"`
+|`"v5.0.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -305,6 +313,12 @@ object({
 |`null`
 |no
 
+|[[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+|n/a
+|`bool`
+|`false`
+|no
+
 |[[input_retention]] <<input_retention,retention>>
 |Logs retention period. To deactivate retention, pass 0s.
 |`string`

diff --git a/kind/main.tf b/kind/main.tf
@@ -10,8 +10,9 @@ module "loki-stack" {
   app_autosync        = var.app_autosync
   dependency_ids      = var.dependency_ids
 
-  retention = var.retention
-  ingress   = var.ingress
+  retention       = var.retention
+  ingress         = var.ingress
+  enable_filebeat = var.enable_filebeat
 
   helm_values = concat(local.helm_values, var.helm_values)
 }
diff --git a/locals.tf b/locals.tf
@@ -164,5 +164,16 @@ locals {
         }]
       }
     }
+    filebeat = {
+      enabled         = var.enable_filebeat
+      extraContainers = <<-EOT
+        - name: filebeat-prometheus-exporter
+          image: "trustpilot/beat-exporter:0.4.0"
+          ports:
+            - containerPort: 9479
+              protocol: TCP
+              name: metrics
+        EOT
+    }
   }]
 }
diff --git a/sks/README.adoc b/sks/README.adoc
@@ -182,7 +182,7 @@ Description: Override of target revision of the application chart.
 
 Type: `string`
 
-Default: `"v5.2.0"`
+Default: `"v5.0.0"`
 
 ==== [[input_namespace]] <<input_namespace,namespace>>
 
@@ -248,6 +248,14 @@ object({
 
 Default: `null`
 
+==== [[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+
+Description: n/a
+
+Type: `bool`
+
+Default: `false`
+
 ==== [[input_retention]] <<input_retention,retention>>
 
 Description: Logs retention period. To deactivate retention, pass 0s.
@@ -350,7 +358,7 @@ object({
 |[[input_target_revision]] <<input_target_revision,target_revision>>
 |Override of target revision of the application chart.
 |`string`
-|`"v5.2.0"`
+|`"v5.0.0"`
 |no
 
 |[[input_namespace]] <<input_namespace,namespace>>
@@ -413,6 +421,12 @@ object({
 |`null`
 |no
 
+|[[input_enable_filebeat]] <<input_enable_filebeat,enable_filebeat>>
+|n/a
+|`bool`
+|`false`
+|no
+
 |[[input_retention]] <<input_retention,retention>>
 |Logs retention period. To deactivate retention, pass 0s.
 |`string`

diff --git a/sks/main.tf b/sks/main.tf
@@ -10,8 +10,9 @@ module "loki-stack" {
   app_autosync        = var.app_autosync
   dependency_ids      = var.dependency_ids
 
-  retention = var.retention
-  ingress   = var.ingress
+  retention       = var.retention
+  ingress         = var.ingress
+  enable_filebeat = var.enable_filebeat
 
   helm_values = concat(local.helm_values, var.helm_values)
 }
diff --git a/variables.tf b/variables.tf
@@ -78,6 +78,12 @@ variable "ingress" {
   default = null
 }
 
+variable "enable_filebeat" {
+  description = "" # TODO
+  type        = bool
+  default     = false
+}
+
 variable "retention" {
   description = "Logs retention period. To deactivate retention, pass 0s."
   type        = string