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 2020/12/08 22:31:00 UTC
[airavata] branch master updated (704ac38 -> 890dc20)
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 704ac38 Merge pull request #269 from apache/AIRAVATA-3391
add f74bd20 Initial prometheus monitoring impl
add 540dead Adding missing jars
add a3ca40f Changing the running task count to gauge
add 9ef272a Minor fix of permissions in setting up monitoring firewalls
add a8d5eb9 Monitoring API Server Requests
new 890dc20 Merge branch 'prometheus-integration'
The 1 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:
airavata-services/services-security/pom.xml | 5 +
.../security/interceptor/SecurityInterceptor.java | 4 +
.../scigap/develop/group_vars/all/vars.yml | 23 ++-
.../scigap/production/group_vars/all/vars.yml | 23 ++-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 11 ++
.../templates/airavata-server.properties.j2 | 7 +
dev-tools/ansible/roles/helix_setup/tasks/main.yml | 44 ++++++
.../parser-wm/airavata-server.properties.j2 | 7 +
.../participant/airavata-server.properties.j2 | 9 +-
.../post-wm/airavata-server.properties.j2 | 7 +
.../templates/pre-wm/airavata-server.properties.j2 | 7 +
.../helix/impl/participant/GlobalParticipant.java | 11 ++
.../airavata/helix/impl/task/env/EnvSetupTask.java | 3 +
.../helix/impl/task/parsing/DataParsingTask.java | 4 +-
.../helix/impl/task/staging/ArchiveTask.java | 4 +
.../helix/impl/task/staging/DataStagingTask.java | 4 +
.../impl/task/staging/InputDataStagingTask.java | 4 +
.../impl/task/staging/OutputDataStagingTask.java | 3 +
.../task/submission/DefaultJobSubmissionTask.java | 3 +
.../helix/impl/workflow/ParserWorkflowManager.java | 14 ++
.../helix/impl/workflow/PostWorkflowManager.java | 13 ++
.../helix/impl/workflow/PreWorkflowManager.java | 14 ++
modules/airavata-helix/platform-monitor/pom.xml | 24 ---
.../helix/cluster/monitoring/ErrorNotifier.java | 67 --------
.../helix/cluster/monitoring/MainMonitor.java | 36 -----
.../helix/cluster/monitoring/PlatformMonitor.java | 5 -
.../cluster/monitoring/PlatformMonitorError.java | 46 ------
.../monitoring/agents/ApiServerMonitor.java | 47 ------
.../helix/cluster/monitoring/agents/DbMonitor.java | 48 ------
.../monitoring/agents/HelixControllerMonitor.java | 17 ---
.../monitoring/agents/HelixParticipantMonitor.java | 108 -------------
.../monitoring/agents/ZookeeperMonitor.java | 47 ------
.../src/main/resources/airavata-server.properties | 13 --
.../src/main/resources/logback.xml | 53 -------
modules/airavata-helix/pom.xml | 1 -
modules/airavata-helix/task-core/pom.xml | 5 +
.../apache/airavata/helix/core/AbstractTask.java | 18 ++-
.../airavata/common/utils/ApplicationSettings.java | 42 ++++-
modules/distribution/pom.xml | 16 --
.../src/main/assembly/controller-bin-assembly.xml | 6 +
.../main/assembly/email-monitor-bin-assembly.xml | 6 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 6 +
.../src/main/assembly/participant-bin-assembly.xml | 6 +
.../assembly/platform-monitor-bin-assembly.xml | 170 ---------------------
.../src/main/assembly/post-wm-bin-assembly.xml | 6 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 5 +
.../assembly/realtime-monitor-bin-assembly.xml | 6 +
.../parser-wm/conf/airavata-server.properties | 4 +
.../participant/conf/airavata-server.properties | 6 +-
.../bin/platform-monitor-daemon.sh | 113 --------------
.../platform-monitor/bin/platform-monitor.sh | 71 ---------
.../main/resources/platform-monitor/bin/setenv.sh | 46 ------
.../conf/airavata-server.properties | 35 -----
.../resources/platform-monitor/conf/logback.xml | 53 -------
.../post-wm/conf/airavata-server.properties | 6 +-
.../pre-wm/conf/airavata-server.properties | 6 +-
modules/{security => platform-monitoring}/pom.xml | 51 ++++---
.../airavata/patform/monitoring/CountMonitor.java} | 34 ++---
.../airavata/patform/monitoring/GaugeMonitor.java} | 29 ++--
.../patform/monitoring/MonitoringServer.java} | 47 +++---
.../org/apache/airavata/server/ServerMain.java | 10 ++
pom.xml | 1 +
62 files changed, 442 insertions(+), 1098 deletions(-)
delete mode 100644 modules/airavata-helix/platform-monitor/pom.xml
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/ErrorNotifier.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/MainMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/PlatformMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/PlatformMonitorError.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ApiServerMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/DbMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixControllerMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/HelixParticipantMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/java/org/apache/airavata/helix/cluster/monitoring/agents/ZookeeperMonitor.java
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/resources/airavata-server.properties
delete mode 100644 modules/airavata-helix/platform-monitor/src/main/resources/logback.xml
delete mode 100644 modules/distribution/src/main/assembly/platform-monitor-bin-assembly.xml
delete mode 100644 modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor-daemon.sh
delete mode 100644 modules/distribution/src/main/resources/platform-monitor/bin/platform-monitor.sh
delete mode 100755 modules/distribution/src/main/resources/platform-monitor/bin/setenv.sh
delete mode 100644 modules/distribution/src/main/resources/platform-monitor/conf/airavata-server.properties
delete mode 100644 modules/distribution/src/main/resources/platform-monitor/conf/logback.xml
copy modules/{security => platform-monitoring}/pom.xml (56%)
copy modules/{airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/FileMetadata.java => platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/CountMonitor.java} (53%)
copy modules/{airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/RawCommandInfo.java => platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/GaugeMonitor.java} (63%)
copy modules/{commons/src/main/java/org/apache/airavata/common/utils/LocalEventPublisher.java => platform-monitoring/src/main/java/org/apache/airavata/patform/monitoring/MonitoringServer.java} (52%)
[airavata] 01/01: Merge branch 'prometheus-integration'
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 890dc20bd6cca509b228be562ad12e1c4866cc11
Merge: 704ac38 a8d5eb9
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Dec 8 17:30:13 2020 -0500
Merge branch 'prometheus-integration'
airavata-services/services-security/pom.xml | 5 +
.../security/interceptor/SecurityInterceptor.java | 4 +
.../scigap/develop/group_vars/all/vars.yml | 23 ++-
.../scigap/production/group_vars/all/vars.yml | 23 ++-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 11 ++
.../templates/airavata-server.properties.j2 | 7 +
dev-tools/ansible/roles/helix_setup/tasks/main.yml | 44 ++++++
.../parser-wm/airavata-server.properties.j2 | 7 +
.../participant/airavata-server.properties.j2 | 9 +-
.../post-wm/airavata-server.properties.j2 | 7 +
.../templates/pre-wm/airavata-server.properties.j2 | 7 +
.../helix/impl/participant/GlobalParticipant.java | 11 ++
.../airavata/helix/impl/task/env/EnvSetupTask.java | 3 +
.../helix/impl/task/parsing/DataParsingTask.java | 4 +-
.../helix/impl/task/staging/ArchiveTask.java | 4 +
.../helix/impl/task/staging/DataStagingTask.java | 4 +
.../impl/task/staging/InputDataStagingTask.java | 4 +
.../impl/task/staging/OutputDataStagingTask.java | 3 +
.../task/submission/DefaultJobSubmissionTask.java | 3 +
.../helix/impl/workflow/ParserWorkflowManager.java | 14 ++
.../helix/impl/workflow/PostWorkflowManager.java | 13 ++
.../helix/impl/workflow/PreWorkflowManager.java | 14 ++
modules/airavata-helix/platform-monitor/pom.xml | 24 ---
.../helix/cluster/monitoring/ErrorNotifier.java | 67 --------
.../helix/cluster/monitoring/MainMonitor.java | 36 -----
.../helix/cluster/monitoring/PlatformMonitor.java | 5 -
.../cluster/monitoring/PlatformMonitorError.java | 46 ------
.../monitoring/agents/ApiServerMonitor.java | 47 ------
.../helix/cluster/monitoring/agents/DbMonitor.java | 48 ------
.../monitoring/agents/HelixControllerMonitor.java | 17 ---
.../monitoring/agents/HelixParticipantMonitor.java | 108 -------------
.../monitoring/agents/ZookeeperMonitor.java | 47 ------
.../src/main/resources/airavata-server.properties | 13 --
.../src/main/resources/logback.xml | 53 -------
modules/airavata-helix/pom.xml | 1 -
modules/airavata-helix/task-core/pom.xml | 5 +
.../apache/airavata/helix/core/AbstractTask.java | 18 ++-
.../airavata/common/utils/ApplicationSettings.java | 42 ++++-
modules/distribution/pom.xml | 16 --
.../src/main/assembly/controller-bin-assembly.xml | 6 +
.../main/assembly/email-monitor-bin-assembly.xml | 6 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 6 +
.../src/main/assembly/participant-bin-assembly.xml | 6 +
.../assembly/platform-monitor-bin-assembly.xml | 170 ---------------------
.../src/main/assembly/post-wm-bin-assembly.xml | 6 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 5 +
.../assembly/realtime-monitor-bin-assembly.xml | 6 +
.../parser-wm/conf/airavata-server.properties | 4 +
.../participant/conf/airavata-server.properties | 6 +-
.../bin/platform-monitor-daemon.sh | 113 --------------
.../platform-monitor/bin/platform-monitor.sh | 71 ---------
.../main/resources/platform-monitor/bin/setenv.sh | 46 ------
.../conf/airavata-server.properties | 35 -----
.../resources/platform-monitor/conf/logback.xml | 53 -------
.../post-wm/conf/airavata-server.properties | 6 +-
.../pre-wm/conf/airavata-server.properties | 6 +-
modules/platform-monitoring/pom.xml | 66 ++++++++
.../airavata/patform/monitoring/CountMonitor.java | 51 +++++++
.../airavata/patform/monitoring/GaugeMonitor.java | 48 ++++++
.../patform/monitoring/MonitoringServer.java | 57 +++++++
.../org/apache/airavata/server/ServerMain.java | 10 ++
pom.xml | 1 +
62 files changed, 573 insertions(+), 1028 deletions(-)