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/07 22:18:50 UTC
[airavata] 01/01: Merge branch 'prometheus-integration' into develop
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 74a71455a5ed8803462d10b83d4ee7067ab7f71b
Merge: a514a55 f74bd20
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Dec 7 17:16:12 2020 -0500
Merge branch 'prometheus-integration' into develop
# Conflicts:
# modules/airavata-helix/platform-monitor/pom.xml
.../scigap/develop/group_vars/all/vars.yml | 40 +++++
dev-tools/ansible/inventories/scigap/develop/hosts | 2 +-
.../scigap/production/group_vars/all/vars.yml | 40 +++++
.../scigap/production/host_vars/delta/vars.yml | 1 +
.../production/host_vars/distantreader/vars.yml | 2 +-
.../production/host_vars/pace-gatech/vars.yml | 2 +
.../scigap/production/host_vars/searchsra/vars.yml | 2 +-
.../production/host_vars/simvascular_old/vars.yml | 10 +-
.../host_vars/{pace-gatech => tsunami}/vars.yml | 26 ++--
.../scigap/production/host_vars/tsunami/vault.yml | 15 ++
.../ansible/inventories/scigap/production/hosts | 1 +
.../scigap/staging/group_vars/all/vars.yml | 24 +++
.../scigap/testing/group_vars/all/vars.yml | 26 +++-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 57 +++++--
dev-tools/ansible/roles/database/tasks/main.yml | 12 +-
dev-tools/ansible/roles/env_setup/tasks/main.yml | 9 ++
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 +
.../templates/email-monitor/email-config.yaml.j2 | 2 +
dev-tools/ansible/roles/kafka/tasks/main.yml | 22 ++-
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 23 ++-
dev-tools/ansible/roles/zookeeper/tasks/main.yml | 9 +-
.../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 +
.../impl/task/submission/config/GroovyMapData.java | 19 +--
.../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 | 14 +-
.../airavata/common/utils/ApplicationSettings.java | 42 ++++-
modules/distribution/pom.xml | 16 --
.../src/main/assembly/controller-bin-assembly.xml | 4 +
.../main/assembly/email-monitor-bin-assembly.xml | 4 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 4 +
.../src/main/assembly/participant-bin-assembly.xml | 4 +
.../assembly/platform-monitor-bin-assembly.xml | 170 ---------------------
.../src/main/assembly/post-wm-bin-assembly.xml | 4 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 3 +
.../assembly/realtime-monitor-bin-assembly.xml | 4 +
.../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 | 39 +++++
.../airavata/patform/monitoring/GaugeMonitor.java | 48 ++++++
.../patform/monitoring/MonitoringServer.java | 57 +++++++
.../registry/core/utils/QueryConstants.java | 2 +-
pom.xml | 1 +
77 files changed, 753 insertions(+), 1081 deletions(-)