From 45e31c8f53351afb3272abc4ac774367b1318f1d Mon Sep 17 00:00:00 2001
From: Benn Simon <botieno@ona.io>
Date: Fri, 10 Sep 2021 14:56:31 +0300
Subject: [PATCH] add support for additional sentry configs (#32)

* add support for addtional sentry configs

* remove unused variable
---
 charts/opensrp-server-web/Chart.yaml                  |  4 ++--
 charts/opensrp-server-web/README.md                   |  5 +++++
 charts/opensrp-server-web/templates/_helpers.tpl      | 11 +++++++++++
 .../templates/config/opensrp/_opensrp.properties.tpl  |  6 +++++-
 charts/opensrp-server-web/values.yaml                 |  5 ++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/charts/opensrp-server-web/Chart.yaml b/charts/opensrp-server-web/Chart.yaml
index 7030b93..a7bb0a6 100644
--- a/charts/opensrp-server-web/Chart.yaml
+++ b/charts/opensrp-server-web/Chart.yaml
@@ -18,9 +18,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.10
+version: 0.1.11
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v3.0.2-SNAPSHOT
+appVersion: v3.0.3-SNAPSHOT
diff --git a/charts/opensrp-server-web/README.md b/charts/opensrp-server-web/README.md
index 0b19d9b..f36a9e7 100644
--- a/charts/opensrp-server-web/README.md
+++ b/charts/opensrp-server-web/README.md
@@ -307,3 +307,8 @@ The following table lists the configurable parameters of the Opensrp-server-web
 | `tomcatRemoteIpValve.internalProxies` | `dynamically populated if not specified, control the hostPortion by updating hostOctetPortion e.g for 2 is equivalent to ip/16`  | `nil` |
 | `useTomcatRemoteIpValve` |  | `false` |
 | `commonLabels` |  | `{}` |  
+| `sentry.dsn` |  | `""` |
+| `sentry.environment` |  | `"staging"` |
+| `sentry.minimumEventLevel` |  | `"error"` |
+| `sentry.minimumBreadcrumbLevel` |  | `"info"` |
+| `sentry.tags` |  | `{}` |
diff --git a/charts/opensrp-server-web/templates/_helpers.tpl b/charts/opensrp-server-web/templates/_helpers.tpl
index f019307..8275721 100644
--- a/charts/opensrp-server-web/templates/_helpers.tpl
+++ b/charts/opensrp-server-web/templates/_helpers.tpl
@@ -93,3 +93,14 @@ Find the podCIDRPattern
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/*
+Get sentry tags
+*/}}
+{{- define "opensrp-server-web.sentryTags" }}
+{{- $dynamicTagMap := dict "release-name" .Release.Name -}}
+{{- range $index, $element:=.Values.sentry.tags }}
+{{- $_ := set $dynamicTagMap $index $element -}}
+{{- end }}
+{{- $dynamicTagMap | toJson }}
+{{- end }}
diff --git a/charts/opensrp-server-web/templates/config/opensrp/_opensrp.properties.tpl b/charts/opensrp-server-web/templates/config/opensrp/_opensrp.properties.tpl
index 0a0d9d1..77d75ec 100644
--- a/charts/opensrp-server-web/templates/config/opensrp/_opensrp.properties.tpl
+++ b/charts/opensrp-server-web/templates/config/opensrp/_opensrp.properties.tpl
@@ -96,9 +96,13 @@ rabbitmq.reply.timeout={{ .Values.rabbitmq.reply_timeout }}
 rabbitmq.concurrent.consumers={{ .Values.rabbitmq.concurrent_consumers }}
 rabbitmq.max.concurrent.consumers={{ .Values.rabbitmq.max_concurrent_consumers }}
 
+
 sentry.dsn={{ .Values.sentry.dsn }}
-sentry.release={{ .Values.image.tag }}
+sentry.release={{ .Values.sentry.release | default .Values.image.tag }}
 sentry.environment={{ .Values.sentry.environment }}
+sentry.minimumBreadcrumbLevel={{ .Values.sentry.minimumBreadcrumbLevel }}
+sentry.minimumEventLevel={{ .Values.sentry.minimumEventLevel }}
+sentry.tags={{ include "opensrp-server-web.sentryTags" . }}
 
 {{- range $index, $element:=.Values.oauth_profiles }}
 #OAuth Profile {{ $index }}
diff --git a/charts/opensrp-server-web/values.yaml b/charts/opensrp-server-web/values.yaml
index 1ff9a79..913f24a 100644
--- a/charts/opensrp-server-web/values.yaml
+++ b/charts/opensrp-server-web/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: opensrp/opensrp-server-web
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v2.5.11-SNAPSHOT"
+  tag: "v3.0.3-SNAPSHOT"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -244,3 +244,6 @@ oauth_profiles:
 sentry:
   dsn: ""
   environment: "staging"
+  minimumEventLevel: "error"
+  minimumBreadcrumbLevel: "info"
+  tags: {}