@daocloud-proto/skoala 0.18.0-4 → 0.18.0-45

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

@@ -34,6 +34,16 @@ export enum Status {
   Exception = "Exception",
 }
 
+export enum ClusterPhase {
+  CLUSTER_PHASE_UNSPECIFIED = "CLUSTER_PHASE_UNSPECIFIED",
+  ClusterPhaseUnknown = "ClusterPhaseUnknown",
+  ClusterPhaseCreating = "ClusterPhaseCreating",
+  ClusterPhaseRunning = "ClusterPhaseRunning",
+  ClusterPhaseUpdating = "ClusterPhaseUpdating",
+  ClusterPhaseDeleting = "ClusterPhaseDeleting",
+  ClusterFailed = "ClusterFailed",
+}
+
 export enum ResourceKind {
   RESOURCE_KIND_UNSPECIFIED = "RESOURCE_KIND_UNSPECIFIED",
   Deployment = "Deployment",
@@ -87,6 +97,7 @@ export enum ExternalTrafficPolicy {
 export type Cluster = {
   id?: string
   name?: string
+  clusterPhase?: ClusterPhase
 }
 
 export type Mesh = {

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

@@ -259,4 +259,8 @@ export type AddrPool = {
 export type ListClusterLBAddrPoolRes = {
   items?: AddrPool[]
   pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type ListComponentsVersionRes = {
+  components?: SkoalaApiGeneralV1alpha1Common.Component[]
 }

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

@@ -16,6 +16,6 @@ export type GetVersionRes = {
   version?: Version
 }
 
-export type GetHiveChartsRes = {
-  nacos?: SkoalaApiGeneralV1alpha1Common.Component
+export type GetComponentsRes = {
+  components?: SkoalaApiGeneralV1alpha1Common.Component[]
 }

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

@@ -5,6 +5,7 @@
 */
 
 import * as SkoalaApiGeneralV1alpha1Common from "../../general/v1alpha1/common.pb"
+import * as SkoalaApiHostedV1alpha1Gateway from "./gateway.pb"
 import * as SkoalaApiHostedV1alpha1Http from "./http.pb"
 import * as SkoalaApiHostedV1alpha1Virtualhost from "./virtualhost.pb"
 
@@ -109,6 +110,7 @@ export type AdvancedAPIConfig = {
   jwtPolicy?: JWTPolicy
   authPolicy?: AuthPolicy
   cookieRewritePolicy?: CookieRewritePolicy[]
+  ipPolicy?: SkoalaApiHostedV1alpha1Gateway.IPPolicy
 }
 
 export type CookieRewritePolicy = {

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

@@ -58,6 +58,18 @@ export enum AlertSeverity {
   Info = "Info",
 }
 
+export enum IPPolicyLevel {
+  IP_POLICY_LEVEL_UNSPECIFIED = "IP_POLICY_LEVEL_UNSPECIFIED",
+  VirtualHost = "VirtualHost",
+  Route = "Route",
+}
+
+export enum IPSource {
+  IP_SOURCE_UNSPECIFIED = "IP_SOURCE_UNSPECIFIED",
+  RemoteIp = "RemoteIp",
+  DirectRemoteIp = "DirectRemoteIp",
+}
+
 export enum GatewayConditionType {
   TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
   Scheduled = "Scheduled",
@@ -111,6 +123,7 @@ export type Gateway = {
   envoy?: Node
   apiCount?: number
   config?: GatewayConfig
+  clusterPhase?: SkoalaApiGeneralV1alpha1Common.ClusterPhase
 }
 
 export type ListAllGatewayReq = {
@@ -263,6 +276,7 @@ export type ContourAdvancedConfig = BaseContourAdvancedConfig
 
 type BaseEnvoyAdvancedConfig = {
   resources?: SkoalaApiGeneralV1alpha1Resource.ResourceRequirements
+  numTrustedHops?: number
 }
 
 export type EnvoyAdvancedConfig = BaseEnvoyAdvancedConfig
@@ -497,4 +511,16 @@ export type GetGatewayMetricDashboardReq = {
 export type GetGatewayMetricDashboardRes = {
   url?: string
   zhUrl?: string
+}
+
+export type IPPolicyRule = {
+  cidr?: string
+  source?: IPSource
+}
+
+export type IPPolicy = {
+  path?: string
+  level?: IPPolicyLevel
+  allowRules?: IPPolicyRule[]
+  denyRules?: IPPolicyRule[]
 }

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

@@ -19,7 +19,7 @@ export type GatewayOverviewBasicReq = {
   gatewayNames?: string[]
   startTime?: string
   endTime?: string
-  time?: string
+  interval?: string
   unit?: SkoalaApiGeneralV1alpha1Common.TimeUnit
 }
 
@@ -34,8 +34,9 @@ export type GatewayOverviewHealthReq = {
   gatewayNames?: string[]
   startTime?: string
   endTime?: string
-  time?: string
+  interval?: string
   unit?: SkoalaApiGeneralV1alpha1Common.TimeUnit
+  completion?: boolean
 }
 
 export type GatewayOverviewHealthRes = {
@@ -60,4 +61,21 @@ export type GatewayAPINum = {
   gatewayName?: string
   location?: string
   apiNum?: number
+}
+
+export type GatewayOverviewInfoReq = {
+  workspaceId?: string
+}
+
+export type GatewayOverviewInfoRes = {
+  apiNum?: number
+  normal?: number
+  abnormal?: number
+  errGatewayInfo?: ErrGatewayInfo[]
+}
+
+export type ErrGatewayInfo = {
+  gatewayName?: string
+  location?: string
+  reason?: string
 }

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

@@ -95,6 +95,7 @@ export type Nacos = {
   serviceType?: SkoalaApiGeneralV1alpha1Service.ServiceType
   ports?: SkoalaApiGeneralV1alpha1Service.ServicePort[]
   status?: NacosStatus
+  clusterPhase?: SkoalaApiGeneralV1alpha1Common.ClusterPhase
   replicas?: number
   image?: string
   version?: string
@@ -842,6 +843,15 @@ export type CheckNacosConfigRes = {
   use?: string
 }
 
+export type UpdateUserPasswordReq = {
+  workspaceId?: string
+  clusterName?: string
+  namespaceName?: string
+  nacosName?: string
+  nacosUserName?: string
+  nacosUserNewPassword?: string
+}
+
 export type GetNacosGrafanaReq = {
   workspaceId?: string
   clusterName?: string

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

@@ -28,6 +28,12 @@ export enum MachineType {
   ALONE = "ALONE",
 }
 
+export enum HostedQuery {
+  ALL = "ALL",
+  NOT_HOSTED = "NOT_HOSTED",
+  HOSTED = "HOSTED",
+}
+
 export enum ListClusterFlowClientStatus {
   OFF = "OFF",
   PENDING = "PENDING",
@@ -582,6 +588,28 @@ export type DeleteAuthorityRuleReq = {
 
 export type GetStaticsSentinelReq = {
   workspaceId?: string
+  page?: number
+  pageSize?: number
+}
+
+export type GetStaticsRegistryReq = {
+  workspaceId?: string
+  page?: number
+  pageSize?: number
+}
+
+export type ListTop10RegSrvReq = {
+  workspaceId?: string
+  hostedQuery?: HostedQuery
+}
+
+export type Top10RegSrv = {
+  registryName?: string
+  serviceCount?: number
+}
+
+export type ListTop10RegSrvRes = {
+  items?: Top10RegSrv[]
 }
 
 export type ErrSentinelInfo = {
@@ -598,4 +626,24 @@ export type ErrIns = {
 
 export type GetStaticsSentinelRes = {
   errIns?: ErrIns
+}
+
+export type ErrHostedIns = {
+  name?: string
+  cluster?: string
+  namespace?: string
+  reason?: string
+}
+
+export type GetStaticsRegistryResErrIns = {
+  items?: ErrHostedIns[]
+  pagination?: SkoalaApiGeneralV1alpha1Common.Pagination
+}
+
+export type GetStaticsRegistryRes = {
+  hostedTotalRegistryCount?: number
+  hostedNormalResCount?: number
+  serviceCount?: number
+  configCount?: number
+  errHostedIns?: GetStaticsRegistryResErrIns
 }

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

@@ -30,14 +30,17 @@ export class Hive {
   static GetVersion(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Version.GetVersionRes> {
     return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiGeneralV1alpha1Version.GetVersionRes>(`/apis/hive.skoala.io/v1alpha1/version?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
-  static GetCharts(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Version.GetHiveChartsRes> {
-    return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiGeneralV1alpha1Version.GetHiveChartsRes>(`/apis/hive.skoala.io/v1alpha1/charts?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  static GetComponents(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Version.GetComponentsRes> {
+    return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiGeneralV1alpha1Version.GetComponentsRes>(`/apis/hive.skoala.io/v1alpha1/components/version?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
 }
 export class Sesame {
   static GetVersion(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Version.GetVersionRes> {
     return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiGeneralV1alpha1Version.GetVersionRes>(`/apis/sesame.skoala.io/v1alpha1/version?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
+  static GetComponents(req: GoogleProtobufEmpty.Empty, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Version.GetComponentsRes> {
+    return fm.fetchReq<GoogleProtobufEmpty.Empty, SkoalaApiGeneralV1alpha1Version.GetComponentsRes>(`/apis/sesame.skoala.io/v1alpha1/components/version?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
 }
 export class Skoala {
   static ListCluster(req: SkoalaApiGeneralV1alpha1Skoala.ListClusterReq, initReq?: fm.InitReq): Promise<SkoalaApiGeneralV1alpha1Skoala.ListClusterRes> {
@@ -268,6 +271,9 @@ export class Nacos {
   static CheckConfig(req: SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigReq, SkoalaApiHostedV1alpha1Nacos.CheckNacosConfigRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/namespaces/${req["nacosNamespace"]}/configs/${req["dataId"]}/check?${fm.renderURLSearchParams(req, ["workspaceId", "clusterName", "namespaceName", "nacosName", "nacosNamespace", "dataId"])}`, {...initReq, method: "GET"})
   }
+  static UpdateUserPassword(req: SkoalaApiHostedV1alpha1Nacos.UpdateUserPasswordReq, initReq?: fm.InitReq): Promise<GoogleProtobufEmpty.Empty> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Nacos.UpdateUserPasswordReq, GoogleProtobufEmpty.Empty>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/clusters/${req["clusterName"]}/namespaces/${req["namespaceName"]}/nacoses/${req["nacosName"]}/users`, {...initReq, method: "PUT", body: JSON.stringify(req, fm.replacer)})
+  }
 }
 export class Sentinel {
   static GetInsGovern(req: SkoalaApiHostedV1alpha1Sentinel.GetInsGovernReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetInsGovernRes> {
@@ -391,6 +397,12 @@ export class Statics {
   static GetStaticsSentinel(req: SkoalaApiHostedV1alpha1Sentinel.GetStaticsSentinelReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetStaticsSentinelRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetStaticsSentinelReq, SkoalaApiHostedV1alpha1Sentinel.GetStaticsSentinelRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/statics/sentinels?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
+  static GetStaticsRegistry(req: SkoalaApiHostedV1alpha1Sentinel.GetStaticsRegistryReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.GetStaticsRegistryRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.GetStaticsRegistryReq, SkoalaApiHostedV1alpha1Sentinel.GetStaticsRegistryRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/statics/registries?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static ListTop10RegSrv(req: SkoalaApiHostedV1alpha1Sentinel.ListTop10RegSrvReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Sentinel.ListTop10RegSrvRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Sentinel.ListTop10RegSrvReq, SkoalaApiHostedV1alpha1Sentinel.ListTop10RegSrvRes>(`/apis/hive.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/statics/registries/services?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }
 export class Mesh {
   static ListMeshResource(req: SkoalaApiHostedV1alpha1Mesh.ListMeshResourceReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Mesh.ListMeshResourceRes> {
@@ -618,7 +630,10 @@ export class GatewayOverview {
   static GatewayOverviewHealth(req: SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewHealthReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewHealthRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewHealthReq, SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewHealthRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/stats/gateway/health?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
-  static GatewayOverviewAPINumRank(req: SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumRes> {
+  static GatewayOverviewRankAPINum(req: SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumRes> {
     return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumReq, SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewRankAPINumRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/stats/gateway/rank/apinum?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
+  static GatewayOverviewInfo(req: SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewInfoReq, initReq?: fm.InitReq): Promise<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewInfoRes> {
+    return fm.fetchReq<SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewInfoReq, SkoalaApiHostedV1alpha1Gateway_overview.GatewayOverviewInfoRes>(`/apis/sesame.skoala.io/v1alpha1/workspaces/${req["workspaceId"]}/stats/gateway/info?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
 }

package/package.json

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