You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/04/24 16:12:25 UTC
[airavata] branch staging updated: Simplifying email job monitor
properties
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 9999156 Simplifying email job monitor properties
9999156 is described below
commit 9999156cbf7b8ce52e3dde8457e01b86488e6a81
Author: dimuthu <di...@gmail.com>
AuthorDate: Tue Apr 24 12:12:19 2018 -0400
Simplifying email job monitor properties
---
.../src/main/resources/airavata-server.properties | 252 +-------------------
.../email-monitor/conf/airavata-server.properties | 256 +--------------------
2 files changed, 8 insertions(+), 500 deletions(-)
diff --git a/modules/job-monitor/email-monitor/src/main/resources/airavata-server.properties b/modules/job-monitor/email-monitor/src/main/resources/airavata-server.properties
index 1f5901a..e45b65c 100644
--- a/modules/job-monitor/email-monitor/src/main/resources/airavata-server.properties
+++ b/modules/job-monitor/email-monitor/src/main/resources/airavata-server.properties
@@ -16,168 +16,7 @@
# under the License.
#
-###########################################################################
-#
-# This properties file provides configuration for all Airavata Services:
-# API Server, Registry, Workflow Interpreter, GFac, Orchestrator
-#
-###########################################################################
-
-###########################################################################
-# API Server Registry Configuration
-###########################################################################
-
-#for derby [AiravataJPARegistry]
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://192.168.99.103:3306/experiment_catalog
-registry.jdbc.user=airavata
-registry.jdbc.password=123456
-#FIXME: Probably the following property should be removed.
-start.derby.server.mode=false
-validationQuery=SELECT 1 from CONFIGURATION
-cache.enable=false
-jpa.cache.size=-1
-#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-enable.sharing=true
-
-# Properties for default user mode
-default.registry.user=default-admin
-default.registry.password=123456
-default.registry.password.hash.method=SHA
-default.registry.gateway=default
-super.tenant.gatewayId=default
-
-###########################################################################
-# Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#appcatalog.jdbc.url=jdbc:derby://localhost:1527/app_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/app_catalog
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=123456
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-# Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#replicacatalog.jdbc.url=jdbc:derby://localhost:1527/replica_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/replica_catalog
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=123456
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#sharingcatalog.jdbc.url=jdbc:derby://localhost:1527/sharing_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/sharing_catalog
-sharingcatalog.jdbc.user=airavata
-sharingcatalog.jdbc.password=123456
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Registry Server Configuration
-###########################################################################
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=192.168.99.102
-sharing.registry.server.port=7878
-
-###########################################################################
-# API Server Configurations
-###########################################################################
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-apiserver.name=apiserver-node0
-apiserver.host=192.168.99.102
-apiserver.port=8930
-apiserver.min.threads=50
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-regserver.server.name=regserver-node0
-regserver.server.host=192.168.99.102
-regserver.server.port=8970
-regserver.server.min.threads=50
-
-
-###########################################################################
-# Job Scheduler can send informative email messages to you about the status of your job.
-# Specify a string which consists of either the single character "n" (no mail), or one or more
-# of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),
-# and "e" (send mail when job terminates). The default is "a" if not specified.
-###########################################################################
-
-job.notification.enable=true
-#Provide comma separated email ids as a string if more than one
-job.notification.emailids=
-job.notification.flags=abe
-
-###########################################################################
-# Credential Store module Configuration
-###########################################################################
-credential.store.keystore.url=/Users/dimuthu/code/reference/airavata/modules/airavata-helix-distribution/src/main/resources/conf/cred_store.jks
-credential.store.keystore.alias=seckey
-credential.store.keystore.password=credstore123
-credential.store.jdbc.url=jdbc:mariadb://192.168.99.103:3306/credential_store
-credential.store.jdbc.user=airavata
-credential.store.jdbc.password=123456
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.server.host=192.168.99.102
-credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-
-# these properties used by credential store email notifications
-email.server=smtp.googlemail.com
-email.server.port=465
-email.user=airavata
-email.password=xxx
-email.ssl=true
-email.from=airavata@apache.org
-
-# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication is used.
-# if user specify both password sshKeyAuthentication gets the higher preference
-
-################# ---------- For ssh key pair sshKeyAuthentication ------------------- ################
-#ssh.public.key=/path to public key for ssh
-#ssh.private.key=/path to private key file for ssh
-#ssh.keypass=passphrase for the private key
-#ssh.username=username for ssh connection
-## If you set "yes" for ssh.strict.hostKey.checking, then you must provide known hosts file path
-#ssh.strict.hostKey.checking=yes/no
-#ssh.known.hosts.file=/path to known hosts file
-### Incase of password sshKeyAuthentication.
-#ssh.password=Password for ssh connection
-
-################ ---------- BES Properties ------------------- ###############
-#bes.ca.cert.path=<location>/certificates/cacert.pem
-#bes.ca.key.path=<location>/certificates/cakey.pem
-#bes.ca.key.pass=passphrase
-
-###########################################################################
-# Monitoring module Configuration
-###########################################################################
-
-#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
-
-#These properties will used to enable email base monitoring
+#These properties will be used to enable email based monitoring
email.based.monitor.host=imap.gmail.com
email.based.monitor.address=ansibletestairavata@gmail.com
email.based.monitor.password=ansibletestairavata1234
@@ -186,93 +25,8 @@ email.based.monitor.folder.name=INBOX
email.based.monitor.store.protocol=imaps
#These property will be used to query the email server periodically. value in milliseconds(ms).
email.based.monitoring.period=10000
+
+#These properties will be used to published parsed email messages to job monitor queue
job.monitor.broker.url=192.168.99.103:9092
job.monitor.broker.topic=parsed-data
job.monitor.broker.publisher.id=EmailBasedProducer
-
-###########################################################################
-#Helix workflow manager configurations
-###########################################################################
-
-kafka.broker.url=192.168.99.103:9092
-kafka.broker.topic=parsed-data
-kafka.broker.consumer.group=MonitoringConsumer
-helix.cluster.name=AiravataDemoCluster
-pre.workflow.manager.name=prewm
-post.workflow.manager.name=postwm
-helix.controller.name=helixcontroller
-helix.participant.name=helixparticipant
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.99.103:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-embedded.zk=false
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-########################################################################
-## API Security Configuration
-########################################################################
-api.secured=false
-security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-### TLS related configuration ####
-TLS.enabled=true
-TLS.api.server.port=9930
-TLS.client.timeout=10000
-#### keystore configuration ####
-keystore.path=/home/pga/master-deployment/keystores/airavata.jks
-keystore.password=password
-#### trust store configuration ####
-trust.store=/home/pga/master-deployment/keystores/client_truststore.jks
-trust.store.password=password
-#### authorization cache related configuration ####
-authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-in.memory.cache.size=1000
-
-# Kafka Logging related configuration
-isRunningOnAws=false
-kafka.broker.list=192.168.99.103:9092
-kafka.topic.prefix=local
-enable.kafka.logging=false
-
-###########################################################################
-# Profile Service Configuration
-###########################################################################
-profile.service.server.host=192.168.99.102
-profile.service.server.port=8962
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-# MariaDB properties
-profile.service.jdbc.url=jdbc:mariadb://192.168.99.103:3306/profile_service
-profile.service.jdbc.user=airavata
-profile.service.jdbc.password=123456
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.validationQuery=SELECT 1
-
-###########################################################################
-# Iam Admin services Configuration
-###########################################################################
-iam.server.url=https://192.168.99.103/auth
-iam.server.super.admin.username=admin
-iam.server.super.admin.password=123456
-
-###########################################################################
-# DB Event Manager Runner
-###########################################################################
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
diff --git a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties b/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties
index fb22e75..92669be 100644
--- a/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties
+++ b/modules/job-monitor/job-monitor-distribution/src/main/resources/email-monitor/conf/airavata-server.properties
@@ -16,168 +16,7 @@
# under the License.
#
-###########################################################################
-#
-# This properties file provides configuration for all Airavata Services:
-# API Server, Registry, Workflow Interpreter, GFac, Orchestrator
-#
-###########################################################################
-
-###########################################################################
-# API Server Registry Configuration
-###########################################################################
-
-#for derby [AiravataJPARegistry]
-#registry.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#registry.jdbc.url=jdbc:derby://localhost:1527/experiment_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-registry.jdbc.driver=org.mariadb.jdbc.Driver
-registry.jdbc.url=jdbc:mariadb://192.168.99.103:3306/experiment_catalog
-registry.jdbc.user=airavata
-registry.jdbc.password=123456
-#FIXME: Probably the following property should be removed.
-start.derby.server.mode=false
-validationQuery=SELECT 1 from CONFIGURATION
-cache.enable=false
-jpa.cache.size=-1
-#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-enable.sharing=true
-
-# Properties for default user mode
-default.registry.user=default-admin
-default.registry.password=123456
-default.registry.password.hash.method=SHA
-default.registry.gateway=default
-super.tenant.gatewayId=default
-
-###########################################################################
-# Application Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#appcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#appcatalog.jdbc.url=jdbc:derby://localhost:1527/app_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-appcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-appcatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/app_catalog
-appcatalog.jdbc.user=airavata
-appcatalog.jdbc.password=123456
-appcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-##########################################################################
-# Replica Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#replicacatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#replicacatalog.jdbc.url=jdbc:derby://localhost:1527/replica_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-replicacatalog.jdbc.driver=org.mariadb.jdbc.Driver
-replicacatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/replica_catalog
-replicacatalog.jdbc.user=airavata
-replicacatalog.jdbc.password=123456
-replicacatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Catalog DB Configuration
-###########################################################################
-#for derby [AiravataJPARegistry]
-#sharingcatalog.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-#sharingcatalog.jdbc.url=jdbc:derby://localhost:1527/sharing_catalog;create=true;user=airavata;password=airavata
-# MariaDB database configuration
-sharingcatalog.jdbc.driver=org.mariadb.jdbc.Driver
-sharingcatalog.jdbc.url=jdbc:mariadb://192.168.99.103:3306/sharing_catalog
-sharingcatalog.jdbc.user=airavata
-sharingcatalog.jdbc.password=123456
-sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
-
-###########################################################################
-# Sharing Registry Server Configuration
-###########################################################################
-sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
-sharing.registry.server.host=192.168.99.102
-sharing.registry.server.port=7878
-
-###########################################################################
-# API Server Configurations
-###########################################################################
-apiserver=org.apache.airavata.api.server.AiravataAPIServer
-apiserver.name=apiserver-node0
-apiserver.host=192.168.99.102
-apiserver.port=8930
-apiserver.min.threads=50
-
-###########################################################################
-# Registry Server Configurations
-###########################################################################
-regserver=org.apache.airavata.registry.api.service.RegistryAPIServer
-regserver.server.name=regserver-node0
-regserver.server.host=192.168.99.102
-regserver.server.port=8970
-regserver.server.min.threads=50
-
-
-###########################################################################
-# Job Scheduler can send informative email messages to you about the status of your job.
-# Specify a string which consists of either the single character "n" (no mail), or one or more
-# of the characters "a" (send mail when job is aborted), "b" (send mail when job begins),
-# and "e" (send mail when job terminates). The default is "a" if not specified.
-###########################################################################
-
-job.notification.enable=true
-#Provide comma separated email ids as a string if more than one
-job.notification.emailids=
-job.notification.flags=abe
-
-###########################################################################
-# Credential Store module Configuration
-###########################################################################
-credential.store.keystore.url=/Users/dimuthu/code/reference/airavata/modules/airavata-helix-distribution/src/main/resources/conf/cred_store.jks
-credential.store.keystore.alias=seckey
-credential.store.keystore.password=credstore123
-credential.store.jdbc.url=jdbc:mariadb://192.168.99.103:3306/credential_store
-credential.store.jdbc.user=airavata
-credential.store.jdbc.password=123456
-credential.store.jdbc.driver=org.mariadb.jdbc.Driver
-credential.store.server.host=192.168.99.102
-credential.store.server.port=8960
-credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
-
-# these properties used by credential store email notifications
-email.server=smtp.googlemail.com
-email.server.port=465
-email.user=airavata
-email.password=xxx
-email.ssl=true
-email.from=airavata@apache.org
-
-# SSH PKI key pair or ssh password can be used SSH based sshKeyAuthentication is used.
-# if user specify both password sshKeyAuthentication gets the higher preference
-
-################# ---------- For ssh key pair sshKeyAuthentication ------------------- ################
-#ssh.public.key=/path to public key for ssh
-#ssh.private.key=/path to private key file for ssh
-#ssh.keypass=passphrase for the private key
-#ssh.username=username for ssh connection
-## If you set "yes" for ssh.strict.hostKey.checking, then you must provide known hosts file path
-#ssh.strict.hostKey.checking=yes/no
-#ssh.known.hosts.file=/path to known hosts file
-### Incase of password sshKeyAuthentication.
-#ssh.password=Password for ssh connection
-
-################ ---------- BES Properties ------------------- ###############
-#bes.ca.cert.path=<location>/certificates/cacert.pem
-#bes.ca.key.path=<location>/certificates/cakey.pem
-#bes.ca.key.pass=passphrase
-
-###########################################################################
-# Monitoring module Configuration
-###########################################################################
-
-#This will be the primary monitoring tool which runs in airavata, in future there will be multiple monitoring
-#mechanisms and one would be able to start a monitor
-monitors=org.apache.airavata.gfac.monitor.impl.pull.qstat.QstatMonitor,org.apache.airavata.gfac.monitor.impl.LocalJobMonitor
-
-#These properties will used to enable email base monitoring
+#These properties will be used to enable email based monitoring
email.based.monitor.host=imap.gmail.com
email.based.monitor.address=CHANGEME
email.based.monitor.password=CHANGEME
@@ -186,93 +25,8 @@ email.based.monitor.folder.name=INBOX
email.based.monitor.store.protocol=imaps
#These property will be used to query the email server periodically. value in milliseconds(ms).
email.based.monitoring.period=10000
-job.monitor.broker.url=192.168.99.103:9092
-job.monitor.broker.topic=parsed-data
-job.monitor.broker.publisher.id=EmailBasedProducer
-
-###########################################################################
-#Helix workflow manager configurations
-###########################################################################
-kafka.broker.url=192.168.99.103:9092
-kafka.broker.topic=parsed-data
-kafka.broker.consumer.group=MonitoringConsumer
-helix.cluster.name=AiravataDemoCluster
-pre.workflow.manager.name=prewm
-post.workflow.manager.name=postwm
-helix.controller.name=helixcontroller
-helix.participant.name=helixparticipant
-
-###########################################################################
-# AMQP Notification Configuration
-###########################################################################
-#for simple scenarios we can use the guest user
-#rabbitmq.broker.url=amqp://localhost:5672
-#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
-# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
-rabbitmq.broker.url=amqp://airavata:123456@192.168.99.103:5672/master
-rabbitmq.status.exchange.name=status_exchange
-rabbitmq.process.exchange.name=process_exchange
-rabbitmq.experiment.exchange.name=experiment_exchange
-durable.queue=false
-prefetch.count=200
-process.launch.queue.name=process.launch.queue
-experiment.launch..queue.name=experiment.launch.queue
-
-###########################################################################
-# Zookeeper Server Configuration
-###########################################################################
-embedded.zk=false
-zookeeper.server.connection=192.168.99.103:2181
-zookeeper.timeout=30000
-
-########################################################################
-## API Security Configuration
-########################################################################
-api.secured=false
-security.manager.class=org.apache.airavata.service.security.KeyCloakSecurityManager
-### TLS related configuration ####
-TLS.enabled=true
-TLS.api.server.port=9930
-TLS.client.timeout=10000
-#### keystore configuration ####
-keystore.path=/home/pga/master-deployment/keystores/airavata.jks
-keystore.password=password
-#### trust store configuration ####
-trust.store=/home/pga/master-deployment/keystores/client_truststore.jks
-trust.store.password=password
-#### authorization cache related configuration ####
-authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
-in.memory.cache.size=1000
-
-# Kafka Logging related configuration
-isRunningOnAws=false
-kafka.broker.list=192.168.99.103:9092
-kafka.topic.prefix=local
-enable.kafka.logging=false
-
-###########################################################################
-# Profile Service Configuration
-###########################################################################
-profile.service.server.host=192.168.99.102
-profile.service.server.port=8962
-profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
-# MariaDB properties
-profile.service.jdbc.url=jdbc:mariadb://192.168.99.103:3306/profile_service
-profile.service.jdbc.user=airavata
-profile.service.jdbc.password=123456
-profile.service.jdbc.driver=org.mariadb.jdbc.Driver
-profile.service.validationQuery=SELECT 1
-
-###########################################################################
-# Iam Admin services Configuration
-###########################################################################
-iam.server.url=https://192.168.99.103/auth
-iam.server.super.admin.username=admin
-iam.server.super.admin.password=123456
-
-###########################################################################
-# DB Event Manager Runner
-###########################################################################
-db_event_manager=org.apache.airavata.db.event.manager.DBEventManagerRunner
+#These properties will be used to published parsed email messages to job monitor queue
+job.monitor.broker.url=CHANGEME
+job.monitor.broker.topic=parsed-data
+job.monitor.broker.publisher.id=EmailBasedProducer
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.