@daocloud-proto/skoala 0.3.3-99 → 0.4.1-2

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

@@ -4,6 +4,21 @@
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
 
+export enum OrderBy {
+  desc = "desc",
+  asc = "asc",
+}
+
+export enum SortBy {
+  SORT_BY_UNSPECIFIED = "SORT_BY_UNSPECIFIED",
+  field_name = "field_name",
+  state = "state",
+  workspace = "workspace",
+  cluster = "cluster",
+  namespace = "namespace",
+  created_at = "created_at",
+}
+
 export enum Status {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
   RUNNING = "RUNNING",
@@ -18,7 +33,7 @@ export type Cluster = {
 }
 
 export type Workspace = {
-  id?: string
+  id?: number
   name?: string
 }
 
@@ -39,6 +54,14 @@ export type ListWorkspaceRes = {
   pagination?: Pagination
 }
 
+export type GetWorkspaceReq = {
+  workspaceId?: number
+}
+
+export type GetWorkspaceRes = {
+  workspace?: Workspace
+}
+
 export type ListClusterReq = {
   workspaceId?: string
   page?: number

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

@@ -0,0 +1,260 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.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 enum Protocol {
+  HTTP = "HTTP",
+  HTTPS = "HTTPS",
+}
+
+export enum ValueMatchType {
+  CONTAIN = "CONTAIN",
+  EXACT = "EXACT",
+  NOT_CONTAIN = "NOT_CONTAIN",
+  NOT_EXACT = "NOT_EXACT",
+  PRESENT = "PRESENT",
+  NOT_PRESENT = "NOT_PRESENT",
+}
+
+export enum HttpMethod {
+  GET = "GET",
+  POST = "POST",
+  DELETE = "DELETE",
+  PUT = "PUT",
+  PATCH = "PATCH",
+  OPTION = "OPTION",
+  ALL = "ALL",
+}
+
+export enum RedirectResponseCode {
+  MOVED_PERMANENTLY = "MOVED_PERMANENTLY",
+  FOUND = "FOUND",
+  SEE_OTHER = "SEE_OTHER",
+  TEMPORARY_REDIRECT = "TEMPORARY_REDIRECT",
+  PERMANENT_REDIRECT = "PERMANENT_REDIRECT",
+}
+
+export enum RouteType {
+  CLUSTRE_SERVER = "CLUSTRE_SERVER",
+  DIRECT = "DIRECT",
+  REDIRECT = "REDIRECT",
+  EXTERNAL = "EXTERNAL",
+  REGISTRY = "REGISTRY",
+  UNKNOW = "UNKNOW",
+}
+
+export enum APIStatus {
+  UP = "UP",
+  DOWN = "DOWN",
+}
+
+export type CreateAPIReq = {
+  workspaceId?: string
+  gatewayName?: string
+  clusterName?: string
+  apiConfig?: APIConfig
+}
+
+export type UpdateAPIReq = {
+  apiName?: string
+  workspaceId?: string
+  gatewayName?: string
+  clusterName?: string
+  apiConfig?: APIConfig
+}
+
+export type CreateAPIRes = {
+}
+
+export type UpdateAPIRes = {
+}
+
+export type DeleteAPIRes = {
+}
+
+export type GetAPIReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  apiName?: string
+}
+
+export type DeleteAPIReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  apiName?: string
+}
+
+export type GetAPIRes = {
+  apiName?: string
+  apiStatus?: APIStatus
+  fqdn?: string
+  matchRule?: MatchRule
+  targetService?: TargetService
+}
+
+export type TargetService = {
+  serviceList?: ServiceDetail[]
+}
+
+export type ServiceDetail = {
+  clusterName?: string
+  k8SNamespaceName?: string
+  serviceName?: string
+  registrationId?: string
+  address?: string
+  protocol?: Protocol
+  port?: number
+  weight?: string
+  nacosNamespaceId?: string
+  groupName?: string
+  routeType?: RouteType
+  path?: string
+  statusCode?: number
+}
+
+
+type BaseAPIConfig = {
+  apiName?: string
+  virtualhost?: Virtualhost
+  matchRule?: MatchRule
+  enabled?: boolean
+}
+
+export type APIConfig = BaseAPIConfig
+  & OneOf<{ route: RouteAction; redirect: RedirectAction; directResponse: DirectResponse }>
+
+export type Virtualhost = {
+  fqdn?: string
+  protocol?: Protocol
+}
+
+export type Certificate = {
+  namespace?: string
+}
+
+
+type BaseMatchRule = {
+  httpMethod?: HttpMethod[]
+  headers?: HeaderRule[]
+}
+
+export type MatchRule = BaseMatchRule
+  & OneOf<{ path: string; prefix: string }>
+
+
+type BaseHeaderRule = {
+  name?: string
+}
+
+export type HeaderRule = BaseHeaderRule
+  & OneOf<{ contains: string; exact: string; notContains: string; notExact: string; present: boolean; notPresent: boolean }>
+
+export type RouteAction = {
+  routeService?: RouteService[]
+}
+
+
+type BaseRouteService = {
+  protocol?: Protocol
+  port?: number
+  weight?: number
+}
+
+export type RouteService = BaseRouteService
+  & OneOf<{ kubernetesService: KubernetesService; registryService: RegistryService; externalService: ExternalService }>
+
+export type KubernetesService = {
+  clusterId?: string
+  clusterName?: string
+  namespaceName?: string
+  serviceName?: string
+  address?: string
+}
+
+export type ExternalService = {
+  serviceName?: string
+  address?: string
+}
+
+
+type BaseRegistryService = {
+  registrationId?: string
+}
+
+export type RegistryService = BaseRegistryService
+  & OneOf<{ eurekaService: EurekaService; nacosService: NacosService; zookeeperService: ZookeeperService; kubernetesService: KubernetesService }>
+
+export type EurekaService = {
+  address?: string
+  serviceName?: string
+}
+
+export type NacosService = {
+  address?: string
+  serviceName?: string
+  namespaceId?: string
+  groupName?: string
+}
+
+export type ZookeeperService = {
+  address?: string
+  serviceName?: string
+}
+
+export type MeshService = {
+  instanceId?: string
+}
+
+export type ApplicationService = {
+}
+
+export type RedirectAction = {
+  hostname?: string
+  path?: string
+  port?: number
+  statusCode?: number
+  protocol?: Protocol
+}
+
+export type DirectResponse = {
+  statusCode?: number
+  body?: string
+}
+
+export type APIListReq = {
+  workspaceId?: string
+  clusterName?: string
+  gatewayName?: string
+  page?: number
+  pageSize?: number
+}
+
+export type APIListRes = {
+  api?: APIInfo[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
+}
+
+export type APIInfo = {
+  apiName?: string
+  fqdn?: string
+  method?: HttpMethod[]
+  requestPath?: string
+  routeType?: RouteType
+  apiStatus?: APIStatus
+  updatedAt?: string
+}

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

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

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

@@ -3,26 +3,102 @@
 /*
 * This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
 */
+
+import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
+
+export enum NacosStatus {
+  STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
+  Running = "Running",
+  Creating = "Creating",
+  Failed = "Failed",
+  Scaling = "Scaling",
+}
+
+export enum NacosConfigType {
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+  standalone = "standalone",
+  cluster = "cluster",
+}
+
+export enum NacosConfigServiceType {
+  SERVICE_TYPE_UNSPECIFIED = "SERVICE_TYPE_UNSPECIFIED",
+  NodePort = "NodePort",
+  ClusterIP = "ClusterIP",
+  LoadBalancer = "LoadBalancer",
+}
+
 export type ListNacosReq = {
   workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
   page?: number
+  pageSize?: number
 }
 
 export type ListNacosRes = {
+  items?: Nacos[]
+  pagination?: SkoalaApiGeneralV1alpha1Skoala.Pagination
+}
+
+export type Nacos = {
+  workspaceId?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  type?: NacosConfigType
+  serviceType?: NacosConfigServiceType
+  nodePort?: number
+  status?: NacosStatus
+  replicas?: number
+  image?: string
+  version?: string
+  database?: NacosDatabase
+  resource?: NacosResource
+  condition?: NacosCondition[]
+  createAt?: string
+}
+
+export type NacosDatabase = {
+  type?: string
+  host?: string
+  port?: string
+  db?: string
+  user?: string
+}
+
+export type NacosResource = {
+  limits?: {[key: string]: string}
+  request?: {[key: string]: string}
+}
+
+export type NacosCondition = {
+  type?: string
+  status?: string
+  reason?: string
+  message?: string
+  instance?: string
+  hostIP?: string
+  podName?: string
+  nodeName?: string
 }
 
 export type GetNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
+  namespaceName?: string
 }
 
 export type GetNacosRes = {
+  nacos?: Nacos
 }
 
 export type UpdateNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
-  config?: string
+  namespaceName?: string
+  config?: NacosConfig
 }
 
 export type UpdateNacosRes = {
@@ -30,7 +106,11 @@ export type UpdateNacosRes = {
 
 export type CreateNacosReq = {
   workspaceId?: string
-  gatewayName?: string
+  clusterName?: string
+  nacosName?: string
+  namespaceName?: string
+  createNamespace?: boolean
+  config?: NacosConfig
 }
 
 export type CreateNacosRes = {
@@ -38,8 +118,30 @@ export type CreateNacosRes = {
 
 export type DeleteNacosReq = {
   workspaceId?: string
+  clusterName?: string
   nacosName?: string
+  namespaceName?: string
 }
 
 export type DeleteNacosRes = {
+}
+
+export type NacosConfig = {
+  type?: NacosConfigType
+  version?: string
+  replicas?: number
+  cpu?: string
+  memory?: string
+  serviceType?: NacosConfigServiceType
+  nodePort?: string
+  databaseEnabled?: boolean
+  databaseParam?: DatabaseParam
+}
+
+export type DatabaseParam = {
+  host?: string
+  port?: string
+  username?: string
+  password?: string
+  db?: string
 }

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

@@ -3,42 +3,84 @@
 /*
 * 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
+  image?: string
+}
+
 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/insight.pb.ts

@@ -8,6 +8,13 @@ import * as InsightIoApiMetricV1alpha1Metric from "../../../metric/v1alpha1/metr
 export type Insight = {
   serviceDetail?: InsightValue
   serviceMetrics?: InsightMetrics
+  instanceMonitorMetrics?: MonitorMetrics
+}
+
+export type InstanceInsight = {
+  instanceDetail?: InsightValue
+  instanceMetrics?: InsightMetrics
+  instanceMonitorMetrics?: MonitorMetrics
 }
 
 export type InsightValue = {
@@ -27,4 +34,17 @@ export type InsightMetrics = {
   errorsRateMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
   successTotalCallsMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
   errorTotalCallsMetrics?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+}
+
+export type MonitorMetrics = {
+  cpuRequest?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  cpuLimit?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  cpuUsage?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  memoryRequest?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  memoryLimit?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  memoryUsage?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  diskRead?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  diskWrite?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  netBytesReceived?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
+  netBytesTransmitted?: InsightIoApiMetricV1alpha1Metric.SampleStream[]
 }

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

@@ -5,6 +5,7 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
+import * as SkoalaApiIntegratedV1alpha1Insight from "./insight.pb"
 
 export enum InstanceStatus {
   STATUS_UNSPECIFIED = "STATUS_UNSPECIFIED",
@@ -23,6 +24,7 @@ export type Instance = {
   metadata?: {[key: string]: string}
   detail?: {[key: string]: string}
   updateAt?: string
+  insight?: SkoalaApiIntegratedV1alpha1Insight.InstanceInsight
 }
 
 export type ListInstanceReq = {

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

@@ -8,6 +8,7 @@ import * as fm from "../../../fetch.pb"
 import * as GoogleProtobufEmpty from "../../../google/protobuf/empty.pb"
 import * as SkoalaApiGeneralV1alpha1Skoala from "../../general/v1alpha1/skoala.pb"
 import * as SkoalaApiGeneralV1alpha1Version from "../../general/v1alpha1/version.pb"
+import * as SkoalaApiHostedV1alpha1Api from "../../hosted/v1alpha1/api.pb"
 import * as SkoalaApiHostedV1alpha1Gateway from "../../hosted/v1alpha1/gateway.pb"
 import * as SkoalaApiHostedV1alpha1Nacos from "../../hosted/v1alpha1/nacos.pb"
 import * as SkoalaApiHostedV1alpha1Sentinel from "../../hosted/v1alpha1/sentinel.pb"
@@ -34,6 +35,9 @@ export class Skoala {
   static ListWorkspace(req: SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes> {
     return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceReq, SkoalaApiGeneralV1alpha1Skoala.ListWorkspaceRes>(`/apis/skoala.io/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
+  static GetWorkspace(req: SkoalaApiGeneralV1alpha1Skoala.GetWorkspaceReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.GetWorkspaceRes> {
+    return fm.fetchReq<SkoalaApiGeneralV1alpha1Skoala.GetWorkspaceReq, SkoalaApiGeneralV1alpha1Skoala.GetWorkspaceRes>(`/apis/skoala.io/v1alpha1/workspaces/${req["workspaceId"]}?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }
 export class Registry {
   static List(req: SkoalaApiIntegratedV1alpha1Registry.ListRegistryReq, initReq?: fm.InitReq): Promise<SkoalaApiIntegratedV1alpha1Registry.ListRegistryRes> {
@@ -81,31 +85,31 @@ export class Nacos {
   static Get(req: SkoalaApiHostedV1alpha1Nacos.GetNacosReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.GetNacosRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.GetNacosReq, SkoalaApiHostedV1alpha1Nacos.GetNacosRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses/${req["nacosName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "nacosName"])}`, {...initReq, method: "GET"})
   }
-  static Create(req: SkoalaApiHostedV1alpha1Nacos.CreateNacosReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.CreateNacosRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.CreateNacosReq, SkoalaApiHostedV1alpha1Nacos.CreateNacosRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  static Create(req: SkoalaApiHostedV1alpha1Nacos.CreateNacosReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.CreateNacosReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
   }
-  static Update(req: SkoalaApiHostedV1alpha1Nacos.UpdateNacosReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.UpdateNacosRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.UpdateNacosReq, SkoalaApiHostedV1alpha1Nacos.UpdateNacosRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses/${req["nacosName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  static Update(req: SkoalaApiHostedV1alpha1Nacos.UpdateNacosReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.UpdateNacosReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses/${req["nacosName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
   }
-  static Delete(req: SkoalaApiHostedV1alpha1Nacos.DeleteNacosReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.DeleteNacosRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.DeleteNacosReq, SkoalaApiHostedV1alpha1Nacos.DeleteNacosRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses/${req["nacosName"]}`, {...initReq, method: "DELETE"})
+  static Delete(req: SkoalaApiHostedV1alpha1Nacos.DeleteNacosReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.DeleteNacosReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/nacoses/${req["nacosName"]}`, {...initReq, method: "DELETE"})
   }
 }
 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 {
@@ -115,9 +119,6 @@ export class Gateway {
   static ListClusterGateway(req: SkoalaApiHostedV1alpha1Gateway.ListClusterGatewayReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.ListGatewayRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.ListClusterGatewayReq, SkoalaApiHostedV1alpha1Gateway.ListGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName"])}`, {...initReq, method: "GET"})
   }
-  static ListNamespaceGateway(req: SkoalaApiHostedV1alpha1Gateway.ListNamespaceGatewayReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.ListGatewayRes> {
-    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.ListNamespaceGatewayReq, SkoalaApiHostedV1alpha1Gateway.ListGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName"])}`, {...initReq, method: "GET"})
-  }
   static Get(req: SkoalaApiHostedV1alpha1Gateway.GetGatewayReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.GetGatewayRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName"])}`, {...initReq, method: "GET"})
   }
@@ -136,4 +137,19 @@ export class Gateway {
   static GetGatewayStatus(req: SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusReq, SkoalaApiHostedV1alpha1Gateway.GetGatewayStatusRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/gateways/${req["gatewayName"]}/status?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "gatewayName"])}`, {...initReq, method: "GET"})
   }
+  static CreateAPI(req: SkoalaApiHostedV1alpha1Api.CreateAPIReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Api.CreateAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Api.CreateAPIReq, SkoalaApiHostedV1alpha1Api.CreateAPIRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways/${req["gatewayName"]}/apis`, {...initReq, method: "POST", body: JSON.stringify(req, fm.replacer)})
+  }
+  static ListAPI(req: SkoalaApiHostedV1alpha1Api.APIListReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Api.APIListRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Api.APIListReq, SkoalaApiHostedV1alpha1Api.APIListRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways/${req["gatewayName"]}/apis?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "gatewayName"])}`, {...initReq, method: "GET"})
+  }
+  static GetAPI(req: SkoalaApiHostedV1alpha1Api.GetAPIReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Api.GetAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Api.GetAPIReq, SkoalaApiHostedV1alpha1Api.GetAPIRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways/${req["gatewayName"]}/apis/${req["apiName"]}?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "gatewayName", "apiName"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteAPI(req: SkoalaApiHostedV1alpha1Api.DeleteAPIReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Api.DeleteAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Api.DeleteAPIReq, SkoalaApiHostedV1alpha1Api.DeleteAPIRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways/${req["gatewayName"]}/apis/${req["apiName"]}`, {...initReq, method: "DELETE"})
+  }
+  static UpdateAPI(req: SkoalaApiHostedV1alpha1Api.UpdateAPIReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Api.UpdateAPIRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Api.UpdateAPIReq, SkoalaApiHostedV1alpha1Api.UpdateAPIRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/gateways/${req["gatewayName"]}/apis/${req["apiName"]}`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
 }

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-99",
+  "version": "0.4.1-2",
   "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
 }

package/validate/validate.pb.ts

@@ -0,0 +1,266 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as GoogleProtobufDuration from "../google/protobuf/duration.pb"
+import * as GoogleProtobufTimestamp from "../google/protobuf/timestamp.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 enum KnownRegex {
+  UNKNOWN = "UNKNOWN",
+  HTTP_HEADER_NAME = "HTTP_HEADER_NAME",
+  HTTP_HEADER_VALUE = "HTTP_HEADER_VALUE",
+}
+
+
+type BaseFieldRules = {
+  message?: MessageRules
+}
+
+export type FieldRules = BaseFieldRules
+  & OneOf<{ float: FloatRules; double: DoubleRules; int32: Int32Rules; int64: Int64Rules; uint32: UInt32Rules; uint64: UInt64Rules; sint32: SInt32Rules; sint64: SInt64Rules; fixed32: Fixed32Rules; fixed64: Fixed64Rules; sfixed32: SFixed32Rules; sfixed64: SFixed64Rules; bool: BoolRules; string: StringRules; bytes: BytesRules; enum: EnumRules; repeated: RepeatedRules; map: MapRules; any: AnyRules; duration: DurationRules; timestamp: TimestampRules }>
+
+export type FloatRules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type DoubleRules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type Int32Rules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type Int64Rules = {
+  const?: string
+  lt?: string
+  lte?: string
+  gt?: string
+  gte?: string
+  in?: string[]
+  notIn?: string[]
+  ignoreEmpty?: boolean
+}
+
+export type UInt32Rules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type UInt64Rules = {
+  const?: string
+  lt?: string
+  lte?: string
+  gt?: string
+  gte?: string
+  in?: string[]
+  notIn?: string[]
+  ignoreEmpty?: boolean
+}
+
+export type SInt32Rules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type SInt64Rules = {
+  const?: string
+  lt?: string
+  lte?: string
+  gt?: string
+  gte?: string
+  in?: string[]
+  notIn?: string[]
+  ignoreEmpty?: boolean
+}
+
+export type Fixed32Rules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type Fixed64Rules = {
+  const?: string
+  lt?: string
+  lte?: string
+  gt?: string
+  gte?: string
+  in?: string[]
+  notIn?: string[]
+  ignoreEmpty?: boolean
+}
+
+export type SFixed32Rules = {
+  const?: number
+  lt?: number
+  lte?: number
+  gt?: number
+  gte?: number
+  in?: number[]
+  notIn?: number[]
+  ignoreEmpty?: boolean
+}
+
+export type SFixed64Rules = {
+  const?: string
+  lt?: string
+  lte?: string
+  gt?: string
+  gte?: string
+  in?: string[]
+  notIn?: string[]
+  ignoreEmpty?: boolean
+}
+
+export type BoolRules = {
+  const?: boolean
+}
+
+
+type BaseStringRules = {
+  const?: string
+  len?: string
+  minLen?: string
+  maxLen?: string
+  lenBytes?: string
+  minBytes?: string
+  maxBytes?: string
+  pattern?: string
+  prefix?: string
+  suffix?: string
+  contains?: string
+  notContains?: string
+  in?: string[]
+  notIn?: string[]
+  strict?: boolean
+  ignoreEmpty?: boolean
+}
+
+export type StringRules = BaseStringRules
+  & OneOf<{ email: boolean; hostname: boolean; ip: boolean; ipv4: boolean; ipv6: boolean; uri: boolean; uriRef: boolean; address: boolean; uuid: boolean; wellKnownRegex: KnownRegex }>
+
+
+type BaseBytesRules = {
+  const?: Uint8Array
+  len?: string
+  minLen?: string
+  maxLen?: string
+  pattern?: string
+  prefix?: Uint8Array
+  suffix?: Uint8Array
+  contains?: Uint8Array
+  in?: Uint8Array[]
+  notIn?: Uint8Array[]
+  ignoreEmpty?: boolean
+}
+
+export type BytesRules = BaseBytesRules
+  & OneOf<{ ip: boolean; ipv4: boolean; ipv6: boolean }>
+
+export type EnumRules = {
+  const?: number
+  definedOnly?: boolean
+  in?: number[]
+  notIn?: number[]
+}
+
+export type MessageRules = {
+  skip?: boolean
+  required?: boolean
+}
+
+export type RepeatedRules = {
+  minItems?: string
+  maxItems?: string
+  unique?: boolean
+  items?: FieldRules
+  ignoreEmpty?: boolean
+}
+
+export type MapRules = {
+  minPairs?: string
+  maxPairs?: string
+  noSparse?: boolean
+  keys?: FieldRules
+  values?: FieldRules
+  ignoreEmpty?: boolean
+}
+
+export type AnyRules = {
+  required?: boolean
+  in?: string[]
+  notIn?: string[]
+}
+
+export type DurationRules = {
+  required?: boolean
+  const?: GoogleProtobufDuration.Duration
+  lt?: GoogleProtobufDuration.Duration
+  lte?: GoogleProtobufDuration.Duration
+  gt?: GoogleProtobufDuration.Duration
+  gte?: GoogleProtobufDuration.Duration
+  in?: GoogleProtobufDuration.Duration[]
+  notIn?: GoogleProtobufDuration.Duration[]
+}
+
+export type TimestampRules = {
+  required?: boolean
+  const?: GoogleProtobufTimestamp.Timestamp
+  lt?: GoogleProtobufTimestamp.Timestamp
+  lte?: GoogleProtobufTimestamp.Timestamp
+  gt?: GoogleProtobufTimestamp.Timestamp
+  gte?: GoogleProtobufTimestamp.Timestamp
+  ltNow?: boolean
+  gtNow?: boolean
+  within?: GoogleProtobufDuration.Duration
+}