Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ApplicationInsights for Cromwell #259

Closed
wants to merge 9 commits into from
Binary file added charts/cromwell-0.2.240.tgz
Binary file not shown.
Binary file added charts/cromwell-0.2.241.tgz
Binary file not shown.
Binary file added charts/cromwell-on-azure-0.2.240.tgz
Binary file not shown.
Binary file added charts/cromwell-on-azure-0.2.241.tgz
Binary file not shown.
742 changes: 401 additions & 341 deletions charts/index.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion coa-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: cromwell-on-azure
description: A cromwell deployment designed to run on Azure with Postgres.
version: 0.2.239
version: 0.2.241
apiVersion: v2
dependencies:
- name: terra-batch-libchart
Expand Down
45 changes: 43 additions & 2 deletions coa-helm/templates/cromwell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,16 @@ spec:
{{ include "coa-helm.labels" $ | nindent 8 }}
spec:
containers:
- args:
- java -Djava.io.tmpdir=/cromwell-tmp/ -Dconfig.file=/configuration/cromwell/cromwell-application.conf -jar /app/cromwell.jar server
- env:
- name: APPLICATIONINSIGHTS_CONNECTION_STRING
value: {{ .Values.config.applicationInsightsConnectionString | quote }}
args:
- java
-Djava.io.tmpdir=/cromwell-tmp/
-Dconfig.file=/configuration/cromwell/cromwell-application.conf
-Dlogback.configurationFile=/configuration/cromwell/logback.xml
-jar /app/cromwell.jar
server
command:
- /bin/sh
- -c
Expand Down Expand Up @@ -58,6 +66,39 @@ status:
{{ end }}
{{ define "coa-helm.cromwell-config" }}
data:
logback.xml: |-
<configuration>
<!-- Enhanced thread and date reporting. -->
<conversionRule
conversionWord="et"
converterClass="cromwell.core.logging.EnhancedThreadConverter"
/>
<conversionRule
conversionWord="ed"
converterClass="cromwell.core.logging.EnhancedDateConverter"
/>

<!-- We are sending logs to ApplicationInsights, no need to print them to console as well. -->
<appender name="NOP_APPENDER" class="ch.qos.logback.core.helpers.NOPAppender">
<encoder>
<pattern>%ed{yyyy-MM-dd HH:mm:ss,SSS} %et %-5level - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="NOP_APPENDER" />
</root>

<logger name="liquibase" level="WARN"/>
<logger name="com.zaxxer.hikari" level="ERROR"/>
<logger name="HikariPool" level="ERROR"/>
<logger name="com.google.cloud.hadoop.gcsio.GoogleCloudStorageReadChannel" level="ERROR"/>
<logger name="org.semanticweb.owlapi.utilities.Injector" level="ERROR"/>

<!-- Guilty of logging ERROR under non-erroneous conditions -->
<logger name="com.azure.storage.blob.nio" level="OFF"/>
</configuration>

cromwell-application.conf: |-
include required(classpath("application"))

Expand Down
2 changes: 1 addition & 1 deletion cromwell-helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.2.239
version: 0.2.241

dependencies:
- name: terra-batch-libchart
Expand Down
6 changes: 3 additions & 3 deletions terra-batch-libchart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ exports:
common:
cromwell:
name: coa-cromwell-svc
image: broadinstitute/cromwell:86-90af36d
image: broadinstitute/cromwell:86-b9e9d97
port: 8000
enabled: true

Expand All @@ -19,7 +19,7 @@ exports:
# repo as the GitHub workflow looks in this file to automatically update the image version
cbasUI:
name: cbas-ui
image: us.gcr.io/broad-dsp-gcr-public/cbas-ui:0.0.120
image: us.gcr.io/broad-dsp-gcr-public/cbas-ui:0.0.121
conf_file: config.json
conf_dir: /usr/share/nginx/html
enabled: true
Expand All @@ -28,7 +28,7 @@ exports:
# repo as the GitHub workflow looks in this file to automatically update the image version
cbas:
name: cbas
image: us.gcr.io/broad-dsp-gcr-public/cbas:0.0.123
image: us.gcr.io/broad-dsp-gcr-public/cbas:0.0.124
conf_dir: /etc/conf
conf_file: cbas.yaml
enabled: true
Expand Down