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 9939e072a1c2449446d2152ae8a108193f6c26ae Merge: de6b317 a8d5eb9 Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Tue Dec 8 14:57:53 2020 -0500 Merge branch 'prometheus-integration' into develop airavata-services/services-security/pom.xml | 5 +++++ .../service/security/interceptor/SecurityInterceptor.java | 4 ++++ .../inventories/scigap/develop/group_vars/all/vars.yml | 4 ++++ .../inventories/scigap/production/group_vars/all/vars.yml | 4 ++++ dev-tools/ansible/roles/api-orch/tasks/main.yml | 11 +++++++++++ .../roles/api-orch/templates/airavata-server.properties.j2 | 7 +++++++ .../org/apache/airavata/patform/monitoring/CountMonitor.java | 12 ++++++++++++ .../src/main/java/org/apache/airavata/server/ServerMain.java | 10 ++++++++++ 8 files changed, 57 insertions(+)
