diff --git a/content/en/docs/pluggable-components/auditing-logs.md b/content/en/docs/pluggable-components/auditing-logs.md index 775dc3f34..c40378e51 100644 --- a/content/en/docs/pluggable-components/auditing-logs.md +++ b/content/en/docs/pluggable-components/auditing-logs.md @@ -41,14 +41,14 @@ By default, KubeKey will install Elasticsearch internally if Auditing is enabled ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 3. Create a cluster using the configuration file: @@ -80,14 +80,14 @@ By default, ks-installer will install Elasticsearch internally if Auditing is en ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 3. Execute the following commands to start installation: @@ -127,14 +127,14 @@ By default, Elasticsearch will be installed internally if Auditing is enabled. F ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 5. You can use the web kubectl to check the installation process by executing the following command: @@ -153,11 +153,9 @@ You can find the web kubectl tool by clicking the hammer icon in the bottom-righ {{< tab "Verify the component on the dashboard" >}} -If you enable both Logging and Auditing, you can check the status of Auditing in **Logging** in **Components**. You may see an image as follows: +Verify that you can use the **Auditing Operating** function from the **Toolbox** in the bottom right corner. -![auditing](/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing.png) - -If you only enable Auditing without Logging installed, you cannot see the image above as the button **Logging** will not display. +![auditing-operating](/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png) {{}} diff --git a/content/zh/docs/pluggable-components/auditing-logs.md b/content/zh/docs/pluggable-components/auditing-logs.md index e699ecc5a..763184c1a 100644 --- a/content/zh/docs/pluggable-components/auditing-logs.md +++ b/content/zh/docs/pluggable-components/auditing-logs.md @@ -41,14 +41,14 @@ KubeSphere 审计日志系统提供了一套与安全相关并按时间顺序排 ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 3. 使用该配置文件创建集群： @@ -80,14 +80,14 @@ KubeSphere 审计日志系统提供了一套与安全相关并按时间顺序排 ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 3. 执行以下命令开始安装： @@ -127,14 +127,14 @@ KubeSphere 审计日志系统提供了一套与安全相关并按时间顺序排 ```yaml es: # Storage backend for logging, tracing, events and auditing. - elasticsearchMasterReplicas: 1 # total number of master nodes, it's not allowed to use even number - elasticsearchDataReplicas: 1 # total number of data nodes - elasticsearchMasterVolumeSize: 4Gi # Volume size of Elasticsearch master nodes - elasticsearchDataVolumeSize: 20Gi # Volume size of Elasticsearch data nodes - logMaxAge: 7 # Log retention time in built-in Elasticsearch, it is 7 days by default. - elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log - externalElasticsearchUrl: # The URL of external Elasticsearch - externalElasticsearchPort: # The port of external Elasticsearch + elasticsearchMasterReplicas: 1 # The total number of master nodes. Even numbers are not allowed. + elasticsearchDataReplicas: 1 # The total number of data nodes. + elasticsearchMasterVolumeSize: 4Gi # The volume size of Elasticsearch master nodes. + elasticsearchDataVolumeSize: 20Gi # The volume size of Elasticsearch data nodes. + logMaxAge: 7 # Log retention day in built-in Elasticsearch. It is 7 days by default. + elkPrefix: logstash # The string making up index names. The index name will be formatted as ks--log. + externalElasticsearchUrl: # The URL of external Elasticsearch. + externalElasticsearchPort: # The port of external Elasticsearch. ``` 5. 可以执行以下命令，使用 Web Kubectl 工具来检查安装过程： @@ -153,11 +153,9 @@ KubeSphere 审计日志系统提供了一套与安全相关并按时间顺序排 {{< tab "在仪表板中验证组件的安装" >}} -如果同时启用了日志系统和审计功能，您可以在**服务组件**的 **Logging** 中查看审计状态。您可以看到如下图所示界面： +验证您可以使用右下角**工具箱**中的**操作审计**功能。 -![审计](/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing.PNG) - -如果只启用审计功能而不安装日志系统，则无法看到上图所示界面，因为不会显示 **Logging** 按钮。 +![auditing-operating](/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png) {{}} diff --git a/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png b/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png new file mode 100644 index 000000000..5c3033db5 Binary files /dev/null and b/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png differ diff --git a/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing.png b/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing.png deleted file mode 100644 index ac82b154b..000000000 Binary files a/static/images/docs/enable-pluggable-components/kubesphere-auditing-logs/auditing.png and /dev/null differ diff --git a/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png b/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png new file mode 100644 index 000000000..362a5843a Binary files /dev/null and b/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing-operating.png differ diff --git a/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing.PNG b/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing.PNG deleted file mode 100644 index 3d595dc83..000000000 Binary files a/static/images/docs/zh-cn/enable-pluggable-components/kubesphere-auditing-logs/auditing.PNG and /dev/null differ