diff --git a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java index e5e63ee42083..3c3fc0dc40f0 100644 --- a/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java +++ b/api/src/main/java/org/apache/cloudstack/config/ApiServiceConfiguration.java @@ -37,11 +37,11 @@ public class ApiServiceConfiguration implements Configurable {public static fina public static final ConfigKey MonitoringWallPortalPort = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.port", "3000", "Monitoring Service Wall Portal Port.(ex:3000)", true); public static final ConfigKey MonitoringWallPortalVmUri = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.vm.uri", - "/d/ldwEyoKnz/gasangmeosin-sangse-hyeonhwang", "Monitoring Service Wall Portal Uri.(ex:/d/ldwEyoKnz/gasangmeosin-sangse-hyeonhwang)", true); + "/d/uservm?kiosk&theme=light", "Monitoring Service Wall Portal VM Uri.(ex:/d/uservm?kiosk&theme=light)", true); public static final ConfigKey MonitoringWallPortalHostUri = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.host.uri", - "/d/Q3Jkjf54z/c8fd170", "Monitoring Service Wall Portal Host Uri.(ex:/d/Q3Jkjf54z/c8fd170)", true); + "/d/Q3Jkjf54zs?kiosk&theme=light", "Monitoring Service Wall Portal Host Uri.(ex:/d/Q3Jkjf54zs?kiosk&theme=light)", true); public static final ConfigKey MonitoringWallPortalClusterUri = new ConfigKey("Advanced", String.class, "monitoring.wall.portal.cluster.uri", - "/d/fe4e0f7t7qjgga/ed98b8-ec8aa4-ed8ab8-eca285-ed95a9-ed9884-ed99a9", "Monitoring Service Wall Portal Cluster Uri.(ex:/d/fe4e0f7t7qjgga/ed98b8-ec8aa4-ed8ab8-eca285-ed95a9-ed9884-ed99a9)", true); + "/d/fasdasdasdw?kiosk&theme=light", "Monitoring Service Wall Portal Cluster Uri.(ex:/d/fasdasdasdw?kiosk&theme=light)", true); public static final ConfigKey EventDeleteEnabled = new ConfigKey<>("Advanced", Boolean.class, "event.delete.enabled", "false", "true if Event Delete Button is enabled, false otherwise)", false); diff --git a/ui/src/components/header/UserMenu.vue b/ui/src/components/header/UserMenu.vue index f3fb1c14b212..65e73979da8f 100644 --- a/ui/src/components/header/UserMenu.vue +++ b/ui/src/components/header/UserMenu.vue @@ -205,16 +205,16 @@ export default { }, wallPortalLink () { api('listConfigurations', { keyword: 'monitoring.wall.portal' }).then(json => { - var items = json.listconfigurationsresponse.configuration - var wallPortalProtocol = items.filter(x => x.name === 'monitoring.wall.portal.protocol')[0]?.value + const items = json.listconfigurationsresponse.configuration + const wallPortalProtocol = items.filter(x => x.name === 'monitoring.wall.portal.protocol')[0]?.value const wallPortalPort = items.filter(x => x.name === 'monitoring.wall.portal.port')[0]?.value var wallPortalDomain = items.filter(x => x.name === 'monitoring.wall.portal.domain')[0]?.value if (wallPortalDomain === null || wallPortalDomain === '') { wallPortalDomain = this.$store.getters.features.host } - var uri = wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort - this.uriInfo = uri + '/login?orgId=1' - window.open(uri, '_blank') + const uri = wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort + this.uriInfo = uri + '/logout' + window.open(this.uriInfo, '_blank') }) }, async fetchConfigurationSwitch () { diff --git a/ui/src/components/widgets/WallLinkUrl.vue b/ui/src/components/widgets/WallLinkUrl.vue index 9612de555cdd..9fca5eed1d6a 100644 --- a/ui/src/components/widgets/WallLinkUrl.vue +++ b/ui/src/components/widgets/WallLinkUrl.vue @@ -63,15 +63,15 @@ export default { uri += wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort if (this.scope === 'vm') { const vmUriPath = items.filter(x => x.name === 'monitoring.wall.portal.vm.uri')[0]?.value - this.uriInfo = uri + vmUriPath + '?kiosk&orgId=2&theme=light&var-vm_uuid=' + this.resource.id + this.uriInfo = uri + vmUriPath + '&var-vm_uuid=' + this.resource.id this.uriCreateOk = true } else if (this.scope === 'host') { const hostUriPath = items.filter(x => x.name === 'monitoring.wall.portal.host.uri')[0]?.value - this.uriInfo = uri + hostUriPath + '?from=now-1h&to=now&theme=light&var-host=' + this.resource.ipaddress + this.uriInfo = uri + hostUriPath + '&var-host=' + this.resource.ipaddress this.uriCreateOk = true } else if (this.scope === 'cluster') { const clusterUriPath = items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value - this.uriInfo = uri + clusterUriPath + '?theme=light' + this.uriInfo = uri + clusterUriPath this.uriCreateOk = true } }) diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue index 562c7a0c87d3..701f7aa6699e 100644 --- a/ui/src/views/image/TemplateZones.vue +++ b/ui/src/views/image/TemplateZones.vue @@ -103,16 +103,14 @@