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.

Sign up for GitHub

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

Jump to bottom

OZ-546: Expose EIP and OpenMRS metrics endpoints #92

Closed
wants to merge 1 commit into from
Closed

OZ-546: Expose EIP and OpenMRS metrics endpoints #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ OPENMRS_PASSWORD=Admin123
OPENMRS_DB_HOST=mysql
OPENMRS_DB_PORT=3306
OPENMRS_DB_NAME=openmrs
OMRS_JAVA_SERVER_OPTS=-Xms512m -Xmx1024m -javaagent:/monitoring/jmx_prometheus_javaagent-0.20.0.jar=8088:/monitoring/prometheus-jmx-config.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, the JAR file name should not contain the version number.

OPENMRS_JMX_PATH=

#
# OpenMRS frontend
Expand Down
2 changes: 2 additions & 0 deletions docker-compose-odoo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ services:
volumes:
- "${EIP_ODOO_OPENMRS_ROUTES_PATH}:/eip-client/routes"
- eip-home-odoo:/eip-home
ports:
- "9080:8080"

postgresql:
environment:
Expand Down
3 changes: 3 additions & 0 deletions docker-compose-openmrs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
OMRS_CONFIG_CONNECTION_DATABASE: openmrs
OMRS_CONFIG_CONNECTION_USERNAME: ${OPENMRS_DB_USER:-openmrs}
OMRS_CONFIG_CONNECTION_PASSWORD: ${OPENMRS_DB_PASSWORD:-openmrs}
OMRS_JAVA_SERVER_OPTS: ${OMRS_JAVA_SERVER_OPTS}
HOST_URL: https://${O3_HOSTNAME}
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:8080/openmrs/health/started" ]
Expand Down Expand Up @@ -43,6 +44,8 @@ services:
- "${OPENMRS_CONFIG_PATH:-openmrs-config}:/openmrs/distribution/openmrs_config/"
- "${OPENMRS_CONFIG_CHECKSUMS_PATH:-openmrs-config-checksums}:/openmrs/data/configuration_checksums"
- "${OPENMRS_PROPERTIES_PATH}:/etc/properties/"
ports:
- "${JMX_EXPORTER_PORT:-8088}:8088"

# OpenMRS 3 Frontend
frontend:
Expand Down
2 changes: 2 additions & 0 deletions docker-compose-senaite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ services:
volumes:
- "${EIP_OPENMRS_SENAITE_ROUTES_PATH}:/eip-client/routes"
- eip-home-senaite:/eip-home
ports:
- "9081:8080"

mysql:
environment:
Expand Down
2 changes: 2 additions & 0 deletions scripts/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function exportPaths () {
export OPENMRS_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/initializer_config
export OPENMRS_PROPERTIES_PATH=$DISTRO_PATH/configs/openmrs/properties
export OPENMRS_MODULES_PATH=$DISTRO_PATH/binaries/openmrs/modules
export OPENMRS_JMX_PATH=$DISTRO_PATH/binaries/monitoring
export SPA_PATH=/openmrs/spa
export SENAITE_CONFIG_PATH=$DISTRO_PATH/configs/senaite/initializer_config
export ODOO_EXTRA_ADDONS=$DISTRO_PATH/binaries/odoo/addons
Expand All @@ -40,6 +41,7 @@ function exportPaths () {
echo "→ OPENMRS_CONFIG_PATH=$OPENMRS_CONFIG_PATH"
echo "→ OPENMRS_PROPERTIES_PATH=$OPENMRS_PROPERTIES_PATH"
echo "→ OPENMRS_MODULES_PATH=$OPENMRS_MODULES_PATH"
echo "→ OPENMRS_JMX_PATH=$OPENMRS_JMX_PATH"
echo "→ SPA_PATH=$SPA_PATH"
echo "→ SENAITE_CONFIG_PATH=$SENAITE_CONFIG_PATH"
echo "→ ODOO_EXTRA_ADDONS=$ODOO_EXTRA_ADDONS"
Expand Down