Skip to content
Snippets Groups Projects
Commit 92bcc368 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch 'small-fixes-clusters' into 'develop'

Small fixes clusters

See merge request !195
parents c77dd4de 03cd4bc2
Branches
No related tags found
2 merge requests!273Release 1.8.0 update,!195Small fixes clusters
Pipeline #94239 passed
......@@ -37,8 +37,8 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
......@@ -46,8 +46,8 @@ import java.util.Optional;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@Slf4j
@RequiredArgsConstructor
public class RemoteClusterManager implements ClusterMonitoringService {
private final KClusterRepository clusterRepository;
......@@ -137,11 +137,11 @@ public class RemoteClusterManager implements ClusterMonitoringService {
.state(KClusterState.UNKNOWN)
.contactEmail(view.getContactEmail())
.currentStateSince(OffsetDateTime.now())
.domains(view.getDomainNames().stream().map(d -> {
.domains(!view.getDomainNames().isEmpty() ? view.getDomainNames().stream().map(d -> {
Optional<Domain> dom = domainService.findDomain(d);
return dom.orElse(null);
}
).toList())
).toList() : Collections.emptyList())
.build(),
file);
......
......@@ -192,7 +192,8 @@
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
"DETAILS" : "Details",
"STATE_SINCE" : "State last change"
"STATE_SINCE" : "State last change",
"CONTACT_MAIL" : "Contact mail"
},
"GITLAB": {
"TITLE": "GitLab Konfiguration",
......@@ -1307,5 +1308,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
},
"WEBHOOKS" : {
"TITLE" : "Webhooks settings",
"TITLE_SHORT" : "Webhooks",
"ID" : "Id",
"NAME" : "Name",
"TARGET_URL" : "Target Url",
"TYPE" : "Webhook type",
"TOKEN" : "Token value",
"AUTH" : "Authorization header",
"DOMAIN_CREATION" : "Domain creation",
"APPLICATION_DEPLOYMENT" : "Application deployment",
"USER_ASSIGNMENT" : "User assignment",
"DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
......@@ -192,6 +192,7 @@
"UP" : "Up",
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
"CONTACT_MAIL" : "Contact mail"
"DETAILS" : "Details",
"STATE_SINCE" : "State last change"
},
......@@ -1312,5 +1313,20 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
},
"WEBHOOKS" : {
"TITLE" : "Webhooks settings",
"TITLE_SHORT" : "Webhooks",
"ID" : "Id",
"NAME" : "Name",
"TARGET_URL" : "Target Url",
"TYPE" : "Webhook type",
"TOKEN" : "Token value",
"AUTH" : "Authorization header",
"DOMAIN_CREATION" : "Domain creation",
"APPLICATION_DEPLOYMENT" : "Application deployment",
"USER_ASSIGNMENT" : "User assignment",
"DOMAIN_GROUP_CHANGE" : "Domain group change",
"NEW" : "Add webhook"
}
}
......@@ -193,6 +193,7 @@
"UP" : "Up",
"DOWN" : "Down",
"UNKNOWN" : "Unknown",
"CONTACT_MAIL" : "Contact mail",
"DETAILS" : "Details",
"STATE_SINCE" : "State last change"
},
......@@ -1311,5 +1312,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
},
"WEBHOOKS" : {
"TITLE" : "Webhooks settings",
"TITLE_SHORT" : "Webhooks",
"ID" : "Id",
"NAME" : "Name",
"TARGET_URL" : "Target Url",
"TYPE" : "Webhook type",
"TOKEN" : "Token value",
"AUTH" : "Authorization header",
"DOMAIN_CREATION" : "Domain creation",
"APPLICATION_DEPLOYMENT" : "Application deployment",
"USER_ASSIGNMENT" : "User assignment",
"DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
......@@ -192,6 +192,7 @@
"UP" : "Aktywny",
"DOWN" : "Nieaktywny",
"UNKNOWN" : "Nieznany",
"CONTACT_MAIL" : "Email kontaktowy",
"DETAILS" : "Detale",
"STATE_SINCE" : "Stan od"
},
......@@ -1310,5 +1311,19 @@
},
"SHARED" : {
"TOGGLE" : "Toggle all"
},
"WEBHOOKS" : {
"TITLE" : "Webhooks settings",
"TITLE_SHORT" : "Webhooks",
"ID" : "Id",
"NAME" : "Name",
"TARGET_URL" : "Target Url",
"TYPE" : "Webhook type",
"TOKEN" : "Token value",
"AUTH" : "Authorization header",
"DOMAIN_CREATION" : "Domain creation",
"APPLICATION_DEPLOYMENT" : "Application deployment",
"USER_ASSIGNMENT" : "User assignment",
"DOMAIN_GROUP_CHANGE" : "Domain group change"
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment