@daocloud-proto/skoala 0.15.2 → 0.16.0

package/api/hosted/v1alpha1/nacos.pb.ts

@@ -100,6 +100,8 @@ export type Nacos = {
   version?: string
   nodeCount?: number
   healthNodeCount?: number
+  ipAddress?: string
+  consoleAddress?: string
   database?: NacosDatabase
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
   condition?: NacosCondition[]

package/api/skoala/v1alpha1/skoala.pb.ts

@@ -354,7 +354,7 @@ export class Grafana {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetSentinelDashGrafanaReq, SkoalaApiHostedV1alpha1Sentinel.GetSentinelDashGrafanaRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/grafana?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName"])}`, {...initReq, method: "GET"})
   }
   static GetAppsSentinelGrafana(req: SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaReq, SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/sentinels/${req["sentinelName"]}/apps/${req["app"]}/grafanas/apps-sentinel?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "sentinelName", "app"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaReq, SkoalaApiHostedV1alpha1Sentinel.GetAppsSentinelGrafanaRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/apps/${req["app"]}/grafana?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "app"])}`, {...initReq, method: "GET"})
   }
   static GetNacosGrafana(req: SkoalaApiHostedV1alpha1Nacos.GetNacosGrafanaReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosGrafanaRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosGrafanaReq, SkoalaApiHostedV1alpha1Nacos.GetNacosGrafanaRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/grafana?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName"])}`, {...initReq, method: "GET"})

package/insight/v1alpha1/alert.pb.ts

@@ -6,6 +6,12 @@
 
 import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 
+export enum CleanRuleType {
+  Clean_All = "Clean_All",
+  Clean_Unmatched = "Clean_Unmatched",
+  Clean_Specific = "Clean_Specific",
+}
+
 export enum RuleSource {
   RULE_SOURCE_UNSPECIFIED = "RULE_SOURCE_UNSPECIFIED",
   METRIC_TPL = "METRIC_TPL",
@@ -73,7 +79,7 @@ export type RuleSummary = {
   source?: RuleSource
   expr?: string
   thresholdSymbol?: string
-  thresholdNum?: string
+  thresholdNum?: number
   duration?: number
   status?: RuleStatus
   builtin?: boolean
@@ -95,7 +101,7 @@ export type Rule = {
   targetNames?: string[]
   expr?: string
   thresholdSymbol?: string
-  thresholdNum?: string
+  thresholdNum?: number
   duration?: number
   severity?: Severity
   status?: RuleStatus
@@ -127,7 +133,7 @@ export type CreateRuleRequest = {
   targetNames?: string[]
   expr?: string
   thresholdSymbol?: string
-  thresholdNum?: string
+  thresholdNum?: number
   duration?: number
   severity?: Severity
   notificationTemplate?: string
@@ -139,19 +145,30 @@ export type UpdateRuleRequest = {
   description?: string
   expr?: string
   thresholdSymbol?: string
-  thresholdNum?: string
+  thresholdNum?: number
   duration?: number
   severity?: Severity
   notificationTemplate?: string
   annotation?: Annotation
 }
 
+export type CleanRuleRequest = {
+  cleanType?: CleanRuleType
+  id?: string[]
+}
+
+export type CleanRuleResponse = {
+  result?: string
+}
+
 export type ListAlertsRequest = {
   resolved?: boolean
   name?: string
   clusterName?: string
   namespace?: string
   severity?: Severity
+  targetType?: TargetType
+  targetName?: string
   page?: number
   pageSize?: number
   sorts?: string[]
@@ -247,6 +264,7 @@ export type ListTemplatesRequest = {
   page?: number
   pageSize?: number
   sorts?: string[]
+  exactSearch?: boolean
 }
 
 export type ListTemplatesResponse = {
@@ -285,4 +303,12 @@ export type TemplateBody = {
   wecom?: string
   dingtalk?: string
   webhook?: string
+}
+
+export type AlertHistoryRetentionPeriod = {
+  retentionTime?: number
+}
+
+export type CleanAlertHistoryResponse = {
+  num?: string
 }

package/insight/v1alpha1/notify.pb.ts

@@ -52,14 +52,17 @@ export type EmailConfig = {
 }
 
 export type ListReceiversRequest = {
+  name?: string
   type?: ReceiverType
   page?: number
   pageSize?: number
   sorts?: string[]
+  exactSearch?: boolean
 }
 
 export type GetReceiversRequest = {
   name?: string
+  type?: ReceiverType
 }
 
 export type DeleteReceiversRequest = {

package/log/v1alpha1/log.pb.ts

@@ -134,6 +134,10 @@ export type DownloadLogResponse = {
   url?: string
 }
 
+export type ListLogFilePathsRequest = {
+  cluster?: string
+}
+
 export type ListLogFilePathsResponse = {
   paths?: string[]
 }

package/metric/v1alpha1/metric.pb.ts

@@ -4,6 +4,15 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
 export enum requestStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   SUCCESS = "SUCCESS",
@@ -25,15 +34,18 @@ export type samplePair = {
   value?: string
 }
 
-export type PrometheusQueryRequest = {
-  cluster?: string
+
+type BasePrometheusQueryRequest = {
   namespace?: string
   query?: string
   time?: string
 }
 
-export type PrometheusQueryRangeRequest = {
-  cluster?: string
+export type PrometheusQueryRequest = BasePrometheusQueryRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
+
+type BasePrometheusQueryRangeRequest = {
   namespace?: string
   query?: string
   start?: string
@@ -41,6 +53,9 @@ export type PrometheusQueryRangeRequest = {
   step?: number
 }
 
+export type PrometheusQueryRangeRequest = BasePrometheusQueryRangeRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type PrometheusQueryResult = {
   vector?: Sample[]
 }
@@ -59,12 +74,15 @@ export type BatchQueryRequestParam = {
   time?: string
 }
 
-export type MatchLabel = {
-  cluster?: string
+
+type BaseMatchLabel = {
   namespace?: string
   extraLabel?: {[key: string]: string}
 }
 
+export type MatchLabel = BaseMatchLabel
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type BatchQueryRequest = {
   param?: BatchQueryRequestParam
   matchLabel?: MatchLabel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daocloud-proto/skoala",
-  "version": "0.15.2",
+  "version": "0.16.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/resource/v1alpha1/cluster.pb.ts

@@ -5,6 +5,7 @@
 */
 
 import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
+import * as InsightIoApiResourceV1alpha1Pod from "./pod.pb"
 import * as InsightIoApiResourceV1alpha1Type from "./type.pb"
 
 export enum ClusterPhase {
@@ -51,10 +52,15 @@ export type Cluster = {
   role?: Role
 }
 
+export type ListClusterRequest = {
+  showAllCluster?: boolean
+}
+
 export type ListClusterSummaryRequest = {
   name?: string
   version?: string
   phase?: ClusterPhase
+  showAllCluster?: boolean
   page?: number
   pageSize?: number
 }
@@ -108,4 +114,17 @@ export type ListNamespacesResponse = {
 export type Namespace = {
   name?: string
   role?: Role
+}
+
+export type GetAgentSummaryRequest = {
+  cluster?: string
+}
+
+export type AgentSummary = {
+  insightAgentState?: insightAgentState
+  agentModuleStatus?: agentModuleStatus
+}
+
+export type agentModuleStatus = {
+  pods?: InsightIoApiResourceV1alpha1Pod.Pod[]
 }

package/resource/v1alpha1/pod.pb.ts

@@ -67,7 +67,6 @@ export type ListContainersRequest = {
   cluster?: string
   namespace?: string
   name?: string
-  phase?: ContainerPhase
   page?: number
   pageSize?: number
 }

package/resource/v1alpha1/service.pb.ts

@@ -27,7 +27,6 @@ export type ListServicesRequest = {
   name?: string
   page?: number
   pageSize?: number
-  tracingEnabled?: boolean
 }
 
 export type ListServicesResponse = {

package/span_metric/v1alpha1/span_metric.pb.ts

@@ -5,9 +5,19 @@
 */
 
 import * as InsightIoApiMetricV1alpha1Metric from "../../metric/v1alpha1/metric.pb"
+import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 import * as InsightIoApiSpan_metricV1alpha1Otelspankind from "./otelspankind.pb"
-export type MetricsQueryBaseRequest = {
-  cluster?: string
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
+type BaseMetricsQueryBaseRequest = {
   namespace?: string
   instanceName?: string
   extensionFilters?: string
@@ -20,8 +30,11 @@ export type MetricsQueryBaseRequest = {
   spanKinds?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
 }
 
-export type GetApdexRequest = {
-  cluster?: string
+export type MetricsQueryBaseRequest = BaseMetricsQueryBaseRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
+
+type BaseGetApdexRequest = {
   namespace?: string
   name?: string
   apdexThreshold?: string
@@ -30,8 +43,12 @@ export type GetApdexRequest = {
   extensionFilters?: string
 }
 
+export type GetApdexRequest = BaseGetApdexRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type MetricsWithOperation = {
   operationName?: string
+  spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind
   metricGroups?: MetricsGroup[]
 }
 
@@ -58,4 +75,29 @@ export type GetServiceDetailResponse = {
 
 export type GetOperationDetailResponse = {
   metrics?: MetricsWithOperation[]
+}
+
+export type GetServicesRequest = {
+  namespace?: string
+  extensionFilters?: string
+  endTime?: string
+  lookback?: string
+  spanKinds?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
+  page?: number
+  pageSize?: number
+  sort?: string
+  clusterName?: string
+}
+
+export type ServiceItem = {
+  serviceName?: string
+  namespace?: string
+  reqRate?: number
+  repLatency?: number
+  errorRate?: number
+}
+
+export type GetServicesResponse = {
+  items?: ServiceItem[]
+  pagination?: InsightIoApiTypeV1alpha1Page.Pagination
 }

package/tracing/v1alpha1/query.pb.ts

@@ -5,6 +5,15 @@
 */
 
 import * as InsightIoApiTracingV1alpha1Model from "./model.pb"
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
 export type TracesResponseChunk = {
   traces?: InsightIoApiTracingV1alpha1Model.Trace[]
 }
@@ -13,7 +22,8 @@ export type SpansResponseChunk = {
   spans?: InsightIoApiTracingV1alpha1Model.Span[]
 }
 
-export type TraceQueryParameters = {
+
+type BaseTraceQueryParameters = {
   serviceName?: string
   operationName?: string
   tags?: {[key: string]: string}
@@ -22,27 +32,12 @@ export type TraceQueryParameters = {
   durationMin?: string
   durationMax?: string
   limit?: number
-  cluster?: string
   namespace?: string
 }
 
+export type TraceQueryParameters = BaseTraceQueryParameters
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type FindTracesRequest = {
   query?: TraceQueryParameters
-}
-
-export type GetOperationsRequest = {
-  service?: string
-  spanKind?: string
-}
-
-export type Operation = {
-  name?: string
-  spanKind?: string
-}
-
-export type GetServicesRequest = {
-}
-
-export type GetServicesResponse = {
-  services?: string[]
 }

package/tracing/v1alpha1/tracing.pb.ts

@@ -3,18 +3,63 @@
 /*
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
-export type QueryBaseRequest = {
-  cluster?: string
+
+import * as InsightIoApiSpan_metricV1alpha1Otelspankind from "../../span_metric/v1alpha1/otelspankind.pb"
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
+type BaseQueryBaseRequest = {
   namespace?: string
   serviceName?: string
+  spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
+  start?: string
+  end?: string
+}
+
+export type QueryBaseRequest = BaseQueryBaseRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
+export type BatchQueryBaseRequest = {
+  cluster?: string
+  namespace?: string
+  serviceName?: string[]
+}
+
+export type Operation = {
+  operation?: string
+  spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind
+  callsTotal?: number
 }
 
 export type OperationsQueryResponse = {
-  operations?: string[]
+  operations?: Operation[]
 }
 
-export type TraceRequestById = {
+
+type BaseTraceRequestById = {
   traceId?: string
-  cluster?: string
   namespace?: string
+}
+
+export type TraceRequestById = BaseTraceRequestById
+  & OneOf<{ cluster: string; clusterName: string }>
+
+export type ListServiceNamesRequest = {
+  clusterName?: string
+  namespace?: string
+  serviceName?: string
+  spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
+  start?: string
+  end?: string
+}
+
+export type GetServiceNamesResponse = {
+  services?: string[]
 }