-
Notifications
You must be signed in to change notification settings - Fork 1
issue/64 add env vars to omns-core-init.sh to configure opennms-datas… #80
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.
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
Open
makikorp
wants to merge
4
commits into
main
Choose a base branch
from
issue/64
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f6de64b
issue/64 add env vars to omns-core-init.sh to configure opennms-datas…
makikorp 156ba2c
issue/64 add env vars to omns-core-init.sh to configure opennms-datas…
makikorp 81bd693
issue/64 fix line 84 in onms-core-init.sh for env var OPENNMS_DATABAS…
makikorp 6768575
issue/64 remove section generating the opennms-datasource.xml file fr…
makikorp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,11 @@ | |
| # KAFKA_SASL_USERNAME | ||
| # KAFKA_SECURITY_PROTOCOL | ||
| # OPENNMS_ADMIN_PASS | ||
| # OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT | ||
| # OPENNMS_DATABASE_CONNECTION_LOGINTIMEOUT | ||
| # OPENNMS_DATABASE_CONNECTION_MINPOOL | ||
| # OPENNMS_DATABASE_CONNECTION_MAXPOOL | ||
| # OPENNMS_DATABASE_CONNECTION_MAXSIZE | ||
| # OPENNMS_DBNAME | ||
| # OPENNMS_DBPASS | ||
| # OPENNMS_DBUSER | ||
|
|
@@ -75,7 +79,11 @@ echo "OpenNMS Core Configuration Script..." | |
| command -v rsync >/dev/null 2>&1 || { echo >&2 "rsync is required but it's not installed. Aborting."; exit 1; } | ||
|
|
||
| # Defaults | ||
| OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT="${OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT:-600}" | ||
| OPENNMS_DATABASE_CONNECTION_LOGINTIMEOUT="${OPENNMS_DATABASE_CONNECTION_LOGINTIMEOUT:-3}" | ||
| OPENNMS_DATABASE_CONNECTION_MINPOOL="${OPENNMS_DATABASE_CONNECTION_MINSIZE:-25}" | ||
| OPENNMS_DATABASE_CONNECTION_MAXPOOL="${OPENNMS_DATABASE_CONNECTION_MAXPOOL:-50}" | ||
| OPENNMS_DATABASE_CONNECTION_MAXSIZE="${OPENNMS_DATABASE_CONNECTION_MAXSIZE:-50}" | ||
| OPENNMS_WEB_BASEURL_SCHEME="${OPENNMS_WEB_BASEURL_SCHEME:-https}" | ||
| KAFKA_SASL_MECHANISM="${KAFKA_SASL_MECHANISM:-PLAIN}" | ||
| KAFKA_SECURITY_PROTOCOL="${KAFKA_SECURITY_PROTOCOL:-SASL_PLAINTEXT}" | ||
|
|
@@ -309,11 +317,11 @@ cat <<EOF > ${CONFIG_DIR_OVERLAY}/opennms-datasources.xml | |
| http://www.opennms.org/xsd/config/opennms-datasources.xsd "> | ||
|
|
||
| <connection-pool factory="org.opennms.core.db.HikariCPConnectionFactory" | ||
| idleTimeout="600" | ||
| loginTimeout="3" | ||
| minPool="50" | ||
| idleTimeout="${OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT}" | ||
| loginTimeout="${OPENNMS_DATABASE_CONNECTION_LOGINTIMEOUT}" | ||
| minPool="${OPENNMS_DATABASE_CONNECTION_MINPOOL}" | ||
| maxPool="${OPENNMS_DATABASE_CONNECTION_MAXPOOL}" | ||
| maxSize="50" /> | ||
| maxSize="${OPENNMS_DATABASE_CONNECTION_MAXSIZE}" /> | ||
|
|
||
| <jdbc-data-source name="opennms" | ||
| database-name="${OPENNMS_DBNAME}" | ||
|
|
@@ -331,10 +339,10 @@ cat <<EOF >> ${CONFIG_DIR_OVERLAY}/opennms-datasources.xml | |
| url="jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/template1?sslmode=${POSTGRES_SSL_MODE}&sslfactory=${POSTGRES_SSL_FACTORY}" | ||
| user-name="${POSTGRES_USER}" | ||
| password="${POSTGRES_PASSWORD}"> | ||
| <connection-pool idleTimeout="600" | ||
| minPool="0" | ||
| maxPool="10" | ||
| maxSize="50" /> | ||
| <connection-pool idleTimeout="${OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT}" | ||
| minPool="${OPENNMS_DATABASE_CONNECTION_MINPOOL}" | ||
| maxPool="${OPENNMS_DATABASE_CONNECTION_MAXPOOL}" | ||
| maxSize="${OPENNMS_DATABASE_CONNECTION_MAXSIZE}" /> | ||
| </jdbc-data-source> | ||
|
|
||
| <jdbc-data-source name="opennms-monitor" | ||
|
|
@@ -343,10 +351,10 @@ cat <<EOF >> ${CONFIG_DIR_OVERLAY}/opennms-datasources.xml | |
| url="jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/postgres?sslmode=${POSTGRES_SSL_MODE}&sslfactory=${POSTGRES_SSL_FACTORY}" | ||
| user-name="${POSTGRES_USER}" | ||
| password="${POSTGRES_PASSWORD}"> | ||
| <connection-pool idleTimeout="600" | ||
| minPool="0" | ||
| maxPool="10" | ||
| maxSize="50" /> | ||
| <connection-pool idleTimeout="${OPENNMS_DATABASE_CONNECTION_IDLETIMEOUT}" | ||
| minPool="${OPENNMS_DATABASE_CONNECTION_MINPOOL}" | ||
|
||
| maxPool="${OPENNMS_DATABASE_CONNECTION_MAXPOOL}" | ||
| maxSize="${OPENNMS_DATABASE_CONNECTION_MAXSIZE}" /> | ||
| </jdbc-data-source> | ||
| </datasource-configuration> | ||
| EOF | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
minPoolvalues for template1 and postgres datasources are now set to 25 (from the default), but were previously hardcoded to 0. This changes the behavior of these connection pools and may cause resource consumption issues. Consider using a separate environment variable for these datasources or documenting this breaking change.