feat(console): logstash v2

tkestack · Jun 22, 2020 · a5f0ad1 · a5f0ad1
1 parent 6271181
commit a5f0ad1
Show file tree

Hide file tree

Showing 54 changed files with 1,729 additions and 630 deletions.
diff --git a/web/console/Wrapper.tsx b/web/console/Wrapper.tsx
@@ -158,8 +158,13 @@ const commonRouterConfig: RouterConfig[] = [
  },
  {
  url: '/tkestack/log',
- title: '日志',
- watchModule: ConsoleModuleEnum.PLATFORM
+ title: '日志采集',
+ watchModule: ConsoleModuleEnum.PLATFORM,
+ },
+ {
+ url: '/tkestack/log/setting',
+ title: '日志组件',
+ watchModule: ConsoleModuleEnum.PLATFORM,
  },
  {
  url: '/tkestack/persistent-event',
@@ -221,9 +226,20 @@ const businessCommonRouterConfig: RouterConfig[] = [
  url: '/tkestack-project/notify',
  title: '通知设置',
  watchModule: ConsoleModuleEnum.Notify
+ },
+ ],
+ },
+ {
+ title: '运维中心',
+ watchModule: [ConsoleModuleEnum.PLATFORM],
+ subRouterConfig: [
+ {
+ url: '/tkestack-project/log',
+ title: '日志采集',
+ watchModule: ConsoleModuleEnum.PLATFORM
  }
  ]
- }
+ },
 ];
 
 interface ConsoleWrapperProps {

diff --git a/web/console/config/apiServerVersion.ts b/web/console/config/apiServerVersion.ts
@@ -64,3 +64,12 @@ export const auditServerVersion = {
  group: 'audit.tkestack.io',
  version: 'v1'
 };
+
+/**
+ * 新日志模块
+ */
+export const logAgentServiceVersion = {
+ basicUrl: 'apis',
+ group: 'logagent.tkestack.io',
+ version: 'v1'
+};
diff --git a/web/console/config/resource/common/apiVersion.ts b/web/console/config/resource/common/apiVersion.ts
@@ -6,6 +6,7 @@ import {
  authServerVersion,
  monitorServerVersion,
  auditServerVersion,
+ logAgentServiceVersion,
 } from '../../apiServerVersion';
 import { t, Trans } from '@tencent/tea-app/lib/i18n';
 import { ConsoleModuleEnum } from '../../../Wrapper';
@@ -48,6 +49,7 @@ export interface ApiVersion {
  machines?: ResourceApiInfo;
  helm?: ResourceApiInfo;
  logcs?: ResourceApiInfo;
+ logagent?: ResourceApiInfo;
  clustercredential?: ResourceApiInfo;
  auth_project?: ResourceApiInfo;
 
@@ -446,14 +448,18 @@ const k8sApiVersionFor18: ApiVersion = {
  watchModule: ConsoleModuleEnum.PLATFORM,
  headTitle: 'Helm'
  },
-
  logcs: {
  group: 'tke.cloud.tencent.com',
  version: 'v1',
  basicEntry: 'apis',
  headTitle: 'LogCollector'
  },
-
+ logagent: {
+ group: logAgentServiceVersion.group,
+ version: logAgentServiceVersion.version,
+ basicEntry: logAgentServiceVersion.basicUrl,
+ headTitle: 'LogAgent'
+ },
  clustercredential: {
  group: apiServerVersion.group,
  version: apiServerVersion.version,

diff --git a/web/console/config/resource/k8sConfig/otherResource.ts b/web/console/config/resource/k8sConfig/otherResource.ts
@@ -302,6 +302,17 @@ export const logcs = (k8sVersion: string) => {
  });
 };
 
+/** logagent 的相关配置 */
+export const logagent = (k8sVersion: string) => {
+ return generateResourceInfo({
+ k8sVersion,
+ resourceName: 'logagent',
+ requestType: {
+ list: 'logagents'
+ }
+ });
+};
+
 export const prometheus = (k8sVersion: string) => {
  return generateResourceInfo({
  k8sVersion,

diff --git a/web/console/config/resourceConfig.ts b/web/console/config/resourceConfig.ts
@@ -34,6 +34,7 @@ import {
  policy,
  category,
  logcs,
+ logagent,
  addon,
  addon_gpumanager,
  addon_helm,
@@ -140,6 +141,7 @@ export const resourceConfig = (k8sVersion: string = '1.16'): ResourceConfigKey =
  machines: getResourceConfig(machines, finalK8sVersion),
  helm: getResourceConfig(helm, finalK8sVersion),
  logcs: getResourceConfig(logcs, finalK8sVersion),
+ logagent: getResourceConfig(logagent, finalK8sVersion),
  logout: getResourceConfig(logoutConfig, finalK8sVersion),
  clustercredential: getResourceConfig(clustercredential, finalK8sVersion),
 

diff --git a/web/console/config/routerConfig.project.ts b/web/console/config/routerConfig.project.ts
@@ -92,7 +92,7 @@ export const subRouterConfig = () => {
  {
  name: t('日志'),
  path: 'k8sLog',
- basicUrl: 'log'
+ basicUrl: 'log',
  },
  {
  name: t('事件'),

diff --git a/web/console/helpers/urlUtil.ts b/web/console/helpers/urlUtil.ts
@@ -109,6 +109,9 @@ interface K8sRestfulPathOptions {
  /** 集群id，适用于addon 请求平台转发的场景 */
  clusterId?: string;
 
+ /** 集群logAgentName */
+ logAgentName?: string;
+
  meshId?: string;
 }
 
@@ -128,6 +131,7 @@ export const reduceK8sRestfulPath = (options: K8sRestfulPathOptions) => {
  specificName = '',
  extraResource = '',
  clusterId = '',
+ logAgentName = '',
  meshId
  } = options;
 
@@ -153,8 +157,10 @@ export const reduceK8sRestfulPath = (options: K8sRestfulPathOptions) => {
  * 非addon（以deployment为例): /apis/apps/v1beta2/namespaces/${namespace}/deployments/${deployment}/${extraResource}
  */
  if (isAddon) {
- let clusterInfo: ResourceInfo = resourceConfig()['cluster'];
- url = `/${clusterInfo.basicEntry}/${clusterInfo.group}/${clusterInfo.version}/${clusterInfo.requestType['list']}/${clusterId}/${resourceInfo.requestType['list']}`;
+ // 兼容新旧日志组件
+ let baseInfo: ResourceInfo = resourceConfig()[logAgentName ? 'logagent' : 'cluster'];
+ let baseValue = logAgentName || clusterId;
+ url = `/${baseInfo.basicEntry}/${baseInfo.group}/${baseInfo.version}/${baseInfo.requestType['list']}/${baseValue}/${resourceInfo.requestType['list']}`;
 
  if (extraResource || resourceInfo['namespaces'] || specificName) {
  let queryArr: string[] = [];

diff --git a/web/console/package-lock.json b/web/console/package-lock.json
diff --git a/web/console/src/modules/addon/components/EditAddonPanel.tsx b/web/console/src/modules/addon/components/EditAddonPanel.tsx
@@ -280,7 +280,7 @@ export class EditAddonPanel extends React.Component<RootProps, EdtiAddonPanelSta
  bordered
  columns={columns}
  records={finalAddonList}
- rowDisabled={record => isAlreadyOpened(record)}
+ rowDisabled={record => isAlreadyOpened(record) || record.type === 'LogCollector'}
  addons={[
  stylize({
  headStyle: { display: 'none' },