You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2025/03/19 00:43:58 UTC
(airavata) branch cybershuttle-dev updated (5097dd7196 -> 45243c04e4)
This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a change to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 5097dd7196 updated the gkeyll notebook script
new 1c45397dcd bump version zookeeper and kafka
new b4046f6f9a excluded logback from file service
new 45243c04e4 jobmanager configs and included registry server properties for real-time monitor
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../templates/email-monitor/email-config.yaml.j2 | 7 +++----
dev-tools/ansible/roles/kafka/defaults/main.yml | 2 +-
dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +-
.../main/resources/email-monitor/conf/email-config.yaml | 8 ++++++--
.../realtime-monitor/conf/airavata-server.properties | 8 +++++++-
modules/file-server/pom.xml | 14 ++++++++++++--
.../ide-integration/src/main/resources/email-config.yaml | 6 +++++-
.../email-monitor/src/main/resources/email-config.yaml | 10 +++++++---
.../src/main/resources/airavata-server.properties | 8 +++++++-
9 files changed, 49 insertions(+), 16 deletions(-)
(airavata) 02/03: excluded logback from file service
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b4046f6f9aea68b893227bff03f7ceb6f4e75b0c
Author: lahiruj <la...@gmail.com>
AuthorDate: Tue Mar 18 20:41:57 2025 -0400
excluded logback from file service
---
modules/file-server/pom.xml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml
index a7065bdff3..aa58c9281d 100644
--- a/modules/file-server/pom.xml
+++ b/modules/file-server/pom.xml
@@ -17,8 +17,8 @@
<version>${spring.boot.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -26,6 +26,16 @@
<groupId>org.apache.airavata</groupId>
<artifactId>task-core</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
(airavata) 01/03: bump version zookeeper and kafka
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 1c45397dcd14521311780d88877e9aac4715dd91
Author: lahiruj <la...@gmail.com>
AuthorDate: Tue Mar 18 20:41:17 2025 -0400
bump version zookeeper and kafka
---
dev-tools/ansible/roles/kafka/defaults/main.yml | 2 +-
dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-tools/ansible/roles/kafka/defaults/main.yml b/dev-tools/ansible/roles/kafka/defaults/main.yml
index c7752d876e..76a2630d2d 100644
--- a/dev-tools/ansible/roles/kafka/defaults/main.yml
+++ b/dev-tools/ansible/roles/kafka/defaults/main.yml
@@ -22,7 +22,7 @@
#Variables associated with this role
kafka_package_name: "confluent-5.3.1"
-kafka_tgz_url: "http://packages.confluent.io/archive/5.3/confluent-5.3.1-2.12.zip"
+kafka_tgz_url: "https://packages.confluent.io/archive/7.9/confluent-7.9.0.zip"
kafka_dir: "{{ deployment_dir }}/{{ kafka_package_name }}"
# Kafka related variables
diff --git a/dev-tools/ansible/roles/zookeeper/vars/main.yml b/dev-tools/ansible/roles/zookeeper/vars/main.yml
index 6171334499..68eada2526 100644
--- a/dev-tools/ansible/roles/zookeeper/vars/main.yml
+++ b/dev-tools/ansible/roles/zookeeper/vars/main.yml
@@ -21,7 +21,7 @@
---
#Variables associated with this role
# zookeeper related variable
-zookeeper_version: 3.4.8
+zookeeper_version: 3.8.4
zookeeper_url: http://archive.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
apt_cache_timeout: 3600
(airavata) 03/03: jobmanager configs and included registry server properties for real-time monitor
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lahirujayathilake pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 45243c04e44dc74d0c8ff9a06430dc8568cb678d
Author: lahiruj <la...@gmail.com>
AuthorDate: Tue Mar 18 20:43:21 2025 -0400
jobmanager configs and included registry server properties for real-time monitor
---
.../job_monitor/templates/email-monitor/email-config.yaml.j2 | 7 +++----
.../src/main/resources/email-monitor/conf/email-config.yaml | 8 ++++++--
.../resources/realtime-monitor/conf/airavata-server.properties | 8 +++++++-
modules/ide-integration/src/main/resources/email-config.yaml | 6 +++++-
.../email-monitor/src/main/resources/email-config.yaml | 10 +++++++---
.../src/main/resources/airavata-server.properties | 8 +++++++-
6 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/dev-tools/ansible/roles/job_monitor/templates/email-monitor/email-config.yaml.j2 b/dev-tools/ansible/roles/job_monitor/templates/email-monitor/email-config.yaml.j2
index 588a1a6ee6..2fda28a256 100644
--- a/dev-tools/ansible/roles/job_monitor/templates/email-monitor/email-config.yaml.j2
+++ b/dev-tools/ansible/roles/job_monitor/templates/email-monitor/email-config.yaml.j2
@@ -100,7 +100,6 @@ config:
emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
resourceEmailAddresses:
- condor@js-169-152.jetstream-cloud.org
-
-# - jobManagerType: HTCondor
-# emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
-# resourceEmailAddresses:
+ - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
+ - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
+ - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
diff --git a/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml b/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
index 02d03b3e54..3a80bf83fd 100644
--- a/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
+++ b/modules/distribution/src/main/resources/email-monitor/conf/email-config.yaml
@@ -47,6 +47,10 @@ config:
- sge@bigdog.research.siu.edu # SIU Big Dog
- root <ro...@legacy.usd.edu> # USD HPC Cluster
- - jobManagerType: HTCondor
+ - jobManagerType: HTCONDOR
emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
\ No newline at end of file
+ resourceEmailAddresses:
+ - condor@js-169-152.jetstream-cloud.org
+ - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
+ - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
+ - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
\ No newline at end of file
diff --git a/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties b/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
index ca569fd5f0..3e2764d04a 100644
--- a/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
+++ b/modules/distribution/src/main/resources/realtime-monitor/conf/airavata-server.properties
@@ -25,4 +25,10 @@ realtime.monitor.broker.topic=helix-airavata-mq
job.monitor.broker.url=localhost:9092
job.monitor.broker.topic=parsed-data
-job.monitor.broker.publisher.id=RealtimeProducer
\ No newline at end of file
+job.monitor.broker.publisher.id=RealtimeProducer
+
+###########################################################################
+# Registry Server Configurations
+###########################################################################
+regserver.server.host=localhost
+regserver.server.port=8970
\ No newline at end of file
diff --git a/modules/ide-integration/src/main/resources/email-config.yaml b/modules/ide-integration/src/main/resources/email-config.yaml
index 3fc087fbe3..1854320ff1 100644
--- a/modules/ide-integration/src/main/resources/email-config.yaml
+++ b/modules/ide-integration/src/main/resources/email-config.yaml
@@ -49,4 +49,8 @@ config:
- jobManagerType: HTCONDOR
emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
- resourceEmailAddresses:
\ No newline at end of file
+ resourceEmailAddresses:
+ - condor@js-169-152.jetstream-cloud.org
+ - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
+ - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
+ - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
\ No newline at end of file
diff --git a/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml b/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
index 7f804e99ff..6577c32d6b 100644
--- a/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
+++ b/modules/job-monitor/email-monitor/src/main/resources/email-config.yaml
@@ -20,6 +20,10 @@ config:
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
-# - jobManagerType: HTCONDOR
-# emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
-# resourceEmailAddresses:
+ - jobManagerType: HTCONDOR
+ emailParser: org.apache.airavata.monitor.email.parser.HTCondorEmailParser
+ resourceEmailAddresses:
+ - condor@js-169-152.jetstream-cloud.org
+ - Owner of HTCondor Daemons <co...@condor.scigap.org> #EHT Condor Access point
+ - Owner of HTCondor Daemons <co...@login04.osgconnect.net>
+ - slurm@br003.ib.bridges2.psc.edu # AutoDock_Vina
diff --git a/modules/job-monitor/real-time-monitor/src/main/resources/airavata-server.properties b/modules/job-monitor/real-time-monitor/src/main/resources/airavata-server.properties
index d5af900b70..ecaeb4a3b6 100644
--- a/modules/job-monitor/real-time-monitor/src/main/resources/airavata-server.properties
+++ b/modules/job-monitor/real-time-monitor/src/main/resources/airavata-server.properties
@@ -25,4 +25,10 @@ realtime.monitor.broker.topic=helix-airavata-mq
job.monitor.broker.url=192.168.99.103:9092
job.monitor.broker.topic=parsed-data
-job.monitor.broker.publisher.id=RealtimeProducer
\ No newline at end of file
+job.monitor.broker.publisher.id=RealtimeProducer
+
+###########################################################################
+# Registry Server Configurations
+###########################################################################
+regserver.server.host=localhost
+regserver.server.port=8970
\ No newline at end of file