Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fiorente tesi dev #437

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fiorente tesi dev #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fae9dd
Made optional monitoring url field
AkumuYuma Jan 19, 2023
3acbac1
restored old properties
AkumuYuma Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ target/
# Builded war file
/docker/*.war
/docker/*.jar
src/test/java/it/reply/orchestrator/dal/entity/ReplicationRuleTest.java
4 changes: 2 additions & 2 deletions src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
@NoArgsConstructor
public class MonitoringProperties {

@NotNull
@NonNull
// @NotNull
// @NonNull
private URI url;

@NotNull
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down