bugfix threshold availability automatically carries threshold paramet…

…ers (#1285)
apache · Oct 13, 2023 · c385bce · c385bce
1 parent 08fbe50
commit c385bce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/manager/src/main/resources/define/app-windows.yml b/manager/src/main/resources/define/app-windows.yml
@@ -277,27 +277,6 @@ metrics:
         hrStorageUsed: 1.3.6.1.2.1.25.2.3.1.6
         hrStorageAllocationUnits: 1.3.6.1.2.1.25.2.3.1.4
 
-  - name: disk
-    priority: 2
-    fields:
-      - field: dskPath
-        type: 1
-      - field: dskDevice
-        type: 1
-      - field: dskTotal
-        type: 1
-    protocol: snmp
-    snmp:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      timeout: ^_^timeout^_^
-      community: ^_^community^_^
-      version: ^_^version^_^
-      oids:
-        dskPath: 1.3.6.1.4.1.2021.9.1.2
-        dskDevice: 1.3.6.1.4.1.2021.9.1.3
-        dskTotal: 1.3.6.1.4.1.2021.9.1.6
-
   - name: network
     priority: 3
     fields:

diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
@@ -429,14 +429,15 @@ export class AlertSettingComponent implements OnInit {
     this.define.metric = this.cascadeValues[1];
     if (this.cascadeValues.length == 3) {
       this.define.field = this.cascadeValues[2];
+      if (!this.isExpr) {
+        let expr = this.calculateAlertRuleExpr();
+        if (expr != '') {
+          this.define.expr = expr;
+        }
+      }
     } else {
       this.define.expr = '';
-    }
-    if (!this.isExpr) {
-      let expr = this.calculateAlertRuleExpr();
-      if (expr != '') {
-        this.define.expr = expr;
-      }
+      this.define.field = '';
     }
     if (this.isManageModalAdd) {
       const modalOk$ = this.alertDefineSvc