@alicloud/cms20240330 10.0.0 → 10.0.1

package/src/models/AlertRuleQuery.ts

@@ -6,7 +6,7 @@ import { AlertRuleSlsQueryJoin } from "./AlertRuleSlsQueryJoin";
 export class AlertRuleQueryEntityFields extends $dara.Model {
   /**
    * @remarks
-   * The name of the entity field.
+   * The entity field name.
    * 
    * @example
    * instanceId
@@ -14,7 +14,7 @@ export class AlertRuleQueryEntityFields extends $dara.Model {
   field?: string;
   /**
    * @remarks
-   * The value of the field.
+   * The field value.
    * 
    * @example
    * i-abc123
@@ -62,7 +62,7 @@ export class AlertRuleQueryEntityFilterFilters extends $dara.Model {
   operator?: string;
   /**
    * @remarks
-   * The value to match.
+   * The matched value.
    * 
    * @example
    * wait_throw
@@ -96,7 +96,7 @@ export class AlertRuleQueryEntityFilterFilters extends $dara.Model {
 export class AlertRuleQueryEntityFilter extends $dara.Model {
   /**
    * @remarks
-   * The domain of the resource type.
+   * The resource type domain.
    * 
    * @example
    * rum
@@ -104,7 +104,7 @@ export class AlertRuleQueryEntityFilter extends $dara.Model {
   domain?: string;
   /**
    * @remarks
-   * A list of filter conditions to further screen resources.
+   * The list of filter conditions used to further filter resources.
    */
   filters?: AlertRuleQueryEntityFilterFilters[];
   /**
@@ -146,7 +146,7 @@ export class AlertRuleQueryEntityFilter extends $dara.Model {
 export class AlertRuleQueryLabelFilters extends $dara.Model {
   /**
    * @remarks
-   * The name of the label.
+   * The label name.
    * 
    * @example
    * app
@@ -162,7 +162,7 @@ export class AlertRuleQueryLabelFilters extends $dara.Model {
   operator?: string;
   /**
    * @remarks
-   * The value of the label.
+   * The label value.
    * 
    * @example
    * web
@@ -230,15 +230,11 @@ export class AlertRuleQueryQueriesApmFilters extends $dara.Model {
   dim?: string;
   /**
    * @remarks
-   * The filter operation type:
-   * 
-   * - eq: Equal to
-   * 
-   * - neq: Not equal to
-   * 
-   * - match: Regular expression match
-   * 
-   * - nmatch: Regular expression non-match
+   * The filter operation type. Valid values:
+   * - eq: equal to
+   * - neq: not equal to
+   * - match: regex match
+   * - nmatch: regex not match
    * 
    * @example
    * eq
@@ -246,7 +242,7 @@ export class AlertRuleQueryQueriesApmFilters extends $dara.Model {
   type?: string;
   /**
    * @remarks
-   * The value that corresponds to the filter operation.
+   * The value corresponding to the filter operation.
    * 
    * @example
    * h3ji7a0y9i@2ac80e27fdfd0a2
@@ -277,12 +273,41 @@ export class AlertRuleQueryQueriesApmFilters extends $dara.Model {
   }
 }
 
+export class AlertRuleQueryQueriesLabelFilters extends $dara.Model {
+  name?: string;
+  operator?: string;
+  value?: string;
+  static names(): { [key: string]: string } {
+    return {
+      name: 'name',
+      operator: 'operator',
+      value: 'value',
+    };
+  }
+
+  static types(): { [key: string]: any } {
+    return {
+      name: 'string',
+      operator: 'string',
+      value: 'string',
+    };
+  }
+
+  validate() {
+    super.validate();
+  }
+
+  constructor(map?: { [key: string]: any }) {
+    super(map);
+  }
+}
+
 export class AlertRuleQueryQueries extends $dara.Model {
   /**
    * @remarks
    * Applicable query type: APM_MULTI_QUERY.
    * 
-   * The ID of the predefined Application Performance Management (APM) metric.
+   * The ID of the APM predefined metric.
    * 
    * @example
    * appstat.jvm.ThreadNewCount
@@ -292,21 +317,21 @@ export class AlertRuleQueryQueries extends $dara.Model {
    * @remarks
    * Applicable query type: ARMS_MULTI_QUERY.
    * 
-   * The dimension filter configuration for the APM metric. This parameter must be used with apmAlertMetricId.
+   * The dimension filter configuration for the APM metric. Must be used together with apmAlertMetricId.
    */
   apmFilters?: AlertRuleQueryQueriesApmFilters[];
   /**
    * @remarks
    * Applicable query type: ARMS_MULTI_QUERY.
    * 
-   * A list of aggregation dimensions for the query. This specifies the metric dimensions to use for aggregation.
+   * The list of aggregation dimensions for the query, specifying which metric dimensions to aggregate by.
    */
   apmGroupBy?: string[];
   /**
    * @remarks
    * Applicable query type: ARMS_MULTI_QUERY.
    * 
-   * The duration of the alert data.
+   * The alert data duration.
    * 
    * @example
    * 120
@@ -316,9 +341,9 @@ export class AlertRuleQueryQueries extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The relative end time of the time offset.
+   * The relative time offset end time.
    * 
-   * If you specify start and end, do not specify window.
+   * If start and end are specified, do not specify window.
    * 
    * @example
    * 0
@@ -326,27 +351,29 @@ export class AlertRuleQueryQueries extends $dara.Model {
   end?: number;
   /**
    * @remarks
-   * Applicable query types: APM_MULTI_QUERY and SLS_MULTI_QUERY.
+   * Applicable query types: APM_MULTI_QUERY, SLS_MULTI_QUERY.
    * 
    * The query expression.
    * 
-   * - For APM_MULTI_QUERY, this parameter is optional. It is the PromQL expression generated for a predefined metric, used for data preview.
-   * 
-   * - For SLS_MULTI_QUERY, this parameter is the SQL search statement.
+   * - For APM_MULTI_QUERY, this field is optional and contains the PromQL generated for predefined metrics (used for data preview).
+   * - For SLS_MULTI_QUERY, this field contains the SQL query statement.
    * 
    * @example
    * sum by (rpc,acs_arms_service_id,pid,rpcType) (sum_over_time_lorc(arms_app_requests_count_ign_destid_endpoint_parent_ppid_prpc{callKind=~\\"http|rpc|custom_entry|server|consumer\\",pid=\\"gaddp9ap8q@cb005ffdf44b8ac\\",source=\\"apm\\"}[1m]))
    */
   expr?: string;
+  labelFilters?: AlertRuleQueryQueriesLabelFilters[];
+  metric?: string;
+  metricSet?: string;
   name?: string;
   promQl?: string;
   /**
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The relative start time of the time offset for an SLS query.
+   * The relative time offset start time for the SLS query.
    * 
-   * If you specify start and end, do not specify window. For example, if start is 15 and timeUnit is minute, the time offset starts 15 minutes ago.
+   * If start and end are specified, do not specify window. Example: start=15, timeUnit=minute indicates 15 minutes ago.
    * 
    * @example
    * 15
@@ -356,7 +383,7 @@ export class AlertRuleQueryQueries extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The time unit for the start, end, and window parameters. Valid values: day, hour, minute, and second.
+   * The time unit for the start, end, and window parameters: day/hour/minute/second.
    * 
    * @example
    * hour
@@ -366,7 +393,7 @@ export class AlertRuleQueryQueries extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The query interval for a time frame. If you specify window, do not specify start and end.
+   * The time frame query interval. If window is specified, do not specify start or end.
    * 
    * @example
    * 1
@@ -380,6 +407,9 @@ export class AlertRuleQueryQueries extends $dara.Model {
       duration: 'duration',
       end: 'end',
       expr: 'expr',
+      labelFilters: 'labelFilters',
+      metric: 'metric',
+      metricSet: 'metricSet',
       name: 'name',
       promQl: 'promQl',
       start: 'start',
@@ -396,6 +426,9 @@ export class AlertRuleQueryQueries extends $dara.Model {
       duration: 'number',
       end: 'number',
       expr: 'string',
+      labelFilters: { 'type': 'array', 'itemType': AlertRuleQueryQueriesLabelFilters },
+      metric: 'string',
+      metricSet: 'string',
       name: 'string',
       promQl: 'string',
       start: 'number',
@@ -411,6 +444,9 @@ export class AlertRuleQueryQueries extends $dara.Model {
     if(Array.isArray(this.apmGroupBy)) {
       $dara.Model.validateArray(this.apmGroupBy);
     }
+    if(Array.isArray(this.labelFilters)) {
+      $dara.Model.validateArray(this.labelFilters);
+    }
     super.validate();
   }
 
@@ -420,11 +456,12 @@ export class AlertRuleQueryQueries extends $dara.Model {
 }
 
 export class AlertRuleQuery extends $dara.Model {
+  aggregate?: string;
   /**
    * @remarks
    * Applicable query type: PROMQL_QUERY.
    * 
-   * Specifies whether to run the alert check only after the data is complete.
+   * Specifies whether to perform alert detection only after data is complete.
    * 
    * @example
    * true
@@ -432,14 +469,14 @@ export class AlertRuleQuery extends $dara.Model {
   checkAfterDataComplete?: boolean;
   /**
    * @remarks
-   * Applicable query type: CMS_BASIC_QUERY.
+   * Applicable query type: CMS_BASIC_QUERY.  
    * 
-   * A list of filter dimensions for the resource.
+   * The list of filter dimensions for the resource.
    */
   dimensions?: { [key: string]: string }[];
   /**
    * @remarks
-   * The realm to which the resource belongs.
+   * The domain to which the resource belongs.
    * 
    * @example
    * rum
@@ -449,7 +486,7 @@ export class AlertRuleQuery extends $dara.Model {
    * @remarks
    * Applicable query type: PROMQL_QUERY.
    * 
-   * The duration for which the alert data persists, in seconds.
+   * The duration for which alert data persists. Unit: seconds.
    * 
    * @example
    * 60
@@ -457,12 +494,12 @@ export class AlertRuleQuery extends $dara.Model {
   duration?: number;
   /**
    * @remarks
-   * An array of entity field filters.
+   * The array of entity field filters.
    */
   entityFields?: AlertRuleQueryEntityFields[];
   /**
    * @remarks
-   * A resource filter used to screen target resources.
+   * The resource filter used to filter target resources.
    */
   entityFilter?: AlertRuleQueryEntityFilter;
   /**
@@ -479,21 +516,21 @@ export class AlertRuleQuery extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The configuration for the join operation on the result sets of subquery 1 (queries[0]) and subquery 2 (queries[1]).
+   * The set join operation configuration for the results of subquery 1 (queries[0]) and subquery 2 (queries[1]).
    */
   firstJoin?: AlertRuleSlsQueryJoin;
   /**
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * A list of grouping field names.
+   * The list of group field names.
    */
   groupFieldList?: string[];
   /**
    * @remarks
    * Applicable query type: CMS_BASIC_QUERY.
    * 
-   * The ID of the associated application group. This parameter is valid only when relationType is set to GROUP.
+   * The ID of the associated application group. This parameter takes effect only when relationType is set to GROUP.
    * 
    * @example
    * 23423
@@ -503,13 +540,10 @@ export class AlertRuleQuery extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The grouping type. Valid values:
-   * 
-   * - none: No grouping.
-   * 
-   * - label: Automatic grouping by tag.
-   * 
-   * - custom: Custom grouping by tag.
+   * The group type. Valid values:
+   * - none: no grouping.
+   * - label: automatic label-based grouping.
+   * - custom: custom label-based grouping.
    * 
    * @example
    * label
@@ -517,13 +551,14 @@ export class AlertRuleQuery extends $dara.Model {
   groupType?: string;
   /**
    * @remarks
-   * An array of label filters.
+   * The array of label filters.
    */
   labelFilters?: AlertRuleQueryLabelFilters[];
+  logSet?: string;
   markTags?: AlertRuleQueryMarkTags[];
   /**
    * @remarks
-   * The name of the metric.
+   * The metric name.
    * 
    * @example
    * memory
@@ -531,7 +566,7 @@ export class AlertRuleQuery extends $dara.Model {
   metric?: string;
   /**
    * @remarks
-   * The collection of metrics.
+   * The collection of monitoring metrics.
    * 
    * @example
    * cpu_usage
@@ -547,26 +582,24 @@ export class AlertRuleQuery extends $dara.Model {
    * acs_ecs_dashboard
    */
   namespace?: string;
+  offsetSecs?: number;
   /**
    * @remarks
    * Applicable query types: SLS_MULTI_QUERY and APM_MULTI_QUERY.
    * 
-   * A list of subqueries.
+   * The list of subqueries.
    * 
-   * For the SLS_MULTI_QUERY type, you can include up to three subqueries. The number and order of subqueries must match the sub-datasource configurations in datasource.dsList.
+   * For the SLS_MULTI_QUERY query type, a maximum of three subqueries are supported. The number and order of subqueries must match the sub-datasource config in datasource.dsList.
    */
   queries?: AlertRuleQueryQueries[];
   /**
    * @remarks
    * Applicable query type: CMS_BASIC_QUERY.
    * 
-   * The resource scope for the rule query. Valid values:
-   * 
-   * - USER: All resources under the user ID.
-   * 
-   * - GROUP: An application group.
-   * 
-   * - INSTANCE: A list of specified instances.
+   * The resource scope of the rule query. Valid values:
+   * - USER: all resources under the user UID.
+   * - GROUP: application group.
+   * - INSTANCE: specified instance list.
    * 
    * @example
    * USER
@@ -576,39 +609,31 @@ export class AlertRuleQuery extends $dara.Model {
    * @remarks
    * Applicable query type: SLS_MULTI_QUERY.
    * 
-   * The configuration for the join operation on the result sets of subquery 2 (queries[2]) and subquery 3 (queries[3]).
+   * The set join operation configuration for the results of subquery 2 (queries[2]) and subquery 3 (queries[3]).
    */
   secondJoin?: AlertRuleSlsQueryJoin;
   /**
    * @remarks
-   * A list of service IDs.
+   * The list of service IDs.
    */
   serviceIds?: string[];
   /**
    * @remarks
-   * The query type.
+   * The query type. 
    * 
    * Valid values:
+   * - PROMQL_QUERY: PromQL query.
+   * - SLS_MULTI_QUERY: SLS query.
+   * - APM_MULTI_QUERY: APM query.
+   * - CMS_BASIC_QUERY: basic cloud service monitoring query.
    * 
-   * - PROMQL_QUERY: A PromQL query.
-   * 
-   * - SLS_MULTI_QUERY: A Simple Log Service (SLS) query.
-   * 
-   * - APM_MULTI_QUERY: An APM query.
-   * 
-   * - CMS_BASIC_QUERY: A basic CloudMonitor query.
-   * 
-   * Different query types have different valid parameters in the query object. For more information, see the "Applicable query type" description for each parameter.
+   * Different query types use different valid fields in the query object. For more information, see the "Applicable query type" description of each field.
    * 
    * The query type must match the data source type. The mappings are as follows:
-   * 
    * - Prometheus data source (PROMETHEUS_DS): PROMQL_QUERY
-   * 
    * - APM data source (APM_DS): APM_MULTI_QUERY
-   * 
    * - SLS data source (SLS_MULTI_DS): SLS_MULTI_QUERY
-   * 
-   * - Basic CloudMonitor data source (CMS_BASIC_DS): CMS_BASIC_QUERY
+   * - Basic cloud service monitoring data source (CMS_BASIC_DS): CMS_BASIC_QUERY
    * 
    * This parameter is required.
    * 
@@ -616,8 +641,10 @@ export class AlertRuleQuery extends $dara.Model {
    * PROMQL_QUERY
    */
   type?: string;
+  windowSecs?: number;
   static names(): { [key: string]: string } {
     return {
+      aggregate: 'aggregate',
       checkAfterDataComplete: 'checkAfterDataComplete',
       dimensions: 'dimensions',
       domain: 'domain',
@@ -630,20 +657,24 @@ export class AlertRuleQuery extends $dara.Model {
       groupId: 'groupId',
       groupType: 'groupType',
       labelFilters: 'labelFilters',
+      logSet: 'logSet',
       markTags: 'markTags',
       metric: 'metric',
       metricSet: 'metricSet',
       namespace: 'namespace',
+      offsetSecs: 'offsetSecs',
       queries: 'queries',
       relationType: 'relationType',
       secondJoin: 'secondJoin',
       serviceIds: 'serviceIds',
       type: 'type',
+      windowSecs: 'windowSecs',
     };
   }
 
   static types(): { [key: string]: any } {
     return {
+      aggregate: 'string',
       checkAfterDataComplete: 'boolean',
       dimensions: { 'type': 'array', 'itemType': { 'type': 'map', 'keyType': 'string', 'valueType': 'string' } },
       domain: 'string',
@@ -656,15 +687,18 @@ export class AlertRuleQuery extends $dara.Model {
       groupId: 'string',
       groupType: 'string',
       labelFilters: { 'type': 'array', 'itemType': AlertRuleQueryLabelFilters },
+      logSet: 'string',
       markTags: { 'type': 'array', 'itemType': AlertRuleQueryMarkTags },
       metric: 'string',
       metricSet: 'string',
       namespace: 'string',
+      offsetSecs: 'number',
       queries: { 'type': 'array', 'itemType': AlertRuleQueryQueries },
       relationType: 'string',
       secondJoin: AlertRuleSlsQueryJoin,
       serviceIds: { 'type': 'array', 'itemType': 'string' },
       type: 'string',
+      windowSecs: 'number',
     };
   }
 

package/src/models/AlertRuleTemplate.ts

@@ -3,80 +3,31 @@ import * as $dara from '@darabonba/typescript';
 
 
 export class AlertRuleTemplate extends $dara.Model {
-  /**
-   * @remarks
-   * The type of the alert.
-   */
   alertType?: string;
-  /**
-   * @remarks
-   * The number of alert rules created from this template.
-   */
   applyCount?: number;
-  /**
-   * @remarks
-   * The description of the template.
-   */
+  bizType?: string;
+  datasource?: string;
   description?: string;
-  /**
-   * @remarks
-   * The creation time of the template, as a UNIX timestamp.
-   */
   gmtCreate?: number;
-  /**
-   * @remarks
-   * The time the template was last modified, as a UNIX timestamp.
-   */
   gmtModified?: number;
-  /**
-   * @remarks
-   * The ID of the alert rule template.
-   */
   id?: number;
-  /**
-   * @remarks
-   * Indicates whether the template is system-defined. Valid values: `0` (user-defined) and `1` (system-defined).
-   */
   isSystem?: number;
-  /**
-   * @remarks
-   * The labels associated with the template, formatted as a JSON string.
-   */
   labels?: string;
-  /**
-   * @remarks
-   * The rule configuration, formatted as a JSON string.
-   */
   ruleConfigs?: string;
-  /**
-   * @remarks
-   * The status of the template.
-   */
+  scenes?: string;
+  schemaVersion?: string;
+  sourceType?: string;
   status?: number;
-  /**
-   * @remarks
-   * The subtype of the alert.
-   */
   subType?: string;
-  /**
-   * @remarks
-   * The name of the alert rule template.
-   */
   templateName?: string;
-  /**
-   * @remarks
-   * The ID of the user who owns the template.
-   */
   userId?: string;
-  /**
-   * @remarks
-   * The universally unique identifier (UUID) of the template.
-   */
   uuid?: string;
   static names(): { [key: string]: string } {
     return {
       alertType: 'alertType',
       applyCount: 'applyCount',
+      bizType: 'bizType',
+      datasource: 'datasource',
       description: 'description',
       gmtCreate: 'gmtCreate',
       gmtModified: 'gmtModified',
@@ -84,6 +35,9 @@ export class AlertRuleTemplate extends $dara.Model {
       isSystem: 'isSystem',
       labels: 'labels',
       ruleConfigs: 'ruleConfigs',
+      scenes: 'scenes',
+      schemaVersion: 'schemaVersion',
+      sourceType: 'sourceType',
       status: 'status',
       subType: 'subType',
       templateName: 'templateName',
@@ -96,6 +50,8 @@ export class AlertRuleTemplate extends $dara.Model {
     return {
       alertType: 'string',
       applyCount: 'number',
+      bizType: 'string',
+      datasource: 'string',
       description: 'string',
       gmtCreate: 'number',
       gmtModified: 'number',
@@ -103,6 +59,9 @@ export class AlertRuleTemplate extends $dara.Model {
       isSystem: 'number',
       labels: 'string',
       ruleConfigs: 'string',
+      scenes: 'string',
+      schemaVersion: 'string',
+      sourceType: 'string',
       status: 'number',
       subType: 'string',
       templateName: 'string',