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 19:58:18 UTC

[airavata] branch develop updated (de6b317 -> 9939e07)

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from de6b317  Merge branch 'prometheus-integration' into develop
     add a8d5eb9  Monitoring API Server Requests
     new 9939e07  Merge branch 'prometheus-integration' into develop

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 +++++
 .../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(+)

[airavata] 01/01: Merge branch 'prometheus-integration' into develop

Posted by di...@apache.org.
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 <di...@gmail.com>
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(+)