@daocloud-proto/mcamel-redis 0.4.0-71 → 0.4.0-710

package/cluster.pb.ts

@@ -7,12 +7,46 @@
 import * as CommonCommon from "./common.pb"
 import * as fm from "./fetch.pb"
 
+export enum PermissionsType {
+  None = "None",
+  GetInstance = "GetInstance",
+  CreateInstance = "CreateInstance",
+  UpdateInstance = "UpdateInstance",
+  DeleteInstance = "DeleteInstance",
+  GetMetric = "GetMetric",
+  GetInstanceLog = "GetInstanceLog",
+  GetConfig = "GetConfig",
+  UpdateConfig = "UpdateConfig",
+  GetBackup = "GetBackup",
+  CreateBackup = "CreateBackup",
+  UpdateBackup = "UpdateBackup",
+  DeleteBackup = "DeleteBackup",
+  GetBackupConf = "GetBackupConf",
+  CreateBackupConf = "CreateBackupConf",
+  UpdateBackupConf = "UpdateBackupConf",
+  DeleteBackupConf = "DeleteBackupConf",
+  GetTemplate = "GetTemplate",
+  CreateTemplate = "CreateTemplate",
+  UpdateTemplate = "UpdateTemplate",
+  DeleteTemplate = "DeleteTemplate",
+}
+
 export enum EventType {
   EVENT_TYPE_UNSPECIFIED = "EVENT_TYPE_UNSPECIFIED",
   Normal = "Normal",
   Warning = "Warning",
 }
 
+export enum InstallFileReqGVR {
+  None = "None",
+  CustomResourceDefinition = "CustomResourceDefinition",
+}
+
+export enum GetAllEventListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
 export enum GetEventListReqKind {
   KIND_UNSPECIFIED = "KIND_UNSPECIFIED",
   Pod = "Pod",
@@ -23,11 +57,154 @@ export enum GetWorkspaceListReqSortDir {
   DESC = "DESC",
 }
 
+export enum ClusterItemNetworkMode {
+  Unknown = "Unknown",
+  Flannel = "Flannel",
+  Calico = "Calico",
+}
+
 export enum GetInsightAgentStatusRespInsightAgentStatus {
   NotInstall = "NotInstall",
   Install = "Install",
 }
 
+export type InstallFileReq = {
+  cluster?: string
+  path?: string
+  gvr?: InstallFileReqGVR
+}
+
+export type InstallFileResp = {
+  message?: string
+}
+
+export type GetInstallVersionReq = {
+  cluster?: string
+}
+
+export type GetInstallVersionRespSupportVersion = {
+  minVersion?: string
+  maxVersion?: string
+}
+
+export type GetInstallVersionRespStatus = {
+  inRange?: boolean
+}
+
+export type GetInstallVersionResp = {
+  clusterVersion?: string
+  supportVersion?: GetInstallVersionRespSupportVersion
+  status?: GetInstallVersionRespStatus
+}
+
+export type RestartInstanceReq = {
+  workspaceId?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+  extra?: string
+}
+
+export type RestartInstanceResp = {
+  message?: string
+}
+
+export type GetPermissionsListReq = {
+  workspaceId?: number
+}
+
+export type GetPermissionsListRespPermissions = {
+  getInstance?: boolean
+  createInstance?: boolean
+  updateInstance?: boolean
+  deleteInstance?: boolean
+  getMetric?: boolean
+  getInstanceLog?: boolean
+  getConfig?: boolean
+  updateConfig?: boolean
+  getBackup?: boolean
+  createBackup?: boolean
+  updateBackup?: boolean
+  deleteBackup?: boolean
+  getBackupConf?: boolean
+  createBackupConf?: boolean
+  updateBackupConf?: boolean
+  deleteBackupConf?: boolean
+  getTemplate?: boolean
+  createTemplate?: boolean
+  updateTemplate?: boolean
+  deleteTemplate?: boolean
+}
+
+export type GetPermissionsListResp = {
+  permissionsBool?: GetPermissionsListRespPermissions
+  permissions?: PermissionsType[]
+}
+
+export type GetAllEventKindsListResp = {
+  data?: string[]
+}
+
+export type GetAllEventKindsListReq = {
+  cluster?: string
+}
+
+export type GetAllEventListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetAllEventListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  eventType?: EventType
+  kindName?: string
+}
+
+export type GetAllEventListRespItemsSource = {
+  component?: string
+}
+
+export type GetAllEventListRespItemsMetadata = {
+  uid?: string
+  name?: string
+  namespace?: string
+  annotations?: {[key: string]: string}
+  resourceVersion?: string
+  creationTimestamp?: string
+}
+
+export type GetAllEventListRespItemsInvolvedObject = {
+  uid?: string
+  kind?: string
+  name?: string
+  namespace?: string
+  apiVersion?: string
+  resourceVersion?: string
+}
+
+export type GetAllEventListRespItems = {
+  kind?: string
+  type?: string
+  count?: number
+  reason?: string
+  source?: GetAllEventListRespItemsSource
+  message?: string
+  metadata?: GetAllEventListRespItemsMetadata
+  apiVersion?: string
+  lastTimestamp?: string
+  firstTimestamp?: string
+  involvedObject?: GetAllEventListRespItemsInvolvedObject
+  reportingInstance?: string
+  reportingComponent?: string
+}
+
+export type GetAllEventListResp = {
+  items?: GetAllEventListRespItems[]
+  pagination?: CommonCommon.Pagination
+}
+
 export type GetClusterNodeLabelListReq = {
   cluster?: string
 }
@@ -42,6 +219,24 @@ export type GetClusterNodeLabelListResp = {
   pagination?: CommonCommon.Pagination
 }
 
+export type GetClusterPodLabelListReq = {
+  page?: number
+  pageSize?: number
+  searchKey?: string
+  filterNamespace?: string
+  cluster?: string
+}
+
+export type GetClusterPodLabelListRespLabel = {
+  key?: string
+  value?: string[]
+}
+
+export type GetClusterPodLabelListResp = {
+  items?: GetClusterPodLabelListRespLabel[]
+  pagination?: CommonCommon.Pagination
+}
+
 export type GetClusterNodePortListReq = {
   cluster?: string
 }
@@ -114,6 +309,7 @@ export type GetWorkspaceListReq = {
 export type GetWorkspaceListRespItem = {
   workspaceId?: number
   alias?: string
+  visible?: boolean
 }
 
 export type GetWorkspaceListResp = {
@@ -121,15 +317,39 @@ export type GetWorkspaceListResp = {
   pagination?: CommonCommon.Pagination
 }
 
+export type GetClusterHostnetworkPortsReq = {
+  workspaceId?: number
+  cluster?: string
+}
+
 export type GetClusterListReq = {
   workspaceId?: number
+  searchKey?: string
+}
+
+export type GetClusterHostnetworkPortsResp = {
+  items?: string[]
 }
 
 export type GetClusterListResp = {
   items?: string[]
+  clusters?: ClusterItem[]
   pagination?: CommonCommon.Pagination
 }
 
+export type ClusterItemMetadata = {
+  name?: string
+}
+
+export type ClusterItemStatus = {
+  networkMode?: ClusterItemNetworkMode[]
+}
+
+export type ClusterItem = {
+  metadata?: ClusterItemMetadata
+  status?: ClusterItemStatus
+}
+
 export type GetClusterNamespaceListReq = {
   workspaceId?: number
   cluster?: string
@@ -152,6 +372,9 @@ export class Cluster {
   static GetClusterList(req: GetClusterListReq, initReq?: fm.InitReq): Promise<GetClusterListResp> {
     return fm.fetchReq<GetClusterListReq, GetClusterListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/clusters?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
   }
+  static GetClusterHostnetworkPorts(req: GetClusterHostnetworkPortsReq, initReq?: fm.InitReq): Promise<GetClusterHostnetworkPortsResp> {
+    return fm.fetchReq<GetClusterHostnetworkPortsReq, GetClusterHostnetworkPortsResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/hostnetwork_ports?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
   static GetClusterNamespaceList(req: GetClusterNamespaceListReq, initReq?: fm.InitReq): Promise<GetClusterNamespaceListResp> {
     return fm.fetchReq<GetClusterNamespaceListReq, GetClusterNamespaceListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/${req["cluster"]}/namespaces?${fm.renderURLSearchParams(req, ["workspaceId", "cluster"])}`, {...initReq, method: "GET"})
   }
@@ -161,6 +384,9 @@ export class Cluster {
   static GetClusterNodeLabelList(req: GetClusterNodeLabelListReq, initReq?: fm.InitReq): Promise<GetClusterNodeLabelListResp> {
     return fm.fetchReq<GetClusterNodeLabelListReq, GetClusterNodeLabelListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/nodelabels?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
   }
+  static GetClusterPodLabelList(req: GetClusterPodLabelListReq, initReq?: fm.InitReq): Promise<GetClusterPodLabelListResp> {
+    return fm.fetchReq<GetClusterPodLabelListReq, GetClusterPodLabelListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/podlabels?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
+  }
   static GetWorkspaceList(req: GetWorkspaceListReq, initReq?: fm.InitReq): Promise<GetWorkspaceListResp> {
     return fm.fetchReq<GetWorkspaceListReq, GetWorkspaceListResp>(`/apis/mcamel.io/redis/v1alpha1/workspaces?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
@@ -170,7 +396,25 @@ export class Cluster {
   static GetEventList(req: GetEventListReq, initReq?: fm.InitReq): Promise<GetEventListResp> {
     return fm.fetchReq<GetEventListReq, GetEventListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/${req["namespace"]}/events?${fm.renderURLSearchParams(req, ["cluster", "namespace"])}`, {...initReq, method: "GET"})
   }
+  static GetAllEventList(req: GetAllEventListReq, initReq?: fm.InitReq): Promise<GetAllEventListResp> {
+    return fm.fetchReq<GetAllEventListReq, GetAllEventListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/${req["namespace"]}/${req["name"]}/all-events?${fm.renderURLSearchParams(req, ["cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
+  }
+  static GetAllEventKindsList(req: GetAllEventKindsListReq, initReq?: fm.InitReq): Promise<GetAllEventKindsListResp> {
+    return fm.fetchReq<GetAllEventKindsListReq, GetAllEventKindsListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/all-events-kinds?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
+  }
   static GetMetallbIPAddressPoolsList(req: GetMetallbIPAddressPoolsListReq, initReq?: fm.InitReq): Promise<GetMetallbIPAddressPoolsListResp> {
     return fm.fetchReq<GetMetallbIPAddressPoolsListReq, GetMetallbIPAddressPoolsListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/lbaddress/pools?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
   }
+  static GetPermissionsList(req: GetPermissionsListReq, initReq?: fm.InitReq): Promise<GetPermissionsListResp> {
+    return fm.fetchReq<GetPermissionsListReq, GetPermissionsListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/permissions?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static RestartInstance(req: RestartInstanceReq, initReq?: fm.InitReq): Promise<RestartInstanceResp> {
+    return fm.fetchReq<RestartInstanceReq, RestartInstanceResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/restart`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static InstallFile(req: InstallFileReq, initReq?: fm.InitReq): Promise<InstallFileResp> {
+    return fm.fetchReq<InstallFileReq, InstallFileResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/install-file`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static GetInstallVersion(req: GetInstallVersionReq, initReq?: fm.InitReq): Promise<GetInstallVersionResp> {
+    return fm.fetchReq<GetInstallVersionReq, GetInstallVersionResp>(`/apis/mcamel.io/redis/v1alpha1/${req["cluster"]}/install-version?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
+  }
 }

package/common.pb.ts

@@ -10,7 +10,7 @@ export enum ExternalTrafficPolicy {
 }
 
 export enum LBTyp {
-  MetlLB = "MetlLB",
+  MetalLB = "MetalLB",
   Others = "Others",
 }
 
@@ -145,9 +145,14 @@ export type PodCommon = {
   cpuLimit?: number
   memoryUsage?: number
   memoryLimit?: number
+  pvUsedInGb?: number
+  pvAllocatedInGb?: number
   conditions?: PodCommonCondition[]
   containersName?: string[]
   ownerReference?: OwnerReference[]
+  initContainersName?: string[]
+  initContainersStatuses?: ContainerStatus[]
+  containersStatuses?: ContainerStatus[]
 }
 
 export type OwnerReference = {
@@ -161,4 +166,53 @@ export type CommonItemStatus = {
   serviceAddresses?: string[]
   webManagerAddress?: string
   webLogAddress?: string
+  avgPvAllocatedInGb?: number
+  avgPvUsedInGb?: number
+  cpuUtilization?: number
+  memoryUtilization?: number
+  isClusterUnknown?: boolean
+}
+
+export type AccessWhitelistInternal = {
+  namespace?: string
+  podSelector?: {[key: string]: string}
+}
+
+export type AccessWhitelistExternal = {
+  cidr?: string
+  ip?: string
+}
+
+export type AccessWhitelist = {
+  internals?: AccessWhitelistInternal[]
+  externals?: AccessWhitelistExternal[]
+}
+
+export type ContainerStatus = {
+  name?: string
+  state?: ContainerState
+}
+
+export type ContainerState = {
+  waiting?: ContainerStateWaiting
+  running?: ContainerStateRunning
+  terminated?: ContainerStateTerminated
+}
+
+export type ContainerStateWaiting = {
+  reason?: string
+  message?: string
+}
+
+export type ContainerStateRunning = {
+  startedAt?: string
+}
+
+export type ContainerStateTerminated = {
+  exitCode?: number
+  signal?: number
+  reason?: string
+  message?: string
+  startedAt?: string
+  finishedAt?: string
 }

package/insight.pb.ts

@@ -20,27 +20,23 @@ export enum TargetType {
   DEPLOYMENT = "DEPLOYMENT",
   STATEFULSET = "STATEFULSET",
   DAEMONSET = "DAEMONSET",
-  CRONJOB = "CRONJOB",
   POD = "POD",
 }
 
-export enum AlertStatus {
-  ALERT_STATUS_UNSPECIFIED = "ALERT_STATUS_UNSPECIFIED",
-  ALERT_STATUS_FIRING = "ALERT_STATUS_FIRING",
-  ALERT_STATUS_RESOLVED = "ALERT_STATUS_RESOLVED",
-}
-
 export type AlertSummary = {
-  alertId?: string
+  id?: string
+  groupName?: string
+  groupId?: string
   ruleName?: string
-  severity?: Severity
+  ruleId?: string
   clusterName?: string
   namespace?: string
   targetType?: TargetType
-  targetName?: string
-  status?: AlertStatus
+  target?: string
+  severity?: Severity
+  value?: string
+  notifyResponse?: string
   description?: string
   startAt?: string
   updateAt?: string
-  notifyResponse?: string
 }

package/metric.pb.ts

@@ -7,7 +7,18 @@
 import * as CommonCommon from "./common.pb"
 import * as fm from "./fetch.pb"
 import * as InsightIoApiInsightV1alpha1Insight from "./insight.pb"
+
+export enum GetAlertsListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
 export type GetAlertsListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetAlertsListReqSortDir
+  sortBy?: string
+  searchKey?: string
   cluster?: string
   namespace?: string
   name?: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"@daocloud-proto/mcamel-redis",
-  "version":"0.4.0-71",
+  "version":"0.4.0-710",
   "description": "",
   "main": "index.js",
   "scripts": {

package/redis.pb.ts

@@ -6,6 +6,7 @@
 
 import * as CommonCommon from "./common.pb"
 import * as fm from "./fetch.pb"
+import * as TemplateTemplate from "./template.pb"
 
 type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
 type OneOf<T> =
@@ -34,6 +35,39 @@ export enum RedisPodType {
   Sentinel = "Sentinel",
   LeaderRedis = "LeaderRedis",
   FollowerRedis = "FollowerRedis",
+  SentinelRedisMaster = "SentinelRedisMaster",
+  SentinelRedisReplica = "SentinelRedisReplica",
+}
+
+export enum GetRedisBackupListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
+export enum GetMinioListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
+export enum GetRedisBackupListRespRedisBackupItemStatusStatus {
+  Running = "Running",
+  Failed = "Failed",
+  Succeeded = "Succeeded",
+}
+
+export enum CreateRedisBackupReqProvider {
+  Minio = "Minio",
+  Other = "Other",
+}
+
+export enum UpdateRedisAutoBackupReqProvider {
+  Minio = "Minio",
+  Other = "Other",
+}
+
+export enum GetRedisSlowLogListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
 }
 
 export enum GetRedisListReqSortDir {
@@ -46,10 +80,9 @@ export enum GetRedisConfReqSortDir {
   DESC = "DESC",
 }
 
-export enum CreateRedisReqServiceType {
-  ClusterIP = "ClusterIP",
-  NodePort = "NodePort",
-  LoadBalancer = "LoadBalancer",
+export enum CreateRedisReqRestoreProvider {
+  Minio = "Minio",
+  Other = "Other",
 }
 
 export enum GetRedisParamRespSelectSelectType {
@@ -76,6 +109,161 @@ export enum GetRedisConfRespItemsParamType {
   conf = "conf",
 }
 
+export enum RedisItemStatusRestoreInitialStatus {
+  Unknown = "Unknown",
+  Running = "Running",
+  Failed = "Failed",
+  Succeeded = "Succeeded",
+}
+
+export type CreateRedisRecoverReq = {
+  workspaceId?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+  backupName?: string
+  targetRedisName?: string
+  targetRedisNamespace?: string
+  targetRedisCluster?: string
+  instanceType?: InstanceType
+}
+
+export type CreateRedisRecoverResp = {
+  message?: string
+}
+
+export type DeleteRedisBackupReq = {
+  cluster?: string
+  namespace?: string
+  backupName?: string
+  isOpenAutoBackup?: boolean
+  instanceType?: InstanceType
+}
+
+export type DeleteRedisBackupResp = {
+  message?: string
+}
+
+export type GetRedisBackupListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetRedisBackupListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type GetMinioListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetMinioListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  workspaceId?: number
+}
+
+export type GetMinioListResp = {
+  items?: TenantItem[]
+  pagination?: CommonCommon.Pagination
+}
+
+export type TenantItemCreateMinioReq = {
+  name?: string
+  namespace?: string
+  cluster?: string
+}
+
+export type TenantItem = {
+  apiVersion?: string
+  kind?: string
+  spec?: TenantItemCreateMinioReq
+  status?: TenantItemStatus
+}
+
+export type TenantItemStatus = {
+  common?: CommonCommon.CommonItemStatus
+}
+
+export type GetRedisBackupListRespRedisBackupItemMetadata = {
+  creationTimestamp?: string
+  name?: string
+  namespace?: string
+}
+
+export type GetRedisBackupListRespRedisBackupItemStatusJobCondition = {
+  type?: string
+  status?: string
+  reason?: string
+  message?: string
+}
+
+export type GetRedisBackupListRespRedisBackupItemStatus = {
+  completionTime?: string
+  startTime?: string
+  active?: number
+  succeeded?: number
+  failed?: number
+  conditions?: GetRedisBackupListRespRedisBackupItemStatusJobCondition[]
+  isAutoBackup?: boolean
+  status?: GetRedisBackupListRespRedisBackupItemStatusStatus
+}
+
+export type GetRedisBackupListRespRedisBackupItem = {
+  metadata?: GetRedisBackupListRespRedisBackupItemMetadata
+  spec?: CreateRedisBackupReq
+  status?: GetRedisBackupListRespRedisBackupItemStatus
+}
+
+export type GetRedisBackupListResp = {
+  items?: GetRedisBackupListRespRedisBackupItem[]
+  pagination?: CommonCommon.Pagination
+}
+
+export type CreateRedisBackupReq = {
+  cluster?: string
+  namespace?: string
+  name?: string
+  instanceType?: InstanceType
+  backupName?: string
+  accessKeyId?: string
+  accessKeySecret?: string
+  endpoint?: string
+  provider?: CreateRedisBackupReqProvider
+  storePath?: string
+  genCreateTime?: string
+  genBucket?: string
+}
+
+export type UpdateRedisAutoBackupReq = {
+  workspaceId?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+  instanceType?: InstanceType
+  accessKeyId?: string
+  accessKeySecret?: string
+  endpoint?: string
+  provider?: UpdateRedisAutoBackupReqProvider
+  storePath?: string
+  isOpenAutoBackup?: boolean
+  backupSchedule?: string
+  backupHistoryLimit?: number
+  storageConfigName?: string
+  storageConfigNamespace?: string
+  storageConfigCluster?: string
+  bucket?: string
+}
+
+export type UpdateRedisAutoBackupResp = {
+  message?: string
+}
+
+export type CreateRedisBackupResp = {
+  message?: string
+}
+
 export type GetRedisUsersReq = {
   cluster?: string
   namespace?: string
@@ -92,6 +280,20 @@ export type GetRedisUsersResp = {
   users?: GetRedisUsersRespUserItem[]
 }
 
+export type GetRedisSlowLogListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetRedisSlowLogListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+  date?: string
+  instanceType?: InstanceType
+  refresh?: boolean
+}
+
 export type GetRedisListReq = {
   page?: number
   pageSize?: number
@@ -99,6 +301,8 @@ export type GetRedisListReq = {
   sortBy?: string
   searchKey?: string
   workspaceId?: number
+  filterCluster?: string
+  filterNamespace?: string
 }
 
 export type GetRedisConfReq = {
@@ -126,6 +330,20 @@ export type CreateRedisReqPorts = {
   nodePort?: number
 }
 
+export type CreateRedisReqRestore = {
+  enable?: boolean
+  accessKeyId?: string
+  accessKeySecret?: string
+  endpoint?: string
+  provider?: CreateRedisReqRestoreProvider
+  storePath?: string
+  backupName?: string
+  targetRedisName?: string
+  targetRedisNamespace?: string
+  targetRedisCluster?: string
+  instanceType?: InstanceType
+}
+
 export type CreateRedisReq = {
   cluster?: string
   namespace?: string
@@ -136,7 +354,7 @@ export type CreateRedisReq = {
   storageCapacity?: string
   instanceType?: InstanceType
   authPass?: string
-  serviceType?: CreateRedisReqServiceType
+  serviceType?: CommonCommon.ServiceType
   serviceAnnotations?: {[key: string]: string}
   ports?: CreateRedisReqPorts[]
   cpuRequest?: string
@@ -144,9 +362,22 @@ export type CreateRedisReq = {
   memoryRequest?: string
   memoryLimit?: string
   conf?: string
+  confTemplateName?: string
   version?: string
   followerReplicas?: number
   affinity?: CommonCommon.Affinity
+  externalTrafficPolicy?: CommonCommon.ExternalTrafficPolicy
+  lbTyp?: CommonCommon.LBTyp
+  lbPoolName?: string
+  lbAddress?: string
+  restore?: CreateRedisReqRestore
+  autoBackupConfig?: UpdateRedisAutoBackupReq
+  serviceMonitorInterval?: string
+  accessWhitelist?: CommonCommon.AccessWhitelist
+  isExtraSvc?: boolean
+  hostNetwork?: boolean
+  hostNetworkPort?: number
+  hostNetworkExporterPort?: number
 }
 
 export type UpdateRedisConfReq = {
@@ -154,8 +385,9 @@ export type UpdateRedisConfReq = {
   namespace?: string
   name?: string
   authPass?: string
-  conf?: string
   instanceType?: InstanceType
+  reloadFromConfTemplateName?: string
+  confItems?: TemplateTemplate.TemplateConfigItem[]
 }
 
 export type UpdateRedisParamsResp = {
@@ -283,6 +515,8 @@ export type GetRedisGrafanaAddrReq = {
   namespace?: string
   name?: string
   instanceType?: InstanceType
+  from?: string
+  to?: string
 }
 
 export type GetRedisGrafanaAddrResp = {
@@ -317,6 +551,19 @@ export type GetRedisListResp = {
   pagination?: CommonCommon.Pagination
 }
 
+export type GetRedisSlowLogListRespItems = {
+  id?: string
+  timestamp?: string
+  spent?: string
+  command?: string[]
+  ip?: string
+}
+
+export type GetRedisSlowLogListResp = {
+  items?: GetRedisSlowLogListRespItems[]
+  pagination?: CommonCommon.Pagination
+}
+
 export type RedisItemStatus = {
   status?: Status
   podsAreReadyNum?: number
@@ -325,6 +572,8 @@ export type RedisItemStatus = {
   serviceAddr?: string
   common?: CommonCommon.CommonItemStatus
   isControl?: boolean
+  restoreInitialStatus?: RedisItemStatusRestoreInitialStatus
+  extraSvcIpList?: string[]
 }
 
 export type RedisItemMetadata = {
@@ -342,6 +591,21 @@ export type RedisItem = {
   status?: RedisItemStatus
 }
 
+export type CreateRedisShakeSyncReq = {
+  fromCluster?: string
+  fromNamespace?: string
+  fromName?: string
+  fromInstanceType?: InstanceType
+  targetCluster?: string
+  targetNamespace?: string
+  targetName?: string
+  targetInstanceType?: InstanceType
+}
+
+export type CreateRedisShakeSyncResp = {
+  message?: string
+}
+
 export class Redis {
   static GetRedisList(req: GetRedisListReq, initReq?: fm.InitReq): Promise<GetRedisListResp> {
     return fm.fetchReq<GetRedisListReq, GetRedisListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/rediss?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
@@ -364,6 +628,9 @@ export class Redis {
   static CreateRedis(req: CreateRedisReq, initReq?: fm.InitReq): Promise<CreateRedisResp> {
     return fm.fetchReq<CreateRedisReq, CreateRedisResp>(`/apis/mcamel.io/redis/v1alpha1/redis`, {...initReq, method: "POST", body: JSON.stringify(req)})
   }
+  static CreateRedisShakeSync(req: CreateRedisShakeSyncReq, initReq?: fm.InitReq): Promise<CreateRedisShakeSyncResp> {
+    return fm.fetchReq<CreateRedisShakeSyncReq, CreateRedisShakeSyncResp>(`/apis/mcamel.io/redis/v1alpha1/redis-shake`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
   static GetRedisConfs(req: GetRedisConfReq, initReq?: fm.InitReq): Promise<GetRedisConfResp> {
     return fm.fetchReq<GetRedisConfReq, GetRedisConfResp>(`/apis/mcamel.io/redis/v1alpha1/redis/${req["instanceType"]}/${req["cluster"]}/${req["namespace"]}/${req["name"]}/confs?${fm.renderURLSearchParams(req, ["instanceType", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
@@ -382,4 +649,25 @@ export class Redis {
   static GetRedisUsers(req: GetRedisUsersReq, initReq?: fm.InitReq): Promise<GetRedisUsersResp> {
     return fm.fetchReq<GetRedisUsersReq, GetRedisUsersResp>(`/apis/mcamel.io/redis/v1alpha1/redis/${req["instanceType"]}/${req["cluster"]}/${req["namespace"]}/${req["name"]}/users?${fm.renderURLSearchParams(req, ["instanceType", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
+  static CreateRedisBackup(req: CreateRedisBackupReq, initReq?: fm.InitReq): Promise<CreateRedisBackupResp> {
+    return fm.fetchReq<CreateRedisBackupReq, CreateRedisBackupResp>(`/apis/mcamel.io/redis/v1alpha1/redis/backup`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static UpdateRedisAutoBackup(req: UpdateRedisAutoBackupReq, initReq?: fm.InitReq): Promise<UpdateRedisAutoBackupResp> {
+    return fm.fetchReq<UpdateRedisAutoBackupReq, UpdateRedisAutoBackupResp>(`/apis/mcamel.io/redis/v1alpha1/redis/${req["cluster"]}/${req["namespace"]}/${req["name"]}/auto-backup`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+  }
+  static GetRedisBackupList(req: GetRedisBackupListReq, initReq?: fm.InitReq): Promise<GetRedisBackupListResp> {
+    return fm.fetchReq<GetRedisBackupListReq, GetRedisBackupListResp>(`/apis/mcamel.io/redis/v1alpha1/redis/backups?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static DeleteRedisBackup(req: DeleteRedisBackupReq, initReq?: fm.InitReq): Promise<DeleteRedisBackupResp> {
+    return fm.fetchReq<DeleteRedisBackupReq, DeleteRedisBackupResp>(`/apis/mcamel.io/redis/v1alpha1/redis/backups/${req["cluster"]}/${req["namespace"]}/${req["backupName"]}`, {...initReq, method: "DELETE"})
+  }
+  static GetMinioList(req: GetMinioListReq, initReq?: fm.InitReq): Promise<GetMinioListResp> {
+    return fm.fetchReq<GetMinioListReq, GetMinioListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/minios?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static CreateRedisRecover(req: CreateRedisRecoverReq, initReq?: fm.InitReq): Promise<CreateRedisRecoverResp> {
+    return fm.fetchReq<CreateRedisRecoverReq, CreateRedisRecoverResp>(`/apis/mcamel.io/redis/v1alpha1/redis/${req["cluster"]}/${req["namespace"]}/${req["name"]}/recover`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static GetRedisSlowLogList(req: GetRedisSlowLogListReq, initReq?: fm.InitReq): Promise<GetRedisSlowLogListResp> {
+    return fm.fetchReq<GetRedisSlowLogListReq, GetRedisSlowLogListResp>(`/apis/mcamel.io/redis/v1alpha1/redis/${req["instanceType"]}/${req["cluster"]}/${req["namespace"]}/${req["name"]}/slowlogs?${fm.renderURLSearchParams(req, ["instanceType", "cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
+  }
 }

package/storage_config.pb.ts

@@ -0,0 +1,188 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as CommonCommon from "./common.pb"
+import * as fm from "./fetch.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 GetStorageConfigParamRespSelectSelectType {
+  Single = "Single",
+  Multiple = "Multiple",
+}
+
+export enum GetStorageConfigConsumersRespStorageConfigConsumerType {
+  STORAGE_CONFIG_CONSUMER_TYPE_UNSPECIFIED = "STORAGE_CONFIG_CONSUMER_TYPE_UNSPECIFIED",
+  STORAGE_CONFIG_CONSUMER_TYPE_MYSQL = "STORAGE_CONFIG_CONSUMER_TYPE_MYSQL",
+  STORAGE_CONFIG_CONSUMER_TYPE_REDIS = "STORAGE_CONFIG_CONSUMER_TYPE_REDIS",
+}
+
+export enum GetStorageConfigListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
+export type GetStorageConfigParamReq = {
+}
+
+export type GetStorageConfigParamRespSelectDataStringValue = {
+  value?: string
+}
+
+export type GetStorageConfigParamRespSelectDataIntValue = {
+  value?: number
+}
+
+
+type BaseGetStorageConfigParamRespSelectData = {
+}
+
+export type GetStorageConfigParamRespSelectData = BaseGetStorageConfigParamRespSelectData
+  & OneOf<{ sValue: GetStorageConfigParamRespSelectDataStringValue; iValue: GetStorageConfigParamRespSelectDataIntValue }>
+
+export type GetStorageConfigParamRespSelect = {
+  selectType?: GetStorageConfigParamRespSelectSelectType
+  data?: GetStorageConfigParamRespSelectData[]
+}
+
+export type GetStorageConfigParamResp = {
+  storageType?: GetStorageConfigParamRespSelect
+}
+
+export type CreateStorageConfigBucketCheckJobReq = {
+  storageType?: string
+  endpoint?: string
+  accessKey?: string
+  secretKey?: string
+  bucket?: string
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type CreateStorageConfigBucketCheckJobResp = {
+  message?: string
+}
+
+export type CreateStorageConfigReq = {
+  workspaceId?: number
+  cluster?: string
+  namespace?: string
+  name?: string
+  storageType?: string
+  accessKey?: string
+  secretKey?: string
+  bucket?: string
+  endpoint?: string
+  minioCluster?: string
+  minioNamespace?: string
+  minioName?: string
+  description?: string
+}
+
+export type CreateStorageConfigResp = {
+  message?: string
+}
+
+export type GetStorageConfigConsumersReq = {
+  workspaceId?: number
+  name?: string
+}
+
+export type GetStorageConfigConsumersRespConsumer = {
+  type?: GetStorageConfigConsumersRespStorageConfigConsumerType
+  cluster?: string
+  namespace?: string
+  name?: string
+}
+
+export type GetStorageConfigConsumersResp = {
+  consumers?: GetStorageConfigConsumersRespConsumer[]
+}
+
+export type DeleteStorageConfigReq = {
+  workspaceId?: number
+  name?: string
+  cluster?: string
+  namespace?: string
+}
+
+export type DeleteStorageConfigResp = {
+  message?: string
+}
+
+export type UpdateStorageConfigResp = {
+  message?: string
+}
+
+export type StorageConfigItemStorageConfigStatus = {
+  lastUpdateTimestamp?: string
+  createTimestamp?: string
+}
+
+export type StorageConfigItem = {
+  spec?: CreateStorageConfigReq
+  status?: StorageConfigItemStorageConfigStatus
+}
+
+export type GetStorageConfigReq = {
+  workspaceId?: number
+  name?: string
+  namespace?: string
+  cluster?: string
+}
+
+export type GetStorageConfigResp = {
+  item?: StorageConfigItem
+}
+
+export type GetStorageConfigListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetStorageConfigListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  workspaceId?: number
+}
+
+export type GetStorageConfigListResp = {
+  items?: StorageConfigItem[]
+  pagination?: CommonCommon.Pagination
+}
+
+export class StorageConfig {
+  static GetStorageConfigParam(req: GetStorageConfigParamReq, initReq?: fm.InitReq): Promise<GetStorageConfigParamResp> {
+    return fm.fetchReq<GetStorageConfigParamReq, GetStorageConfigParamResp>(`/apis/mcamel.io/redis/v1alpha1/storage-config/param?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
+  }
+  static CreateStorageConfigBucketCheckJob(req: CreateStorageConfigBucketCheckJobReq, initReq?: fm.InitReq): Promise<CreateStorageConfigBucketCheckJobResp> {
+    return fm.fetchReq<CreateStorageConfigBucketCheckJobReq, CreateStorageConfigBucketCheckJobResp>(`/apis/mcamel.io/redis/v1alpha1/storage-config/bucket/check-job`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static CreateStorageConfig(req: CreateStorageConfigReq, initReq?: fm.InitReq): Promise<CreateStorageConfigResp> {
+    return fm.fetchReq<CreateStorageConfigReq, CreateStorageConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-config`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static GetStorageConfigConsumers(req: GetStorageConfigConsumersReq, initReq?: fm.InitReq): Promise<GetStorageConfigConsumersResp> {
+    return fm.fetchReq<GetStorageConfigConsumersReq, GetStorageConfigConsumersResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-config/${req["name"]}/consumers?${fm.renderURLSearchParams(req, ["workspaceId", "name"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteStorageConfig(req: DeleteStorageConfigReq, initReq?: fm.InitReq): Promise<DeleteStorageConfigResp> {
+    return fm.fetchReq<DeleteStorageConfigReq, DeleteStorageConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-config/${req["cluster"]}/${req["namespace"]}/${req["name"]}`, {...initReq, method: "DELETE"})
+  }
+  static UpdateStorageConfig(req: CreateStorageConfigReq, initReq?: fm.InitReq): Promise<UpdateStorageConfigResp> {
+    return fm.fetchReq<CreateStorageConfigReq, UpdateStorageConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-config/${req["name"]}`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+  }
+  static GetStorageConfig(req: GetStorageConfigReq, initReq?: fm.InitReq): Promise<GetStorageConfigResp> {
+    return fm.fetchReq<GetStorageConfigReq, GetStorageConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-config/${req["name"]}?${fm.renderURLSearchParams(req, ["workspaceId", "name"])}`, {...initReq, method: "GET"})
+  }
+  static GetStorageConfigList(req: GetStorageConfigListReq, initReq?: fm.InitReq): Promise<GetStorageConfigListResp> {
+    return fm.fetchReq<GetStorageConfigListReq, GetStorageConfigListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/storage-configs?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+}

package/template.pb.ts

@@ -0,0 +1,171 @@
+/* eslint-disable */
+// @ts-nocheck
+/*
+* This file is a generated Typescript file for GRPC Gateway, DO NOT MODIFY
+*/
+
+import * as CommonCommon from "./common.pb"
+import * as fm from "./fetch.pb"
+
+export enum TemplateInstanceType {
+  MysqlMasterReplica = "MysqlMasterReplica",
+  RedisStandalone = "RedisStandalone",
+  RedisFailover = "RedisFailover",
+  RedisCluster = "RedisCluster",
+  KafkaConfig = "KafkaConfig",
+  MysqlMgrConfig = "MysqlMgrConfig",
+  MongodbConfig = "MongodbConfig",
+}
+
+export enum GetTemplateConfigReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
+export enum GetTemplateConfigListReqSortDir {
+  ASC = "ASC",
+  DESC = "DESC",
+}
+
+export enum TemplateConfigItemValueType {
+  String = "String",
+  SingleSelection = "SingleSelection",
+  MultiString = "MultiString",
+}
+
+export type GetTemplateConfigVersionsReq = {
+  workspaceId?: number
+}
+
+export type GetTemplateConfigVersionsResp = {
+  versions?: string[]
+}
+
+export type GetTemplateConfigStringResp = {
+  conf?: string
+}
+
+export type DeleteTemplateReq = {
+  workspaceId?: number
+  name?: string
+  version?: string
+}
+
+export type DeleteTemplateConfigResp = {
+  message?: string
+}
+
+export type CreateOrUpdateTemplateConfigResp = {
+  message?: string
+}
+
+export type GetTemplateConfigReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetTemplateConfigReqSortDir
+  sortBy?: string
+  searchKey?: string
+  workspaceId?: number
+  name?: string
+  version?: string
+  templateType?: string
+  type?: string
+  createTimestamp?: string
+  templateInstanceType?: TemplateInstanceType
+}
+
+export type CreateTemplateConfigResp = {
+  message?: string
+}
+
+export type UpdateTemplateConfigResp = {
+  message?: string
+}
+
+export type CreateTemplateConfigReq = {
+  workspaceId?: number
+  targetName?: string
+  targetVersion?: string
+  targetType?: string
+  targetTemplateType?: string
+  targetConf?: string
+  fromTemplateName?: string
+}
+
+export type UpdateTemplateConfigReq = {
+  workspaceId?: number
+  name?: string
+  version?: string
+  type?: string
+  templateType?: string
+  items?: TemplateConfigItem[]
+  conf?: string
+}
+
+export type GetTemplateConfigResp = {
+  data?: UpdateTemplateConfigReq
+  pagination?: CommonCommon.Pagination
+}
+
+export type GetTemplateConfigListReq = {
+  page?: number
+  pageSize?: number
+  sortDir?: GetTemplateConfigListReqSortDir
+  sortBy?: string
+  searchKey?: string
+  workspaceId?: number
+  version?: string
+  templateInstanceType?: TemplateInstanceType
+}
+
+export type TemplateConfigItem = {
+  name?: string
+  default?: string
+  current?: string
+  value?: string
+  isNeedRestart?: boolean
+  valueType?: TemplateConfigItemValueType
+  valueRemarksZh?: string
+  valueRemarksEn?: string
+  updateTimestamp?: string
+}
+
+export type GetTemplateConfigListResp = {
+  items?: GetTemplateConfigReq[]
+  pagination?: CommonCommon.Pagination
+}
+
+export type GetTemplateInstanceTypeListReq = {
+  workspaceId?: number
+}
+
+export type GetTemplateInstanceTypeListResp = {
+  type?: TemplateInstanceType[]
+}
+
+export class Template {
+  static GetTemplateConfigList(req: GetTemplateConfigListReq, initReq?: fm.InitReq): Promise<GetTemplateConfigListResp> {
+    return fm.fetchReq<GetTemplateConfigListReq, GetTemplateConfigListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static GetTemplateInstanceTypeList(req: GetTemplateInstanceTypeListReq, initReq?: fm.InitReq): Promise<GetTemplateInstanceTypeListResp> {
+    return fm.fetchReq<GetTemplateInstanceTypeListReq, GetTemplateInstanceTypeListResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_instance_type?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+  static GetTemplateConfig(req: GetTemplateConfigReq, initReq?: fm.InitReq): Promise<GetTemplateConfigResp> {
+    return fm.fetchReq<GetTemplateConfigReq, GetTemplateConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config/${req["name"]}?${fm.renderURLSearchParams(req, ["workspaceId", "name"])}`, {...initReq, method: "GET"})
+  }
+  static DeleteTemplateConfig(req: DeleteTemplateReq, initReq?: fm.InitReq): Promise<DeleteTemplateConfigResp> {
+    return fm.fetchReq<DeleteTemplateReq, DeleteTemplateConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config/${req["name"]}/${req["version"]}`, {...initReq, method: "DELETE"})
+  }
+  static CreateTemplateConfig(req: CreateTemplateConfigReq, initReq?: fm.InitReq): Promise<CreateTemplateConfigResp> {
+    return fm.fetchReq<CreateTemplateConfigReq, CreateTemplateConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config`, {...initReq, method: "POST", body: JSON.stringify(req)})
+  }
+  static UpdateTemplateConfig(req: UpdateTemplateConfigReq, initReq?: fm.InitReq): Promise<UpdateTemplateConfigResp> {
+    return fm.fetchReq<UpdateTemplateConfigReq, UpdateTemplateConfigResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config`, {...initReq, method: "PUT", body: JSON.stringify(req)})
+  }
+  static GetTemplateConfigString(req: GetTemplateConfigReq, initReq?: fm.InitReq): Promise<GetTemplateConfigStringResp> {
+    return fm.fetchReq<GetTemplateConfigReq, GetTemplateConfigStringResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config/${req["name"]}/to_string?${fm.renderURLSearchParams(req, ["workspaceId", "name"])}`, {...initReq, method: "GET"})
+  }
+  static GetTemplateConfigVersions(req: GetTemplateConfigVersionsReq, initReq?: fm.InitReq): Promise<GetTemplateConfigVersionsResp> {
+    return fm.fetchReq<GetTemplateConfigVersionsReq, GetTemplateConfigVersionsResp>(`/apis/mcamel.io/redis/v1alpha1/${req["workspaceId"]}/template_config/versions?${fm.renderURLSearchParams(req, ["workspaceId"])}`, {...initReq, method: "GET"})
+  }
+}