Property changes (#284)

* Property changes

Author: Christoffer-Cortes

src/integrationtest/resources/integration-test.properties

@@ -1,102 +1,59 @@
-spring.application.name=eiffel-intelligence
-
-# Port where Eiffel Intelligence will run
+spring.application.name: eiffel-intelligence
 server.port: 8090
 
-# Path to file containing aggregation rules
-# If the path is a url it needs to include the http(s) protocol.
+logging.level.root: OFF
+logging.level.org.springframework.web: ERROR
+logging.level.com.ericsson.ei: ERROR
+
 rules.path: /rules/ArtifactRules-Eiffel-Agen-Version.json
-# The marker to be replaced with an Eiffel event ID extracted from IdentifyRules
 rules.replacement.marker: %IdentifyRulesEventId%
 
-# This property needs to be enabled in order to test new aggregation rules on an
-# existing or artificially created set of events.
 # WARNING! Do not enable this in a production environment!
-testaggregated.enabled: true
+test.aggregation.enabled: true
 
-# Logging levels can be set with the flag below for the top packages deactivated by
-# default because Travis will fail due to log file size. It is possible to only
-# activate logging for a certain package under these top packages.
-logging.level.root: OFF
-logging.level.org.springframework.web: ERROR
-logging.level.com.ericsson.ei: ERROR
-
-# Details for connection to RabbitMQ
 rabbitmq.host: localhost
 rabbitmq.port: 5672
 rabbitmq.user: myuser
 rabbitmq.password: myuser
-# Check configuration documentation for using jasypt encrypted passswords
-# Valid TLS versions: 'TLSv1.2', 'TLSv1.1', 'TLSv1', 'TLS', 'SSLv3', 'SSLv2', 'SSL'
-rabbitmq.tlsVersion:
+rabbitmq.tls.version:
 rabbitmq.exchange.name: ei-exchange
-rabbitmq.domainId: ei-domain
-rabbitmq.componentName: eiffel-intelligence
-rabbitmq.consumerName: messageConsumer
-rabbitmq.queue.durable:true
-rabbitmq.binding.key:#
-rabbitmq.waitlist.queue.suffix:waitlist
+rabbitmq.domain.id: ei-domain
+rabbitmq.component.name: eiffel-intelligence
+rabbitmq.queue.suffix: messageQueue
+rabbitmq.queue.durable: true
+rabbitmq.binding.key: #
+rabbitmq.waitlist.queue.suffix: waitList
 
-# Details for connection to mongoDB database
 spring.data.mongodb.uri: mongodb://localhost:27017
 spring.data.mongodb.database: eiffel_intelligence
 
-# Configure the session storage expiration time for logged in users of Eiffel Intelligence front-end
-server.session-timeout: 1200
-# Configure the database collection name to store sessions
+server.session.timeout: 1200
 sessions.collection.name: sessions
 
-# Name of the database collection where aggregated objects are stored
-aggregated.collection.name: aggregated_objects
-# Configure time-to-live value (seconds) for aggregated objects. This needs to be set if
-# using the example rule set 'AllEventsRules' to avoid the storage growing too large.
-# Recommended setting is 10 minutes.
-aggregated.collection.ttlValue:
-# The name of the database collection where to store the mapping between
-# aggregated objects and id of the Eiffel events that contributed to those
-event_object_map.collection.name: event_object_map
-# Name of the database collection where subscriptions are stored
-subscription.collection.name: subscription
-# Name of the database collection where we store pair of 'subscription:aggregated object'
-# where notification has been sent and should not be repeated
-subscription.collection.repeatFlagHandlerName: subscription_repeat_handler
-# The waitlist contains Eiffel events which are waiting to be aggregated
-# Configure the database collection name for the waitlist
+aggregations.collection.name: aggregations
+aggregations.collection.ttl:
+event.object.map.collection.name: event_object_map
+subscriptions.collection.name: subscriptions
 waitlist.collection.name: wait_list
-# Set the time-to-live value for Eiffel events in the waitlist database (seconds)
-waitlist.collection.ttlValue: 600
-# Resend information for unprocessed events in wait list, time in milliseconds
-waitlist.initialDelayResend: 2000
-waitlist.fixedRateResend: 15000
-# Name of the collection where failed notifications are stored
-failed.notification.collection-name: failed_notifications
-# Number of retries if a notification fail
-notification.failAttempt: 3
-# Configure time-to-live for failed notifications in database (seconds)
-notification.ttl.value: 600
+waitlist.collection.ttl: 600
+waitlist.resend.initial.delay: 2000
+waitlist.resend.fixed.rate: 15000
+failed.notifications.collection.name: failed_notifications
+failed.notifications.collection.ttl: 600
+notification.retry: 3
 
-# Configure email sender and default subject for email notifications.
 email.sender: noreply@ericsson.com
 email.subject: Email Subscription Notification
 
-# Configure the email server to route email notifications through.
 spring.mail.host:
 spring.mail.port:
 spring.mail.username:
 spring.mail.password:
 spring.mail.properties.mail.smtp.auth: false
 spring.mail.properties.mail.smtp.starttls.enable: false
 
-# Url for downstream and upstream search in event repository. Configuring this
-# enables Eiffel Intelligence to aggregate historical Eiffel events.
-#er.url: http://localhost:8080/search/
-er.url:
+event.repository.url:
 
-# Settings for ldap server if ldap authentication is needed.
-# For security reasons and to avoid authorization problems this
-# password should be encoded in base64. It will be decoded in EndpointSecurity.java.
-#
-# Password field can also be Jasypt encoded, check configuration documentation for info.
 ldap.enabled: true
 ldap.server.list: [\
     {\
@@ -117,16 +74,12 @@ ldap.server.list: [\
 
 ### DEVELOPER SETTINGS
 
-# We reuse the same version as we use in our unit tests
 spring.mongodb.embedded.version: 3.4.1
 # We remove the embedded mongodb in tests since in most of them we set up our own before Spring
 # starts and activate it manually in tests where we need the Spring's own embedded mongo DB
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration
-
-# Threading settings
-threads.corePoolSize: 100
-threads.queueCapacity: 5000
-threads.maxPoolSize: 150
+spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration
 
-# WaitList-worker and Scheduling task executor thread settings
+threads.core.pool.size: 100
+threads.queue.capacity: 5000
+threads.max.pool.size: 150
 scheduled.threadpool.size: 100

src/main/resources/static/js/global-variables.js

@@ -34,7 +34,7 @@ var statusType = {
 var statusText = {
     BACKEND_DOWN: "<strong>Back-end, MongoDB and/or RabbitMQ is down!</strong> Wait for them go up or switch to another back-end before continuing!",
     UNKNOWN_BACK_END_STATUS: "<strong>Back-end status is unknown!</strong> Wait for it to update or switch to another back-end before continuing!",
-    TEST_RULES_DISABLED: "<strong>Test Rule service is disabled!</strong> To enable it set the backend property [testaggregated.enabled] as [true]"
+    TEST_RULES_DISABLED: "<strong>Test Rule service is disabled!</strong> To enable it set the backend property [test.aggregation.enabled] as [true]"
 };
 
 var backEndStatus = true;

wiki/curl-examples.md

@@ -306,7 +306,7 @@ Example curl commands to these endpoints [can be found here](https://github.com/
 
 For these endpoints to be reachable the Eiffel Intelligence back-end 
 [needs to be configured](https://github.com/eiffel-community/eiffel-intelligence/blob/master/src/main/resources/application.properties) 
-with `testaggregated.enabled: true`. The below command would result in a 
+with `test.aggregation.enabled: true`. The below command would result in a
 json response of `{"status":true}` if this functionality is enabled.
 
     curl -X GET -H "Content-type: application/json" localhost:8080/rule-test