Skip to content

Commit 891c1a8

Browse files
Include metrics publisher service in deployment
- As it relies on the same template infrastructure the modifications are trivial
1 parent c5bca7a commit 891c1a8

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ on:
4545
- web
4646
- sidekiq
4747
- ops
48+
- metrics
4849
default: all
4950
run_pre_deploy_migrations:
5051
description: Run `pre-deploy` job (schema-migrations) before service deployment.
@@ -103,7 +104,7 @@ jobs:
103104
fail-fast: true
104105
matrix:
105106
service: >-
106-
${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq", "ops"]') ||
107+
${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq", "ops", "metrics"]') ||
107108
fromJSON(format('["{0}"]', inputs.server_types)) }}
108109
env:
109110
repository_name: ${{ matrix.service == 'ops' && 'mavis/ops' || 'mavis/webapp' }}
@@ -328,7 +329,7 @@ jobs:
328329
fail-fast: false
329330
matrix:
330331
service: >-
331-
${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq", "ops"]') ||
332+
${{ inputs.server_types == 'all' && fromJSON('["web", "sidekiq", "ops", "metrics"]') ||
332333
fromJSON(format('["{0}"]', inputs.server_types)) }}
333334
steps:
334335
- name: Configure AWS Credentials

bin/docker-start

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ elif [ "$SERVER_TYPE" == "sidekiq" ]; then
1212
"$BIN_DIR"/prometheus_exporter &
1313
sleep 5
1414
exec "$BIN_DIR"/sidekiq
15-
elif [ "$SERVER_TYPE" == "metric-publisher" ]; then
15+
elif [ "$SERVER_TYPE" == "metrics" ]; then
1616
echo "Starting metrics publisher..."
1717
"$BIN_DIR"/prometheus_exporter skip-server-labels &
1818
sleep 5
@@ -21,6 +21,6 @@ elif [ "$SERVER_TYPE" == "none" ]; then
2121
echo "No server started"
2222
exec tail -f /dev/null # Keep container running
2323
else
24-
echo "SERVER_TYPE variable: '$SERVER_TYPE' unknown. Allowed values: web, sidekiq, metric-publisher, none"
24+
echo "SERVER_TYPE variable: '$SERVER_TYPE' unknown. Allowed values: web, sidekiq, metrics, none"
2525
exit 1
2626
fi

0 commit comments

Comments
 (0)