adding datadog.logProcessingRules

charts/dvpe-deployment-gloo/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
+## [4.9.0]
+### Added
+- `datadog.logProcessingRules` has been added, so that it's now possible to filter logs before sending them to Datadog.
+
 ## [4.8.0]
 ### Removed
 - `gloo.namespace` has been removed, since all gloo-resources are now deployed in the release-namespace.
@@ -74,7 +78,7 @@ From Version 4.0.0 of `dvpe-deployment-gloo` onwards the ExternalSecrets are swi
 The Kubernetes secrets deployment has changed and will generate new Kubernetes Resource Kinds (external-secrets.io/v1beta1).
 
 INFO: To use the 4.0.0 Version you need an AWS SecretStore in **your** AWS account.
-The ExternalSecretStore reference will generated on Namespace generation by WADTFY automatism. 
+The ExternalSecretStore reference will be generated on Namespace generation by WADTFY automatism. 
 
 * Parameter changes
   - removed `externalSecrets.service.roleArn` (not required anymore with new SecretStores per Namespace)
@@ -91,7 +95,7 @@ The ExternalSecretStore reference will generated on Namespace generation by WADT
 
 ## [3.2.2]
 ### Added
-* possibility to reference a additional (global) configmap with parameter additionalparameter.customConfigMapReference to application container
+* possibility to reference an additional (global) configmap with parameter additionalparameter.customConfigMapReference to application container
 
 ## [3.2.1]
 ### Added
@@ -288,8 +292,8 @@ The ExternalSecretStore reference will generated on Namespace generation by WADT
 
 * Added support for CORS configuration of Gloo virtual services (`gloo.virtualservice.spec.virtualHost.cors`) according to [Gloo documentation: CORS](https://docs.solo.io/gloo-edge/latest/guides/security/cors/).
 * K8S Secrets conaining the oauth client secrets for OIDC (known as `webeam-oidc` secrets) can now be generated by helm as [`ExternalSecret`](https://github.com/external-secrets/kubernetes-external-secrets) referencing to AWS secrets manager secrets.
-* Added HTTP to HTTPS redirect by means of Gloo (see [Gloo documentation: HTTPS Redirect](https://docs.solo.io/gloo-edge/latest/guides/traffic_management/request_processing/https_redirect/)). This is done automatically for all deployments which have either a `gloo.virtualservice.spec.virtualHost.routes.callbackUrlPath` configured or `.Values.gloo.virtualservice.spec.virtualHost.routes.swagger.enabled` set to `true`. Such deployments are treated as user interfaces (or documentation interface) where a HTTP to HTTPS redirect should be provided for user convenience. In case of `...swagger.enabled` the redirect is limited to the paths defined as `...swagger.path` and `...swagger.alternativePath`.
-* Added `gloo.authConfig.spec.configs.oauth.cookie_domain` to provide a domain to be used for authentication cookies (`it_token` and `access_token`). This value is required for UI services which execute cross origin requests to other services hosted by the platform - e.g. UI and its backend are hosted as separate services.
+* Added HTTP to HTTPS redirect by means of Gloo (see [Gloo documentation: HTTPS Redirect](https://docs.solo.io/gloo-edge/latest/guides/traffic_management/request_processing/https_redirect/)). This is done automatically for all deployments which have either a `gloo.virtualservice.spec.virtualHost.routes.callbackUrlPath` configured or `.Values.gloo.virtualservice.spec.virtualHost.routes.swagger.enabled` set to `true`. Such deployments are treated as user interfaces (or documentation interface) where an HTTP to HTTPS redirect should be provided for user convenience. In case of `...swagger.enabled` the redirect is limited to the paths defined as `...swagger.path` and `...swagger.alternativePath`.
+* Added `gloo.authConfig.spec.configs.oauth.cookie_domain` to provide a domain to be used for authentication cookies (`it_token` and `access_token`). This value is required for UI services which execute cross-origin requests to other services hosted by the platform - e.g. UI and its backend are hosted as separate services.
 * Extended the generated `VirtualService` K8S Resources for Gloo by `sniDomains` (see [Serving certificates for multiple virtual hosts with SNI](https://docs.solo.io/gloo-edge/latest/guides/security/tls/server_tls/#serving-certificates-for-multiple-virtual-hosts-with-sni)).
 
 ### Removed
@@ -408,3 +412,4 @@ The ExternalSecretStore reference will generated on Namespace generation by WADT
 [4.7.3]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.7.3/charts/dvpe-deployment-gloo
 [4.7.4]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.7.4/charts/dvpe-deployment-gloo
 [4.8.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.8.0/charts/dvpe-deployment-gloo
+[4.9.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.9.0/charts/dvpe-deployment-gloo

charts/dvpe-deployment-gloo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.1"
 description: Helm chart for installing microservices as gloo enabled VirtualService definitions.
 name: dvpe-deployment-gloo
-version: 4.8.0
+version: 4.9.0
 home: https://github.com/dvpe-cloud/dvpe-helm
 keywords:
   - dvpe-helm

charts/dvpe-deployment-gloo/templates/deployment.yaml

@@ -33,7 +33,13 @@ spec:
         {{- end }}
       annotations:
         {{- if $.Values.datadog.enabled }}
-        ad.datadoghq.com/{{ $serviceName }}.logs: '[{"source":"{{ $.Values.datadog.source }}", "service":"{{ $serviceName }}" }]'
+        ad.datadoghq.com/{{ $serviceName }}.logs: '[{
+          "source": "{{ $.Values.datadog.source }}",
+          "service": "{{ $serviceName }}"
+          {{- if $.Values.datadog.logProcessingRules }},
+          "log_processing_rules": [{{ $.Values.datadog.logProcessingRules | toJson }}]
+          {{- end }}
+          }]'
         ad.datadoghq.com/{{ $serviceName }}.tags: '{"team": "{{ $.Values.datadog.team }}"}'
         {{- end}}
         {{- if $.Values.deployment.podAnnotations }}

charts/dvpe-deployment-gloo/values.yaml

@@ -337,6 +337,8 @@ datadog:
   # datadog.version -- Label in Datadog for the service version. If undefined, the value of `deployment.spec.image.tag` is used.
   # This value should not be set by ordinary deployments. It is intended for special cases (e.g. CI triggered deployments).
   version:
+  ## datadog.logProcessingRules -- Yaml to add as log processing rules to fulter logs: see https://docs.datadoghq.com/agent/logs/advanced_log_collection/?tab=kubernetes#filter-logs
+  logProcessingRules:
 
 # -------------------------------------#
 # Istio value section                  #