From 09f58dc6cb349d82fc0649430c40e58105f297d8 Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 3 Apr 2019 06:24:08 -0400 Subject: [PATCH] set flask app instances to log json in k8s clusters --- deploy/kubernetes/atst-envvars-configmap.yml | 1 + deploy/kubernetes/test/atst-envvars-configmap.yml | 1 + deploy/kubernetes/uat/atst-envvars-configmap.yml | 1 + sample-config/Procfile | 2 -- sample-server/Procfile | 2 ++ {sample-config => sample-server}/nginx.conf | 0 {sample-config => sample-server}/uwsgi.ini | 0 7 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 sample-config/Procfile create mode 100644 sample-server/Procfile rename {sample-config => sample-server}/nginx.conf (100%) rename {sample-config => sample-server}/uwsgi.ini (100%) diff --git a/deploy/kubernetes/atst-envvars-configmap.yml b/deploy/kubernetes/atst-envvars-configmap.yml index 5e5a1fb1..39b09ad3 100644 --- a/deploy/kubernetes/atst-envvars-configmap.yml +++ b/deploy/kubernetes/atst-envvars-configmap.yml @@ -10,3 +10,4 @@ data: OVERRIDE_CONFIG_FULLPATH: /opt/atat/atst/atst-overrides.ini UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi-config.ini CRL_STORAGE_PROVIDER: CLOUDFILES + LOG_JSON: "true" diff --git a/deploy/kubernetes/test/atst-envvars-configmap.yml b/deploy/kubernetes/test/atst-envvars-configmap.yml index 67f1d226..bc82c333 100644 --- a/deploy/kubernetes/test/atst-envvars-configmap.yml +++ b/deploy/kubernetes/test/atst-envvars-configmap.yml @@ -11,3 +11,4 @@ data: UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi-config.ini RQ_QUEUES: atat-test CRL_STORAGE_PROVIDER: CLOUDFILES + LOG_JSON: "true" diff --git a/deploy/kubernetes/uat/atst-envvars-configmap.yml b/deploy/kubernetes/uat/atst-envvars-configmap.yml index e7afea02..7821b5c0 100644 --- a/deploy/kubernetes/uat/atst-envvars-configmap.yml +++ b/deploy/kubernetes/uat/atst-envvars-configmap.yml @@ -11,3 +11,4 @@ data: UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi-config.ini RQ_QUEUES: atat-uat CRL_STORAGE_PROVIDER: CLOUDFILES + LOG_JSON: "true" diff --git a/sample-config/Procfile b/sample-config/Procfile deleted file mode 100644 index c25f1cb2..00000000 --- a/sample-config/Procfile +++ /dev/null @@ -1,2 +0,0 @@ -uwsgi: LOG_JSON=true DEBUG=false uwsgi --ini sample-config/uwsgi.ini -nginx: nginx -c $(pwd)/sample-config/nginx.conf diff --git a/sample-server/Procfile b/sample-server/Procfile new file mode 100644 index 00000000..a03656c7 --- /dev/null +++ b/sample-server/Procfile @@ -0,0 +1,2 @@ +uwsgi: LOG_JSON=true DEBUG=false uwsgi --ini sample-server/uwsgi.ini +nginx: nginx -c $(pwd)/sample-server/nginx.conf diff --git a/sample-config/nginx.conf b/sample-server/nginx.conf similarity index 100% rename from sample-config/nginx.conf rename to sample-server/nginx.conf diff --git a/sample-config/uwsgi.ini b/sample-server/uwsgi.ini similarity index 100% rename from sample-config/uwsgi.ini rename to sample-server/uwsgi.ini