@daocloud-proto/skoala 0.3.3-123 → 0.3.3-129

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

@@ -57,6 +57,7 @@ export type ListClusterGatewayReq = {
   clusterName?: string
   page?: number
   pageSize?: number
+  filter?: string
 }
 
 export type ListGatewayRes = {

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

@@ -20,6 +20,13 @@ export enum NacosConfigType {
   cluster = "cluster",
 }
 
+export enum NacosConfigServiceType {
+  SERVICE_TYPE_UNSPECIFIED = "SERVICE_TYPE_UNSPECIFIED",
+  NodePort = "NodePort",
+  ClusterIP = "ClusterIP",
+  LoadBalancer = "LoadBalancer",
+}
+
 export type ListNacosReq = {
   workspaceId?: string
   clusterName?: string
@@ -38,6 +45,9 @@ export type Nacos = {
   clusterName?: string
   nacosName?: string
   namespaceName?: string
+  type?: NacosConfigType
+  serviceType?: NacosConfigServiceType
+  nodePort?: number
   status?: NacosStatus
   replicas?: number
   image?: string
@@ -119,10 +129,12 @@ export type DeleteNacosRes = {
 export type NacosConfig = {
   type?: NacosConfigType
   version?: string
-  replicas?: string
+  replicas?: number
   cpu?: string
   memory?: string
-  useDatabase?: boolean
+  serviceType?: NacosConfigServiceType
+  nodePort?: string
+  databaseEnabled?: boolean
   databaseParam?: DatabaseParam
 }
 

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

@@ -3,42 +3,83 @@
 /*
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
+
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
 export type ListSentinelReq = {
-  workspaceId?: string
+  workspace?: string
+  cluster?: string
+  namespace?: string
   page?: number
+  pageSize?: number
 }
 
 export type ListSentinelRes = {
+  items?: Sentinel[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
+}
+
+export type Sentinel = {
+  workspace?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  config?: SentinelConfig
 }
 
 export type GetSentinelReq = {
-  workspaceId?: string
-  sentinelName?: string
+  workspace?: string
+  cluster?: string
+  namespace?: string
+  name?: string
 }
 
 export type GetSentinelRes = {
+  sentinel?: Sentinel
 }
 
 export type UpdateSentinelReq = {
-  workspaceId?: string
-  sentinelName?: string
-  config?: string
+  workspace?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  nacosAddress?: string
+  config?: SentinelConfig
 }
 
 export type UpdateSentinelRes = {
 }
 
+export type Resources = {
+  cpuRequests?: string
+  cpuLimits?: string
+  memoryRequests?: string
+  memoryLimits?: string
+}
+
+export type SentinelConfig = {
+  type?: string
+  port?: number
+  nodePort?: number
+  resources?: Resources
+}
+
 export type CreateSentinelReq = {
-  workspaceId?: string
-  gatewayName?: string
+  workspace?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  nacosAddress?: string
+  config?: SentinelConfig
 }
 
 export type CreateSentinelRes = {
 }
 
 export type DeleteSentinelReq = {
-  workspaceId?: string
-  sentinelName?: string
+  workspace?: string
+  cluster?: string
+  namespace?: string
+  name?: string
 }
 
 export type DeleteSentinelRes = {

package/api/integrated/v1alpha1/registry.pb.ts

@@ -68,6 +68,7 @@ export type GetRegistryRes = {
 export type UpdateRegistryReq = {
   workspaceId?: string
   registryId?: string
+  extId?: string
   name?: string
   type?: string
   addresses?: string[]
@@ -82,6 +83,7 @@ export type UpdateRegistryRes = {
 export type CreateRegistryReq = {
   workspaceId?: string
   name?: string
+  extId?: string
   type?: string
   addresses?: string[]
   namespaces?: Namespace[]

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

@@ -96,19 +96,19 @@ export class Nacos {
 }
 export class Sentinel {
   static List(req: SkoalaApiHostedV1alpha1Sentinel.ListSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.ListSentinelRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListSentinelReq, SkoalaApiHostedV1alpha1Sentinel.ListSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/sentinels?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListSentinelReq, SkoalaApiHostedV1alpha1Sentinel.ListSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinels?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace"])}`, {...initReq, method: "GET"})
   }
-  static Get(req: SkoalaApiHostedV1alpha1Sentinel.GetSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetSentinelRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetSentinelReq, SkoalaApiHostedV1alpha1Sentinel.GetSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/sentinels/${req["sentinelName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "sentinelName"])}`, {...initReq, method: "GET"})
+  static Get(req: SkoalaApiHostedV1alpha1Sentinel.GetSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.Sentinel> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetSentinelReq, SkoalaApiHostedV1alpha1Sentinel.Sentinel>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinels/${req["name"]}?${fm.renderURLSearchParams(req, ["workspace", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
   static Create(req: SkoalaApiHostedV1alpha1Sentinel.CreateSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.CreateSentinelRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.CreateSentinelReq, SkoalaApiHostedV1alpha1Sentinel.CreateSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/sentinels`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.CreateSentinelReq, SkoalaApiHostedV1alpha1Sentinel.CreateSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinels`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
   static Update(req: SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelReq, SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/sentinels/${req["sentinelName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelReq, SkoalaApiHostedV1alpha1Sentinel.UpdateSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinels/${req["name"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
   static Delete(req: SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelReq, SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/sentinels/${req["sentinelName"]}`, {...initReq, method: "DELETE"})
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelReq, SkoalaApiHostedV1alpha1Sentinel.DeleteSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspace"]}/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/sentinels/${req["name"]}`, {...initReq, method: "DELETE"})
   }
 }
 export class Gateway {

package/insight/v1alpha1/alert.pb.ts

@@ -63,7 +63,7 @@ export type RuleSummary = {
   ruleId?: string
   ruleName?: string
   severity?: Severity
-  cluster?: string
+  clusterName?: string
   namespace?: string
   targetType?: TargetType
   targetNames?: string[]
@@ -84,9 +84,8 @@ export type RuleID = {
 export type Rule = {
   ruleId?: string
   ruleName?: string
-  ruleGroupName?: string
   builtin?: boolean
-  cluster?: string
+  clusterName?: string
   namespace?: string
   source?: RuleSource
   targetType?: TargetType
@@ -118,7 +117,7 @@ export type AnnotationReceiver = {
 export type CreateRuleRequest = {
   ruleName?: string
   description?: string
-  cluster?: string
+  clusterName?: string
   namespace?: string
   source?: RuleSource
   targetType?: TargetType
@@ -135,7 +134,7 @@ export type CreateRuleRequest = {
 export type UpdateRuleRequest = {
   id?: string
   description?: string
-  cluster?: string
+  clusterName?: string
   namespace?: string
   targetNames?: string[]
   expr?: string
@@ -150,7 +149,7 @@ export type UpdateRuleRequest = {
 export type ListAlertsRequest = {
   resolved?: boolean
   name?: string
-  cluster?: string
+  clusterName?: string
   namespace?: string
   severity?: Severity
   page?: number
@@ -167,7 +166,7 @@ export type AlertSummary = {
   alertId?: string
   ruleName?: string
   severity?: Severity
-  cluster?: string
+  clusterName?: string
   namespace?: string
   targetType?: TargetType
   targetName?: string
@@ -183,7 +182,7 @@ export type AlertInfo = {
   fingerprint?: string
   ruleName?: string
   ruleId?: string
-  cluster?: string
+  clusterName?: string
   namespace?: string
   targetType?: TargetType
   targetName?: string
@@ -200,7 +199,7 @@ export type AlertInfo = {
 
 export type CountAlertRequest = {
   resolved?: boolean
-  cluster?: string
+  clusterName?: string
   namespace?: string
   targetType?: TargetType
   targetName?: string

package/log/v1alpha1/log.pb.ts

@@ -4,6 +4,8 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
+
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
 type OneOf<T> =
   | { [k in keyof T]?: undefined }
@@ -37,16 +39,25 @@ export type LogQueryEventFilter = {
 }
 
 
-type BaseLogQueryRequest = {
+type BaseQueryLogRequest = {
+  startTime?: string
+  endTime?: string
+  page?: number
+  pageSize?: number
+  sorts?: string[]
+}
+
+export type QueryLogRequest = BaseQueryLogRequest
+  & OneOf<{ resource: LogQueryResourceFilter; system: LogQuerySystemFilter; event: LogQueryEventFilter }>
+
+
+type BaseQueryLogHistogramRequest = {
   startTime?: string
   endTime?: string
-  from?: number
-  size?: number
-  sort?: string
   interval?: string
 }
 
-export type LogQueryRequest = BaseLogQueryRequest
+export type QueryLogHistogramRequest = BaseQueryLogHistogramRequest
   & OneOf<{ resource: LogQueryResourceFilter; system: LogQuerySystemFilter; event: LogQueryEventFilter }>
 
 export type LogContextResourceFilter = {
@@ -66,7 +77,7 @@ export type LogContextEventFilter = {
 }
 
 
-type BaseLogContextRequest = {
+type BaseQueryLogContextRequest = {
   startTime?: string
   endTime?: string
   before?: number
@@ -74,7 +85,7 @@ type BaseLogContextRequest = {
   nanotimestamp?: string
 }
 
-export type LogContextRequest = BaseLogContextRequest
+export type QueryLogContextRequest = BaseQueryLogContextRequest
   & OneOf<{ resource: LogContextResourceFilter; system: LogContextSystemFilter; event: LogContextEventFilter }>
 
 export type LogQueryResult = {
@@ -83,14 +94,13 @@ export type LogQueryResult = {
   labels?: {[key: string]: string}
 }
 
-export type LogQueryResponse = {
-  total?: string
-  data?: LogQueryResult[]
+export type QueryLogResponse = {
+  items?: LogQueryResult[]
+  pagination?: InsightIoApiTypeV1alpha1Page.Pagination
 }
 
-export type LogHistogramResponse = {
-  total?: string
-  data?: LogHistogramResult[]
+export type QueryLogHistogramResponse = {
+  items?: LogHistogramResult[]
 }
 
 export type LogHistogramResult = {

package/package.json

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

package/resource/v1alpha1/cluster.pb.ts

@@ -4,7 +4,6 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
-import * as InsightIoApiMetricV1alpha1Metric from "../../metric/v1alpha1/metric.pb"
 import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 import * as InsightIoApiResourceV1alpha1Type from "./type.pb"
 
@@ -64,6 +63,7 @@ export type GetClusterRequest = {
 
 export type ClusterSummary = {
   name?: string
+  kubeSystemId?: string
   phase?: ClusterPhase
   provider?: ClusterProvider
   kubernetesVersion?: string
@@ -71,12 +71,11 @@ export type ClusterSummary = {
   nodeNumSummary?: InsightIoApiResourceV1alpha1Type.ResourceNumSummary
   podNumSummary?: InsightIoApiResourceV1alpha1Type.ResourceNumSummary
   insightAgentStatus?: InsightAgentStatus
-  cpuUsage?: InsightIoApiMetricV1alpha1Metric.samplePair[]
-  memoryUsage?: InsightIoApiMetricV1alpha1Metric.samplePair[]
 }
 
 export type ClusterDetail = {
   name?: string
+  kubeSystemId?: string
   phase?: ClusterPhase
   provider?: ClusterProvider
   kubernetesVersion?: string

package/span_metric/v1alpha1/span_metric.pb.ts

@@ -5,6 +5,7 @@
 */
 
 import * as GoogleProtobufDuration from "../../google/protobuf/duration.pb"
+import * as InsightIoApiMetricV1alpha1Metric from "../../metric/v1alpha1/metric.pb"
 import * as InsightIoApiSpan_metricV1alpha1Openmetrics from "./openmetrics.pb"
 import * as InsightIoApiSpan_metricV1alpha1Otelspankind from "./otelspankind.pb"
 export type MetricsQueryBaseRequest = {
@@ -65,45 +66,31 @@ export type MetricsFamilyWithOperation = {
 }
 
 export type MetricsWithOperation = {
-  operation?: string
-  metricPointsGroups?: MetricsPointsGroup[]
+  operationName?: string
+  metricGroups?: MetricsGroup[]
 }
 
-export type MetricsPointsGroup = {
-  apdex?: string
-  metricPoints?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
+export type MetricsGroup = {
+  metrics?: InsightIoApiMetricV1alpha1Metric.samplePair[]
   metricsLabel?: string
   metricsAvg?: number
 }
 
-export type GetREDRequest = {
-  baseRequest?: MetricsQueryBaseRequest
-  quantile?: string
-}
-
-export type GetREDResponse = {
-  p95Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  p75Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  p50Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  callsMetric?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  errorsMetrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-}
-
 export type GetServiceDetailRequest = {
   baseRequest?: MetricsQueryBaseRequest
 }
 
 export type GetServiceDetailResponse = {
-  p95Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  p75Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  p50Metrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  reqRateMetric?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  repLatencyMetric?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  errorsRateMetrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
-  totalCallsMetrics?: InsightIoApiSpan_metricV1alpha1Openmetrics.MetricPoint[]
+  p95Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p75Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  p50Metrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  reqRateMetric?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  repLatencyMetric?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  errorsRateMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  totalCallsMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
   avgReqRate?: number
   avgRepLatency?: number
-  avgErrorTate?: number
+  avgErrorRate?: number
   totalCalls?: number
   apdex?: number
 }