Add sentry to heat

Change-Id: I71b7f229cde4b4a011d7580ce298fbe880630a7c
This commit is contained in:
okozachenko 2020-08-07 21:22:18 +03:00
parent e8559e01c4
commit b55d4548d2
6 changed files with 104 additions and 0 deletions

View File

@ -16,15 +16,18 @@ FROM vexxhost/python-builder AS builder
FROM vexxhost/python-base AS heat-api-base
FROM heat-api-base AS heat-api
COPY heat-wsgi-api /usr/local/bin/heat-wsgi-api
EXPOSE 8004
ENV UWSGI_HTTP_SOCKET=:8004 UWSGI_WSGI_FILE=/usr/local/bin/heat-wsgi-api
CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"]
FROM heat-api-base AS heat-api-cfn
COPY heat-wsgi-api-cfn /usr/local/bin/heat-wsgi-api-cfn
EXPOSE 8000
ENV UWSGI_HTTP_SOCKET=:8000 UWSGI_WSGI_FILE=/usr/local/bin/heat-wsgi-api-cfn
CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"]
FROM heat-api-base AS heat-engine
COPY heat-engine /usr/local/bin/heat-engine
RUN ln -s /usr/local/etc/heat /etc/heat
CMD ["/usr/local/bin/heat-engine"]

32
images/heat/heat-engine Executable file
View File

@ -0,0 +1,32 @@
#!/usr/local/bin/python
# Copyright (c) 2020 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import pkg_resources
import re
import sys
import sentry_sdk
from heat.cmd.engine import main
VERSION = pkg_resources.get_distribution("openstack-heat").version
sentry_sdk.init(
release="openstack-heat@%s" % VERSION,
traces_sample_rate=0.1
)
if __name__ == '__main__':
sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
sys.exit(main())

32
images/heat/heat-wsgi-api Executable file
View File

@ -0,0 +1,32 @@
#!/usr/local/bin/python
# Copyright (c) 2020 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import pkg_resources
import sentry_sdk
from heat.httpd.heat_api import init_application
from sentry_sdk.integrations import wsgi
VERSION = pkg_resources.get_distribution("openstack-heat").version
sentry_sdk.init(
release="openstack-heat@%s" % VERSION,
traces_sample_rate=0.1
)
application = init_application()
application = wsgi.SentryWsgiMiddleware(application)

32
images/heat/heat-wsgi-api-cfn Executable file
View File

@ -0,0 +1,32 @@
#!/usr/local/bin/python
# Copyright (c) 2020 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import pkg_resources
import sentry_sdk
from heat.httpd.heat_api_cfn import init_application
from sentry_sdk.integrations import wsgi
VERSION = pkg_resources.get_distribution("openstack-heat").version
sentry_sdk.init(
release="openstack-heat@%s" % VERSION,
traces_sample_rate=0.1
)
application = init_application()
application = wsgi.SentryWsgiMiddleware(application)

View File

@ -1,4 +1,5 @@
uWSGI
python-memcached
PyMySQL
sentry-sdk
git+https://opendev.org/openstack/heat@stable/ussuri

View File

@ -70,6 +70,10 @@ spec:
image: vexxhost/heat-{{ component }}:latest
imagePullPolicy: Always
env:
{% if 'sentryDSN' in spec %}
- name: SENTRY_DSN
value: {{ spec.sentryDSN }}
{% endif %}
- name: OS_DEFAULT__HOST
valueFrom:
fieldRef: