update version.

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build: 
       context: .
       dockerfile: docker/orion-ops/Dockerfile
-    image: orion-ops:1.2.0
+    image: orion-ops:1.2.0-beta
     ports:
       - "3090:80"
     environment:

orion-ops-api/orion-ops-web/src/main/java/com/orion/ops/expose/MachineMonitorExposeController.java

@@ -0,0 +1,41 @@
+package com.orion.ops.expose;
+
+import com.orion.ops.annotation.RestWrapper;
+import com.orion.ops.constant.monitor.MonitorStatus;
+import com.orion.ops.entity.domain.MachineMonitorDO;
+import com.orion.ops.service.api.MachineMonitorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 机器监控 暴露api
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2022/9/1 17:52
+ */
+@Api(tags = "暴露服务-机器监控")
+@RestController
+@RestWrapper
+@RequestMapping("/orion/expose-api/machine-monitor")
+public class MachineMonitorExposeController {
+
+    @Resource
+    private MachineMonitorService machineMonitorService;
+
+    @GetMapping("/started")
+    @ApiOperation(value = "监控启动回调")
+    public Integer getAlarmConfig(@RequestParam("machineId") Long machineId, @RequestParam("version") String version) {
+        MachineMonitorDO update = new MachineMonitorDO();
+        update.setMonitorStatus(MonitorStatus.RUNNING.getStatus());
+        update.setAgentVersion(version);
+        return machineMonitorService.updateMonitorConfigByMachineId(machineId, update);
+    }
+
+}

orion-ops-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orion-ops-vue",
-  "version": "1.2.0",
+  "version": "1.2.0-beta",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

orion-ops-vue/src/components/machine/MachineMonitorChart.vue

@@ -1037,6 +1037,10 @@ export default {
     color: #000;
     padding-top: 4px;
   }
+
+  .monitor-action-wrapper {
+    display: none;
+  }
 }
 
 .disk-selector {

orion-ops-vue/src/components/machine/MachineMonitorConfigModal.vue

@@ -92,6 +92,11 @@ export default {
           this.loading = false
           return
         }
+        if (values.url.endsWith('/')) {
+          this.loading = false
+          this.$message.warning('url 不能以 / 结尾')
+          return
+        }
         if (submit) {
           this.submit(values)
         } else {

orion-ops-vue/src/views/machine/MachineMonitorList.vue

@@ -319,7 +319,6 @@ export default {
         this.globaLoadingTip = `${row.machineName}(${row.machineHost}) 正在检测...`
         this.globaLoading = true
         const beforeStatus = row.status
-        row.status = MONITOR_STATUS.STARTING.value
         try {
           const { data } = await this.$api.checkMachineMonitorAgentStatus({
             machineId: row.machineId