@daocloud-proto/insight 0.18.2 → 0.19.0-rc1

package/event/v1alpha1/event.pb.ts

@@ -8,8 +8,8 @@ import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 
 export enum EventType {
   TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
-  NORMAL = "NORMAL",
-  WARNING = "WARNING",
+  Normal = "Normal",
+  Warning = "Warning",
 }
 
 export type QueryEventHistogramRequest = {
@@ -97,7 +97,7 @@ export type Event = {
   source?: EventSource
   reportingInstance?: string
   metadata?: EventMetadata
-  type?: string
+  type?: EventType
   firstTimestamp?: string
   involveObject?: EventInvolvedObject
   clusterUuid?: string

package/insight/v1alpha1/insight.pb.ts

@@ -65,6 +65,7 @@ export type GlobalConfig = {
 export type userinfo = {
   name?: string
   isAdmin?: boolean
+  isClusterAdmin?: boolean
   canView?: boolean
   resourceTypes?: resourceType[]
 }
@@ -331,7 +332,7 @@ export class Resource {
     return fm.fetchReq<InsightIoApiResourceV1alpha1Pod.GetPodRequest, InsightIoApiResourceV1alpha1Pod.Pod>(`/apis/insight.io/v1alpha1/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/pods/${req["name"]}?${fm.renderURLSearchParams(req, ["cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
   }
   static GetPodJVMInfo(req: InsightIoApiResourceV1alpha1Pod.PodJVMRequest, initReq?: fm.InitReq): Promise<InsightIoApiResourceV1alpha1Pod.PodJVMInfo> {
-    return fm.fetchReq<InsightIoApiResourceV1alpha1Pod.PodJVMRequest, InsightIoApiResourceV1alpha1Pod.PodJVMInfo>(`/apis/insight.io/v1alpha1/clusters/${req["clusterName"]}/namespaces/${req["namespace"]}/pods/${req["name"]}/jvm`, {...initReq, method: "POST", body: JSON.stringify(req)})
+    return fm.fetchReq<InsightIoApiResourceV1alpha1Pod.PodJVMRequest, InsightIoApiResourceV1alpha1Pod.PodJVMInfo>(`/apis/insight.io/v1alpha1/pods/${req["name"]}/jvm`, {...initReq, method: "POST", body: JSON.stringify(req)})
   }
   static ListPodContainers(req: InsightIoApiResourceV1alpha1Pod.ListContainersRequest, initReq?: fm.InitReq): Promise<InsightIoApiResourceV1alpha1Pod.ListContainersResponse> {
     return fm.fetchReq<InsightIoApiResourceV1alpha1Pod.ListContainersRequest, InsightIoApiResourceV1alpha1Pod.ListContainersResponse>(`/apis/insight.io/v1alpha1/clusters/${req["cluster"]}/namespaces/${req["namespace"]}/pods/${req["name"]}/containers?${fm.renderURLSearchParams(req, ["cluster", "namespace", "name"])}`, {...initReq, method: "GET"})
@@ -351,10 +352,10 @@ export class Resource {
 }
 export class Tracing {
   static ListServiceNames(req: InsightIoApiTracingV1alpha1Tracing.ListServiceNamesRequest, initReq?: fm.InitReq): Promise<InsightIoApiTracingV1alpha1Tracing.GetServiceNamesResponse> {
-    return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.ListServiceNamesRequest, InsightIoApiTracingV1alpha1Tracing.GetServiceNamesResponse>(`/apis/insight.io/v1alpha1/traces/clusters/${req["clusterName"]}/service-names?${fm.renderURLSearchParams(req, ["clusterName"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.ListServiceNamesRequest, InsightIoApiTracingV1alpha1Tracing.GetServiceNamesResponse>(`/apis/insight.io/v1alpha1/traces/service-names?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static GetServices(req: InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesRequest, initReq?: fm.InitReq): Promise<InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesResponse> {
-    return fm.fetchReq<InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesRequest, InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesResponse>(`/apis/insight.io/v1alpha1/traces/clusters/${req["clusterName"]}/services?${fm.renderURLSearchParams(req, ["clusterName"])}`, {...initReq, method: "GET"})
+    return fm.fetchReq<InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesRequest, InsightIoApiSpan_metricV1alpha1Span_metric.GetServicesResponse>(`/apis/insight.io/v1alpha1/traces/services?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})
   }
   static QueryOperations(req: InsightIoApiTracingV1alpha1Tracing.QueryOperationsRequest, initReq?: fm.InitReq): Promise<InsightIoApiTracingV1alpha1Tracing.QueryOperationsResponse> {
     return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.QueryOperationsRequest, InsightIoApiTracingV1alpha1Tracing.QueryOperationsResponse>(`/apis/insight.io/v1alpha1/traces/clusters/${req["clusterName"]}/operations?${fm.renderURLSearchParams(req, ["clusterName"])}`, {...initReq, method: "GET"})

package/log/v1alpha1/log.pb.ts

@@ -21,6 +21,17 @@ export enum DownloadFileType {
   JSON = "JSON",
 }
 
+export enum LogField {
+  LOG_FIELD_UNSPECIFIED = "LOG_FIELD_UNSPECIFIED",
+  Timestamp = "Timestamp",
+  Cluster = "Cluster",
+  Namespace = "Namespace",
+  Pod = "Pod",
+  Container = "Container",
+  Node = "Node",
+  File = "File",
+}
+
 export type SearchLogRequest = {
   index?: string
   query?: string
@@ -80,6 +91,7 @@ export type LogContextResourceFilter = {
   cluster?: string
   pod?: string
   container?: string
+  namespace?: string
 }
 
 export type LogContextSystemFilter = {
@@ -127,8 +139,8 @@ export type LogHistogramResult = {
 export type DownloadLogRequest = {
   type?: DownloadFileType
   queryLog?: QueryLogRequest
-  queryLogConext?: QueryLogContextRequest
-  fields?: string[]
+  queryLogContext?: QueryLogContextRequest
+  fields?: LogField[]
 }
 
 export type DownloadLogResponse = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"@daocloud-proto/insight",
-  "version":"0.18.2",
+  "version":"0.19.0-rc1",
   "description": "",
   "main": "index.js",
   "scripts": {

package/resource/v1alpha1/cluster.pb.ts

@@ -41,8 +41,9 @@ export enum InsightAgentStatus {
 }
 
 export enum Role {
-  NOT_ADMIN = "NOT_ADMIN",
-  ADMIN = "ADMIN",
+  ROLE_UNSPECIFIED = "ROLE_UNSPECIFIED",
+  ROLE_VIEWER = "ROLE_VIEWER",
+  ROLE_ADMIN = "ROLE_ADMIN",
 }
 
 export enum serverComponentName {
@@ -98,6 +99,7 @@ export type ClusterSummary = {
   phase?: ClusterPhase
   nodeNumSummary?: InsightIoApiResourceV1alpha1Type.ResourceNumSummary
   insightAgentStatus?: insightAgentState
+  role?: Role
 }
 
 export type ClusterDetail = {
@@ -119,6 +121,7 @@ export type insightAgentState = {
   status?: InsightAgentStatus
   version?: string
   createTime?: string
+  traceStatus?: InsightAgentStatus
 }
 
 export type ListNamespacesRequest = {

package/resource/v1alpha1/pod.pb.ts

@@ -7,6 +7,15 @@
 import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 import * as InsightIoApiResourceV1alpha1Type from "./type.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 PodPhase {
   POD_PHASE_UNSPECIFIED = "POD_PHASE_UNSPECIFIED",
   POD_PHASE_UNKNOWN = "POD_PHASE_UNKNOWN",
@@ -57,8 +66,8 @@ export type GetPodRequest = {
   name?: string
 }
 
-export type PodJVMRequest = {
-  clusterName?: string
+
+type BasePodJVMRequest = {
   namespace?: string
   name?: string
   start?: string
@@ -66,6 +75,9 @@ export type PodJVMRequest = {
   step?: number
 }
 
+export type PodJVMRequest = BasePodJVMRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type Pod = {
   name?: string
   cluster?: string

package/resource/v1alpha1/workload.pb.ts

@@ -8,9 +8,10 @@ import * as InsightIoApiTypeV1alpha1Page from "../../type/v1alpha1/page.pb"
 import * as InsightIoApiResourceV1alpha1Type from "./type.pb"
 
 export enum WorkloadKind {
-  DEPLOYMENT = "DEPLOYMENT",
-  STATEFULSET = "STATEFULSET",
-  DAEMONSET = "DAEMONSET",
+  WORKLOAD_KIND_UNKNOWN = "WORKLOAD_KIND_UNKNOWN",
+  WORKLOAD_KIND_DEPLOYMENT = "WORKLOAD_KIND_DEPLOYMENT",
+  WORKLOAD_KIND_STATEFULSET = "WORKLOAD_KIND_STATEFULSET",
+  WORKLOAD_KIND_DAEMONSET = "WORKLOAD_KIND_DAEMONSET",
 }
 
 export enum WorkloadPhase {

package/span_metric/v1alpha1/span_metric.pb.ts

@@ -85,7 +85,8 @@ export type GetOperationDetailResponse = {
   pagination?: InsightIoApiTypeV1alpha1Page.Pagination
 }
 
-export type GetServicesRequest = {
+
+type BaseGetServicesRequest = {
   namespace?: string
   extensionFilters?: string
   endTime?: string
@@ -94,9 +95,11 @@ export type GetServicesRequest = {
   page?: number
   pageSize?: number
   sort?: string
-  clusterName?: string
 }
 
+export type GetServicesRequest = BaseGetServicesRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type ServiceItem = {
   serviceName?: string
   namespace?: string

package/tracing/v1alpha1/tracing.pb.ts

@@ -51,11 +51,14 @@ type BaseTraceRequestById = {
 export type TraceRequestById = BaseTraceRequestById
   & OneOf<{ cluster: string; clusterName: string }>
 
-export type ListServiceNamesRequest = {
-  clusterName?: string
+
+type BaseListServiceNamesRequest = {
   namespace?: string
 }
 
+export type ListServiceNamesRequest = BaseListServiceNamesRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type GetServiceNamesResponse = {
   services?: string[]
 }