Skip to content

Commit

Permalink
Add and Adapt configuration for EI 3.0 in Eiffel bundle. (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tobiasake
tobiasake authored Jan 16, 2020
1 parent 26d295c commit 935ea60
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 121 deletions.
4 changes: 2 additions & 2 deletions bundles/Eiffel/component-versions.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# Eiffel Component versions
export EIFFEL_MONGODB_VERSION=4.0.14
export EIFFEL_RABBITMQ_VERSION=3.8.2
export EIFFEL_EI_BACKEND_VERSION=2.0.1
export EIFFEL_EI_FRONTEND_VERSION=2.0.0
export EIFFEL_EI_BACKEND_VERSION=3.0.0
export EIFFEL_EI_FRONTEND_VERSION=3.0.0
export EIFFEL_VICI_VERSION=0.0.1
export EIFFEL_DUMMY_ER_VERSION=latest
export EIFFEL_ER_VERSION=2.0.19
Expand Down
224 changes: 105 additions & 119 deletions bundles/Eiffel/components-configuration.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,13 @@ export EIFFEL_EI_AGGREGATED_OBJECT_NAME=aggregatedObject
export EIFFEL_EI_RABBITMQ_CONSUMER_NAME=messageConsumer
export EIFFEL_EI_RABBITMQ_TLS_VERSION=
export EIFFEL_EI_RABBITMQ_QUEUE_DURABLE=true
export EIFFEL_EI_MERGE_ID_MAKER=%IdentifyRules%
export EIFFEL_EI_MERGE_ID_MAKER=%IdentifyRulesEventId%
export EIFFEL_EI_AGGREGATED_DB_TTL=

# Common RemRem configurations
export EIFFEL_REMREM_USER=guest
export EIFFEL_REMREM_PASSWORD=guest

## Common Eiffel configurations

export EIFFEL_EI_SEARCH_QUERY_PREFIX=object
export EIFFEL_EI_AGGREGATED_OBJECT_NAME=aggregatedObject


################################################################

Expand All @@ -100,7 +95,6 @@ ei.frontend.service.port=${EIFFEL_EI_FRONTEND_EXTERNAL_APPLICATION_PORT}
ei.frontend.context.path=
ei.use.secure.http.frontend=false
ei.backend.instances.list.json.content=${EIFFEL_EI_FRONTEND_EI_INSTANCES_LIST}
ei.backend.instances.filepath=/tmp/eiInstancesListFile.json
logging.level.root=ERROR
logging.level.org.springframework.web=DEBUG
logging.level.com.ericsson.ei=DEBUG"
Expand All @@ -122,46 +116,44 @@ export DOCKER_CONFIG_EIFFEL_EI_FRONTEND=$CONFIG_EIFFEL_EI_FRONTEND_WITHOUT_COMMA

## General format for both Docker and K8S
export CONFIG_EIFFEL_EI_BACKEND_ALLEVENTS="
SpringApplicationName=${EIFFEL_EI_BACKEND_ALLEVENTS}
spring.application.name=${EIFFEL_EI_BACKEND_ALLEVENTS}
server.port=${EIFFEL_EI_BACKEND_ALLEVENTS_INTERNAL_PORT}
rules.path=/rules/AllEventsRules-Eiffel-Agen-Version.json
rabbitmq.domainId=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.componentName=eiffelintelligence-allevents
rules.replacement.marker=${EIFFEL_EI_MERGE_ID_MAKER}
test.aggregation.enabled=false
rabbitmq.domain.id=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.component.name=eiffelintelligence-allevents
rabbitmq.waitlist.queue.suffix=waitlist-allevents
rabbitmq.host=${EIFFEL_RABBITMQ}
rabbitmq.port=${EIFFEL_RABBITMQ_AMQP_APPLICATION_PORT}
rabbitmq.exchange.name=${EIFFEL_RABBITMQ_EXCHANGE}
rabbitmq.consumerName=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.suffix=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.durable=${EIFFEL_EI_RABBITMQ_QUEUE_DURABLE}
rabbitmq.tlsVersion=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.tls.version=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.user=${EIFFEL_RABBITMQ_USER}
rabbitmq.password=${EIFFEL_RABBITMQ_PASSWORD}
mergeidmarker=${EIFFEL_EI_MERGE_ID_MAKER}
spring.data.mongodb.host=${EIFFEL_MONGODB}
spring.data.mongodb.port=${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.uri=mongodb://${EIFFEL_MONGODB}:${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.database=eiffel_intelligence-allevents
missedNotificationDataBaseName=eiffel_intelligence-allevents_MissedNotification
missedNotificationCollectionName=Notification
aggregated.object.name=aggregatedObject
aggregated.collection.name=aggregated_objects
aggregated.collection.ttlValue=${EIFFEL_EI_AGGREGATED_DB_TTL}
event_object_map.collection.name=event_object_map
server.session.timeout=1200
sessions.collection.name=sessions
failed.notifications.collection.name=Notification
failed.notifications.collection.ttl=600
aggregations.collection.name=aggregated_objects
aggregations.collection.ttl=${EIFFEL_EI_AGGREGATED_DB_TTL}
event.object.map.collection.name=event_object_map
waitlist.collection.name=wait_list
waitlist.collection.ttlValue=600
waitlist.initialDelayResend=2000
waitlist.fixedRateResend=15000
subscription.collection.name=subscription
subscription.collection.repeatFlagHandlerName=subscription_repeat_handler
testaggregated.enabled=false
threads.corePoolSize=100
threads.queueCapacity=5000
threads.maxPoolSize=150
search.query.prefix=${EIFFEL_EI_SEARCH_QUERY_PREFIX}
aggregated.object.name=${EIFFEL_EI_AGGREGATED_OBJECT_NAME}
waitlist.collection.ttl=600
waitlist.resend.initial.delay=2000
waitlist.resend.fixed.rate=15000
subscriptions.collection.name=subscription
subscriptions.repeat.handler.collection.name=subscription_repeat_handler
threads.core.pool.size=100
threads.queue.capacity=5000
threads.max.pool.size=150
scheduled.threadpool.size=100
[email protected]
email.subject=Email Subscription Notification
notification.failAttempt=3
notification.ttl.value=600
notification.retry=3
spring.mail.host=${MAIL_HOST}
spring.mail.port=${MAIL_PORT}
spring.mail.username=${MAIL_USER}
Expand All @@ -170,7 +162,7 @@ spring.mail.properties.mail.smtp.auth=${MAIL_PROPERTIES_AUTH_ENABLE}
spring.mail.properties.mail.smtp.starttls.enable=${MAIL_PROPERTIES_STARTTLS_ENABLE}
ldap.enabled=false
ldap.server.list=
er.url=${EIFFEL_ER_SEARCH_URL}
event.repository.url=${EIFFEL_ER_SEARCH_URL}
logging.level.root=ERROR
logging.level.org.springframework.web=DEBUG
logging.level.com.ericsson.ei=DEBUG"
Expand All @@ -193,46 +185,44 @@ WAIT_DB_HOSTS=$EIFFEL_MONGODB:${EIFFEL_MONGODB_APPLICATION_PORT}"

## General format for both Docker and K8S
export CONFIG_EIFFEL_EI_BACKEND_ARTIFACT="
SpringApplicationName=${EIFFEL_EI_BACKEND_ARTIFACT}
spring.application.name=${EIFFEL_EI_BACKEND_ARTIFACT}
server.port=${EIFFEL_EI_BACKEND_ARTIFACT_INTERNAL_PORT}
rules.path=/rules/ArtifactRules-Eiffel-Agen-Version.json
rabbitmq.domainId=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.componentName=eiffelintelligence-artifact
rules.replacement.marker=${EIFFEL_EI_MERGE_ID_MAKER}
test.aggregation.enabled=false
rabbitmq.domain.id=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.component.name=eiffelintelligence-artifact
rabbitmq.waitlist.queue.suffix=waitlist-artifact
rabbitmq.host=${EIFFEL_RABBITMQ}
rabbitmq.port=${EIFFEL_RABBITMQ_AMQP_APPLICATION_PORT}
rabbitmq.exchange.name=${EIFFEL_RABBITMQ_EXCHANGE}
rabbitmq.consumerName=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.suffix=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.durable=${EIFFEL_EI_RABBITMQ_QUEUE_DURABLE}
rabbitmq.tlsVersion=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.tls.version=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.user=${EIFFEL_RABBITMQ_USER}
rabbitmq.password=${EIFFEL_RABBITMQ_PASSWORD}
mergeidmarker=${EIFFEL_EI_MERGE_ID_MAKER}
spring.data.mongodb.host=${EIFFEL_MONGODB}
spring.data.mongodb.port=${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.uri=mongodb://${EIFFEL_MONGODB}:${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.database=eiffel_intelligence-artifact
missedNotificationDataBaseName=eiffel_intelligence-artifact_MissedNotification
missedNotificationCollectionName=Notification
aggregated.object.name=aggregatedObject
aggregated.collection.name=aggregated_objects
aggregated.collection.ttlValue=${EIFFEL_EI_AGGREGATED_DB_TTL}
event_object_map.collection.name=event_object_map
server.session.timeout=1200
sessions.collection.name=sessions
failed.notifications.collection.name=Notification
failed.notifications.collection.ttl=600
aggregations.collection.name=aggregated_objects
aggregations.collection.ttl=${EIFFEL_EI_AGGREGATED_DB_TTL}
event.object.map.collection.name=event_object_map
waitlist.collection.name=wait_list
waitlist.collection.ttlValue=600
waitlist.initialDelayResend=2000
waitlist.fixedRateResend=15000
subscription.collection.name=subscription
subscription.collection.repeatFlagHandlerName=subscription_repeat_handler
testaggregated.enabled=false
threads.corePoolSize=100
threads.queueCapacity=5000
threads.maxPoolSize=150
search.query.prefix=${EIFFEL_EI_SEARCH_QUERY_PREFIX}
aggregated.object.name=${EIFFEL_EI_AGGREGATED_OBJECT_NAME}
waitlist.collection.ttl=600
waitlist.resend.initial.delay=2000
waitlist.resend.fixed.rate=15000
subscriptions.collection.name=subscription
subscriptions.repeat.handler.collection.name=subscription_repeat_handler
threads.core.pool.size=100
threads.queue.capacity=5000
threads.max.pool.size=150
scheduled.threadpool.size=100
[email protected]
email.subject=Email Subscription Notification
notification.failAttempt=3
notification.ttl.value=600
notification.retry=3
spring.mail.host=${MAIL_HOST}
spring.mail.port=${MAIL_PORT}
spring.mail.username=${MAIL_USER}
Expand All @@ -241,7 +231,7 @@ spring.mail.properties.mail.smtp.auth=${MAIL_PROPERTIES_AUTH_ENABLE}
spring.mail.properties.mail.smtp.starttls.enable=${MAIL_PROPERTIES_STARTTLS_ENABLE}
ldap.enabled=false
ldap.server.list=
er.url=${EIFFEL_ER_SEARCH_URL}
event.repository.url=${EIFFEL_ER_SEARCH_URL}
logging.level.root=ERROR
logging.level.org.springframework.web=DEBUG
logging.level.com.ericsson.ei=DEBUG"
Expand All @@ -265,46 +255,44 @@ WAIT_DB_HOSTS=$EIFFEL_MONGODB:${EIFFEL_MONGODB_APPLICATION_PORT}"

## General format for both Docker and K8S
export CONFIG_EIFFEL_EI_BACKEND_TESTEXECUTION="
SpringApplicationName=${EIFFEL_EI_BACKEND_TESTEXECUTION}
spring.application.name=${EIFFEL_EI_BACKEND_TESTEXECUTION}
server.port=${EIFFEL_EI_BACKEND_TESTEXECUTION_INTERNAL_PORT}
rules.path=/rules/TestExecutionObjectRules-Eiffel-Agen-Version.json
rabbitmq.domainId=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.componentName=eiffelintelligence-testexecution
rules.replacement.marker=${EIFFEL_EI_MERGE_ID_MAKER}
test.aggregation.enabled=false
rabbitmq.domain.id=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.component.name=eiffelintelligence-testexecution
rabbitmq.waitlist.queue.suffix=waitlist-testexecution
rabbitmq.host=${EIFFEL_RABBITMQ}
rabbitmq.port=${EIFFEL_RABBITMQ_AMQP_APPLICATION_PORT}
rabbitmq.exchange.name=${EIFFEL_RABBITMQ_EXCHANGE}
rabbitmq.consumerName=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.suffix=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.durable=${EIFFEL_EI_RABBITMQ_QUEUE_DURABLE}
rabbitmq.tlsVersion=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.tls.version=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.user=${EIFFEL_RABBITMQ_USER}
rabbitmq.password=${EIFFEL_RABBITMQ_PASSWORD}
mergeidmarker=${EIFFEL_EI_MERGE_ID_MAKER}
spring.data.mongodb.host=${EIFFEL_MONGODB}
spring.data.mongodb.port=${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.uri=mongodb://${EIFFEL_MONGODB}:${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.database=eiffel_intelligence-testexecution
missedNotificationDataBaseName=eiffel_intelligence-testexecution_MissedNotification
missedNotificationCollectionName=Notification
aggregated.object.name=aggregatedObject
aggregated.collection.name=aggregated_objects
aggregated.collection.ttlValue=${EIFFEL_EI_AGGREGATED_DB_TTL}
event_object_map.collection.name=event_object_map
server.session.timeout=1200
sessions.collection.name=sessions
failed.notifications.collection.name=Notification
failed.notifications.collection.ttl=600
aggregations.collection.name=aggregated_objects
aggregations.collection.ttl=${EIFFEL_EI_AGGREGATED_DB_TTL}
event.object.map.collection.name=event_object_map
waitlist.collection.name=wait_list
waitlist.collection.ttlValue=600
waitlist.initialDelayResend=2000
waitlist.fixedRateResend=15000
subscription.collection.name=subscription
subscription.collection.repeatFlagHandlerName=subscription_repeat_handler
testaggregated.enabled=false
threads.corePoolSize=100
threads.queueCapacity=5000
threads.maxPoolSize=150
search.query.prefix=${EIFFEL_EI_SEARCH_QUERY_PREFIX}
aggregated.object.name=${EIFFEL_EI_AGGREGATED_OBJECT_NAME}
waitlist.collection.ttl=600
waitlist.resend.initial.delay=2000
waitlist.resend.fixed.rate=15000
subscriptions.collection.name=subscription
subscriptions.repeat.handler.collection.name=subscription_repeat_handler
threads.core.pool.size=100
threads.queue.capacity=5000
threads.max.pool.size=150
scheduled.threadpool.size=100
[email protected]
email.subject=Email Subscription Notification
notification.failAttempt=3
notification.ttl.value=600
notification.retry=3
spring.mail.host=${MAIL_HOST}
spring.mail.port=${MAIL_PORT}
spring.mail.username=${MAIL_USER}
Expand All @@ -313,7 +301,7 @@ spring.mail.properties.mail.smtp.auth=${MAIL_PROPERTIES_AUTH_ENABLE}
spring.mail.properties.mail.smtp.starttls.enable=${MAIL_PROPERTIES_STARTTLS_ENABLE}
ldap.enabled=false
ldap.server.list=
er.url=${EIFFEL_ER_SEARCH_URL}
event.repository.url=${EIFFEL_ER_SEARCH_URL}
logging.level.root=ERROR
logging.level.org.springframework.web=DEBUG
logging.level.com.ericsson.ei=DEBUG"
Expand All @@ -337,46 +325,44 @@ WAIT_DB_HOSTS=$EIFFEL_MONGODB:${EIFFEL_MONGODB_APPLICATION_PORT}"

## General format for both Docker and K8S
export CONFIG_EIFFEL_EI_BACKEND_SOURCECHANGE="
SpringApplicationName=${EIFFEL_EI_BACKEND_SOURCECHANGE}
spring.application.name=${EIFFEL_EI_BACKEND_SOURCECHANGE}
server.port=${EIFFEL_EI_BACKEND_SOURCECHANGE_INTERNAL_PORT}
rules.path=/rules/SourceChangeObjectRules-Eiffel-Agen-Version.json
rabbitmq.domainId=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.componentName=eiffelintelligence-sourcechange
rules.replacement.marker=${EIFFEL_EI_MERGE_ID_MAKER}
test.aggregation.enabled=false
rabbitmq.domain.id=${EIFFEL_RABBITMQ_DOMAIN_ID}
rabbitmq.component.name=eiffelintelligence-sourcechange
rabbitmq.waitlist.queue.suffix=waitlist-sourcechange
rabbitmq.host=${EIFFEL_RABBITMQ}
rabbitmq.port=${EIFFEL_RABBITMQ_AMQP_APPLICATION_PORT}
rabbitmq.exchange.name=${EIFFEL_RABBITMQ_EXCHANGE}
rabbitmq.consumerName=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.suffix=${EIFFEL_EI_RABBITMQ_CONSUMER_NAME}
rabbitmq.queue.durable=${EIFFEL_EI_RABBITMQ_QUEUE_DURABLE}
rabbitmq.tlsVersion=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.tls.version=${EIFFEL_RABBITMQ_TLS_VERSION}
rabbitmq.user=${EIFFEL_RABBITMQ_USER}
rabbitmq.password=${EIFFEL_RABBITMQ_PASSWORD}
mergeidmarker=${EIFFEL_EI_MERGE_ID_MAKER}
spring.data.mongodb.host=${EIFFEL_MONGODB}
spring.data.mongodb.port=${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.uri=mongodb://${EIFFEL_MONGODB}:${EIFFEL_MONGODB_APPLICATION_PORT}
spring.data.mongodb.database=eiffel_intelligence-sourcechange
missedNotificationDataBaseName=eiffel_intelligence-sourcechange_MissedNotification
missedNotificationCollectionName=Notification
aggregated.object.name=aggregatedObject
aggregated.collection.name=aggregated_objects
aggregated.collection.ttlValue=${EIFFEL_EI_AGGREGATED_DB_TTL}
event_object_map.collection.name=event_object_map
server.session.timeout=1200
sessions.collection.name=sessions
failed.notifications.collection.name=Notification
failed.notifications.collection.ttl=600
aggregations.collection.name=aggregated_objects
aggregations.collection.ttl=${EIFFEL_EI_AGGREGATED_DB_TTL}
event.object.map.collection.name=event_object_map
waitlist.collection.name=wait_list
waitlist.collection.ttlValue=600
waitlist.initialDelayResend=2000
waitlist.fixedRateResend=15000
subscription.collection.name=subscription
subscription.collection.repeatFlagHandlerName=subscription_repeat_handler
testaggregated.enabled=false
threads.corePoolSize=100
threads.queueCapacity=5000
threads.maxPoolSize=150
search.query.prefix=${EIFFEL_EI_SEARCH_QUERY_PREFIX}
aggregated.object.name=${EIFFEL_EI_AGGREGATED_OBJECT_NAME}
waitlist.collection.ttl=600
waitlist.resend.initial.delay=2000
waitlist.resend.fixed.rate=15000
subscriptions.collection.name=subscription
subscriptions.repeat.handler.collection.name=subscription_repeat_handler
threads.core.pool.size=100
threads.queue.capacity=5000
threads.max.pool.size=150
scheduled.threadpool.size=100
[email protected]
email.subject=Email Subscription Notification
notification.failAttempt=3
notification.ttl.value=600
notification.retry=3
spring.mail.host=${MAIL_HOST}
spring.mail.port=${MAIL_PORT}
spring.mail.username=${MAIL_USER}
Expand All @@ -385,7 +371,7 @@ spring.mail.properties.mail.smtp.auth=${MAIL_PROPERTIES_AUTH_ENABLE}
spring.mail.properties.mail.smtp.starttls.enable=${MAIL_PROPERTIES_STARTTLS_ENABLE}
ldap.enabled=false
ldap.server.list=
er.url=${EIFFEL_ER_SEARCH_URL}
event.repository.url=${EIFFEL_ER_SEARCH_URL}
logging.level.root=ERROR
logging.level.org.springframework.web=ERROR
logging.level.com.ericsson.ei=DEBUG"
Expand Down

0 comments on commit 935ea60

Please sign in to comment.