Commit 7acb52cf authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Merge branch 'new-dev-cluster' into 'v0.10.0'

Adapted ci for new dev cluster.

See merge request !257
parents e16e1a25 2554b2e3
Pipeline #93052 passed with stages
in 43 minutes and 20 seconds
...@@ -162,9 +162,9 @@ deploy dev: ...@@ -162,9 +162,9 @@ deploy dev:
script: script:
- RELEASE_NAME=`echo ${CI_COMMIT_REF_NAME} | sed -e 's/[^A-Za-z0-9\-]/-/g'` - RELEASE_NAME=`echo ${CI_COMMIT_REF_NAME} | sed -e 's/[^A-Za-z0-9\-]/-/g'`
- helm dependency update ops/helm/nomad - helm dependency update ops/helm/nomad
- helm upgrade --namespace nomad --install $RELEASE_NAME ops/helm/nomad -f ops/helm/nomad/deployments/dev-values.yaml --set proxy.external.path=/dev/nomad/$RELEASE_NAME,image.tag=$CI_COMMIT_REF_NAME,roll=true --wait - helm upgrade --namespace nomad --install $RELEASE_NAME ops/helm/nomad -f ops/helm/nomad/deployments/dev-values.yaml --set proxy.external.path=/dev/rae/$RELEASE_NAME,image.tag=$CI_COMMIT_REF_NAME,roll=true --wait
- docker pull $TEST_IMAGE - docker pull $TEST_IMAGE
- docker run -t -e NOMAD_KEYCLOAK_REALM_NAME=fairdi_nomad_prod $TEST_IMAGE python -m nomad.cli client -n https://nomad-lab.eu/dev/nomad/$RELEASE_NAME/api -u test -w $CI_NOMAD_TEST_PASSWORD integrationtests --skip-publish --skip-doi - docker run -t -e NOMAD_KEYCLOAK_REALM_NAME=fairdi_nomad_prod $TEST_IMAGE python -m nomad.cli client -n https://nomad-lab.eu/dev/rae/$RELEASE_NAME/api -u test -w $CI_NOMAD_TEST_PASSWORD integrationtests --skip-publish --skip-doi
except: except:
- /^dev-.*$/ - /^dev-.*$/
when: manual when: manual
......
...@@ -176,10 +176,13 @@ class LogstashFormatter(logstash.formatter.LogstashFormatterBase): ...@@ -176,10 +176,13 @@ class LogstashFormatter(logstash.formatter.LogstashFormatterBase):
args = getattr(record, 'args', None) args = getattr(record, 'args', None)
if args is not None and len(args) == 5: if args is not None and len(args) == 5:
_, method, path_w_query, _, status_code = args _, method, path_w_query, _, status_code = args
path, query_string = path_w_query.split('?', 1) path_w_query_components = path_w_query.split('?', 1)
path = path_w_query_components[0]
if len(path_w_query_components) == 2:
query_string = path_w_query_components[1]
message['uvicorn.query_string'] = query_string
message['uvicorn.method'] = method message['uvicorn.method'] = method
message['uvicorn.path'] = path message['uvicorn.path'] = path
message['uvicorn.query_string'] = query_string
message['uvicorn.status_code'] = status_code message['uvicorn.status_code'] = status_code
else: else:
# Add extra fields # Add extra fields
......
...@@ -16,13 +16,13 @@ worker: ...@@ -16,13 +16,13 @@ worker:
routing: "queue" routing: "queue"
elastic: elastic:
host: elastic host: elasticsearch.elasticsearch.svc.cluster.local
mongo: mongo:
host: mongo host: rs0/mongodb-0.mongo.mongodb.svc.cluster.local,mongodb-1.mongo.mongodb.svc.cluster.local,mongodb-2.mongo.mongodb.svc.cluster.local
logstash: logstash:
host: logstash host: logstash.elk.svc.cluster.local
dbname: nomad_dev_v0_8 dbname: nomad_dev_v0_8
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment