From 5fae9dde5ab1afeb55b31da9b9b45373f3eec33a Mon Sep 17 00:00:00 2001 From: AkumuYuma Date: Thu, 19 Jan 2023 13:25:34 +0100 Subject: [PATCH 1/2] Made optional monitoring url field --- .gitignore | 9 +++++++++ .../config/properties/MonitoringProperties.java | 4 ++-- .../service/MonitoringServiceImpl.java | 5 +++++ src/main/resources/application.properties | 15 ++++++++------- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5e2ed86e89..6773b4c1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,12 @@ target/ # Builded war file /docker/*.war /docker/*.jar +src/main/resources/application.properties +src/main/resources/security.yml +.vscode/launch.json +.vscode/settings.json +ignite/README.txt +ignite/work/marshaller/-460393002.classname0 +ignite/work/marshaller/-1327618522.classname0 +ignite/work/marshaller/1651944940.classname0 +src/main/resources/application.properties diff --git a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java index 51d219b8c6..8c838eed35 100644 --- a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java +++ b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java @@ -34,8 +34,8 @@ @NoArgsConstructor public class MonitoringProperties { - @NotNull - @NonNull + // @NotNull + // @NonNull private URI url; @NotNull diff --git a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java index ab4d5daa3a..ce8283357f 100644 --- a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java +++ b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java @@ -51,6 +51,11 @@ public MonitoringServiceImpl(MonitoringProperties monitoringProperties, @Override public Group getProviderData(String providerId) { + if (monitoringProperties.getUrl() == null) { + throw new DeploymentException( + "Error fetching monitoring data for provider <" + providerId + ">"); + } + URI requestUri = UriComponentsBuilder .fromHttpUrl(monitoringProperties.getUrl() + monitoringProperties.getProviderMetricsPath()) .buildAndExpand(providerId) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2bb9e34761..eca5966f8b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,14 +2,14 @@ datasource.orchestrator.name=orchestrator datasource.orchestrator.url=jdbc:mysql://127.0.0.1:3306/orchestrator?useSSL=false datasource.orchestrator.username=root -datasource.orchestrator.password=root +datasource.orchestrator.password=Password datasource.orchestrator.xa.properties.pinGlobalTxToPhysicalConnection=true datasource.orchestrator.liquibase.change-log=classpath:/db/changelog/db.orchestrator.changelog-master.yaml datasource.workflow.name=workflow datasource.workflow.url=jdbc:mysql://127.0.0.1:3306/workflow?useSSL=false datasource.workflow.username=root -datasource.workflow.password=root +datasource.workflow.password=Password datasource.workflow.xa.properties.pinGlobalTxToPhysicalConnection=true datasource.workflow.liquibase.change-log=classpath:/db/changelog/db.workflow.changelog-master.yaml @@ -75,19 +75,20 @@ tosca.definitions-folder=classpath\:tosca-definitions/ orchestrator.url=http://localhost:8080 ########## Cloud Provider Ranker Configuration ########## -cpr.url=https\://indigo-paas.cloud.ba.infn.it/cpr +cpr.url=https://dashboard.recas.ba.infn.it/cpr ########## SLAM Configuration ########## -slam.url=http://indigo.cloud.plgrid.pl/slam +slam.url=https://dashboard.recas.ba.infn.it:8443/rest/slam ########## CMDB Configuration ########## -cmdb.url=http://indigo.cloud.plgrid.pl/cmdb +cmdb.url=https://dashboard.recas.ba.infn.it/cmdb ########## IM Configuration ########## -im.url=https://servproject.i3m.upv.es:8811 +im.url=https://dashboard.recas.ba.infn.it/im ########## Zabbix Wrapper Configuration ########## -monitoring.url=http://90.147.170.181 +monitoring.url= +# http://90.147.170.181 ########## Onedata Configuration ########## onedata.onezone-url=https\://onezone-beta.cloud.ba.infn.it From 3acbac129d86235a2e42d3cdc11ac0f8b9741d4d Mon Sep 17 00:00:00 2001 From: AkumuYuma Date: Sat, 25 Feb 2023 11:59:20 +0100 Subject: [PATCH 2/2] restored old properties --- .gitignore | 10 +--------- src/main/resources/application.properties | 15 +++++++-------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 6773b4c1a5..c3b839e403 100644 --- a/.gitignore +++ b/.gitignore @@ -49,12 +49,4 @@ target/ # Builded war file /docker/*.war /docker/*.jar -src/main/resources/application.properties -src/main/resources/security.yml -.vscode/launch.json -.vscode/settings.json -ignite/README.txt -ignite/work/marshaller/-460393002.classname0 -ignite/work/marshaller/-1327618522.classname0 -ignite/work/marshaller/1651944940.classname0 -src/main/resources/application.properties +src/test/java/it/reply/orchestrator/dal/entity/ReplicationRuleTest.java diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index eca5966f8b..2bb9e34761 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,14 +2,14 @@ datasource.orchestrator.name=orchestrator datasource.orchestrator.url=jdbc:mysql://127.0.0.1:3306/orchestrator?useSSL=false datasource.orchestrator.username=root -datasource.orchestrator.password=Password +datasource.orchestrator.password=root datasource.orchestrator.xa.properties.pinGlobalTxToPhysicalConnection=true datasource.orchestrator.liquibase.change-log=classpath:/db/changelog/db.orchestrator.changelog-master.yaml datasource.workflow.name=workflow datasource.workflow.url=jdbc:mysql://127.0.0.1:3306/workflow?useSSL=false datasource.workflow.username=root -datasource.workflow.password=Password +datasource.workflow.password=root datasource.workflow.xa.properties.pinGlobalTxToPhysicalConnection=true datasource.workflow.liquibase.change-log=classpath:/db/changelog/db.workflow.changelog-master.yaml @@ -75,20 +75,19 @@ tosca.definitions-folder=classpath\:tosca-definitions/ orchestrator.url=http://localhost:8080 ########## Cloud Provider Ranker Configuration ########## -cpr.url=https://dashboard.recas.ba.infn.it/cpr +cpr.url=https\://indigo-paas.cloud.ba.infn.it/cpr ########## SLAM Configuration ########## -slam.url=https://dashboard.recas.ba.infn.it:8443/rest/slam +slam.url=http://indigo.cloud.plgrid.pl/slam ########## CMDB Configuration ########## -cmdb.url=https://dashboard.recas.ba.infn.it/cmdb +cmdb.url=http://indigo.cloud.plgrid.pl/cmdb ########## IM Configuration ########## -im.url=https://dashboard.recas.ba.infn.it/im +im.url=https://servproject.i3m.upv.es:8811 ########## Zabbix Wrapper Configuration ########## -monitoring.url= -# http://90.147.170.181 +monitoring.url=http://90.147.170.181 ########## Onedata Configuration ########## onedata.onezone-url=https\://onezone-beta.cloud.ba.infn.it