Merge pull request #635 from jschoiRR/mold-main#2025

[Mold API, UI] 모니터링 링크 생성 및 설정값 수정(vm, host, cluster)

Author: jschoiRR

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<String> MonitoringWallPortalPort = new ConfigKey<String>("Advanced", String.class, "monitoring.wall.portal.port",
             "3000", "Monitoring Service Wall Portal Port.(ex:3000)", true);
     public static final ConfigKey<String> MonitoringWallPortalVmUri = new ConfigKey<String>("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<String> MonitoringWallPortalHostUri = new ConfigKey<String>("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<String> MonitoringWallPortalClusterUri = new ConfigKey<String>("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<Boolean> EventDeleteEnabled = new ConfigKey<>("Advanced", Boolean.class, "event.delete.enabled",
             "false", "true if Event Delete Button is enabled, false otherwise)", false);
 

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 () {

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
         }
       })

ui/src/views/image/TemplateZones.vue

@@ -103,16 +103,14 @@
       <template #action="{ record }">
         <tooltip-button
           style="margin-right: 5px"
-          :dataSource="templates"
-          :disabled="!('copyTemplate' in $store.getters.apis && record.isready) || templates.includes(record.id)"
+          :disabled="!('copyTemplate' in $store.getters.apis && record.isready)"
           :title="$t('label.action.copy.template')"
           icon="copy-outlined"
-          :loading="copyLoading || fetchLoading"
+          :loading="copyLoading"
           @onClick="showCopyTemplate(record)" />
         <tooltip-button
           style="margin-right: 5px"
-          :dataSource="templates"
-          :disabled="!('deleteTemplate' in $store.getters.apis) || templates.includes(record.id)"
+          :disabled="!('deleteTemplate' in $store.getters.apis)"
           :title="$t('label.action.delete.template')"
           type="primary"
           :danger="true"
@@ -274,7 +272,6 @@ export default {
     return {
       columns: [],
       dataSource: [],
-      templates: [],
       page: 1,
       pageSize: 10,
       itemCount: 0,
@@ -397,31 +394,8 @@ export default {
         this.itemCount = json.listtemplatesresponse.count || 0
       }).catch(error => {
         this.$notifyError(error)
-      }).finally(() => {
-      })
-      this.templates = []
-      api('listDesktopControllerVersions').then(json => {
-        var items = json.listdesktopcontrollerversionsresponse.desktopcontrollerversion
-        if (items != null) {
-          for (var i = 0; i < items.length; i++) {
-            for (var j = 0; j < items[i].templates.length; j++) {
-              this.templates.push(items[i].templates[j].id)
-            }
-          }
-        }
-      }).finally(() => {
-      })
-      api('listDesktopMasterVersions').then(json => {
-        var items = json.listdesktopmasterversionsresponse.desktopmasterversion
-        if (items != null) {
-          for (var i = 0; i < items.length; i++) {
-            this.templates.push(items[i].templateid)
-          }
-        }
       }).finally(() => {
         this.fetchLoading = false
-        // this.$set(this.resource, 'templates', this.templates)
-        // this.resource.templetes = this.templates
       })
       this.fetchZoneData()
     },

ui/src/views/plugins/IFrameWall.vue

@@ -53,10 +53,10 @@ export default {
         var uri = wallPortalProtocol + '://' + wallPortalDomain + ':' + wallPortalPort
         if (typeof hypervisortype !== 'undefined' && hypervisortype !== null && hypervisortype !== '') {
           const clusterUriPath = items.filter(x => x.name === 'monitoring.wall.portal.cluster.uri')[0]?.value
-          this.uriInfo = uri + clusterUriPath + '?theme=light'
+          this.uriInfo = uri + clusterUriPath
         } else {
           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
       })