dashboard-shell-shell 3.0.5-test.52 → 3.0.5-test.55

package/edit/logging.banzaicloud.io.output/providers/s3.vue

@@ -47,39 +47,39 @@ export default {
         <h3>{{ t('logging.output.sections.target') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.s3_endpoint"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.endpoint')"
+        <LabeledInput
+          v-model:value="value.s3_endpoint"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.endpoint')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.s3_bucket"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.bucket')"
+        <LabeledInput
+          v-model:value="value.s3_bucket"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.bucket')"
         />
       </div>
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.path"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.path')"
+        <LabeledInput
+          v-model:value="value.path"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.path')"
         />
       </div>
       <div class="col span-6 overwrite">
-        <Checkbox
-          v-model:value="overwrite"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.s3.overwriteExistingPath')"
+        <Checkbox
+          v-model:value="overwrite"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.s3.overwriteExistingPath')"
         />
       </div>
     </div>
@@ -90,7 +90,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.aws_key_id"
           :mode="mode"
@@ -100,7 +100,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.aws_sec_key"
           :mode="mode"

package/edit/logging.banzaicloud.io.output/providers/splunkHec.vue

@@ -51,8 +51,8 @@ export default {
   <div class="splunk">
     <div>
       <h3>{{ t('logging.output.sections.target') }}</h3>
-      <div class="row mb-10">
-        <div class="col span-2">
+      <div class="row">
+        <div class="col span-6">
           <LabeledSelect
             v-model:value="value.protocol"
             :mode="mode"
@@ -61,7 +61,7 @@ export default {
             :label="t('logging.splunk.protocol')"
           />
         </div>
-        <div class="col span-8">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="value.hec_host"
             :mode="mode"
@@ -69,7 +69,7 @@ export default {
             :label="t('logging.splunk.host')"
           />
         </div>
-        <div class="col span-2">
+        <div class="col span-6">
           <LabeledInput
             v-model:value="port"
             :mode="mode"
@@ -103,8 +103,8 @@ export default {
     <div class="spacer" />
     <div>
       <h3>{{ t('logging.output.sections.access') }}</h3>
-      <div class="row">
-        <div class="col span-6">
+      <div>
+        <div>
           <SecretSelector
             v-model:value="value.hec_token"
             :mode="mode"
@@ -118,7 +118,7 @@ export default {
     </div>
     <div class="spacer" />
     <h3>{{ t('logging.output.sections.certificate') }}</h3>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <Checkbox
           v-model:value="value.insecure_ssl"
@@ -128,8 +128,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.ca_file"
           mount-key="mountFrom"
@@ -140,7 +140,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.ca_path"
           mount-key="mountFrom"
@@ -152,8 +152,8 @@ export default {
         />
       </div>
     </div>
-    <div class="row">
-      <div class="col span-6">
+    <div>
+      <div>
         <SecretSelector
           v-model:value="value.client_cert"
           mount-key="mountFrom"
@@ -164,7 +164,7 @@ export default {
           :show-key-selector="true"
         />
       </div>
-      <div class="col span-6">
+      <div>
         <SecretSelector
           v-model:value="value.client_key"
           mount-key="mountFrom"

package/edit/logging.banzaicloud.io.output/providers/sumologic.vue

@@ -35,7 +35,7 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-6">
+      <div class="col span-12">
         <LabeledInput
           v-model:value="value.source_name"
           class="source-name"
@@ -44,7 +44,7 @@ export default {
           :label="t('logging.sumologic.sourceName')"
         />
       </div>
-      <div class="col span-6">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.endpoint"
           :mode="mode"

package/edit/logging.banzaicloud.io.output/providers/syslog.vue

@@ -67,15 +67,15 @@ export default {
       </div>
     </div>
     <div class="row">
-      <div class="col span-8">
-        <LabeledInput
-          v-model:value="value.host"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.host')"
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.host')"
         />
       </div>
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledInput
           v-model:value="port"
           :mode="mode"
@@ -92,7 +92,7 @@ export default {
         <h3>{{ t('logging.output.sections.certificate') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.transport"
@@ -103,16 +103,16 @@ export default {
         />
       </div>
       <div class="col span-6 insecure">
-        <Checkbox
-          v-model:value="value.insecure"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.insecure')"
+        <Checkbox
+          v-model:value="value.insecure"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.insecure')"
         />
       </div>
     </div>
-    <div class="row mb-10">
-      <div class="col span-6">
+    <div class="row">
+      <div class="col span-12">
         <SecretSelector
           v-model:value="value.trusted_ca_path"
           mount-key="mountFrom"
@@ -130,7 +130,7 @@ export default {
         <h3>{{ t('logging.syslog.format.title') }}</h3>
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.format.type"
@@ -149,21 +149,21 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.tags"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.tags')"
+        <LabeledInput
+          v-model:value="value.buffer.tags"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.tags')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.chunk_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.chunkLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.chunk_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.chunkLimitSize')"
         />
       </div>
       <div class="col span-6">
@@ -178,49 +178,49 @@ export default {
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.total_limit_size"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.totalLimitSize')"
+        <LabeledInput
+          v-model:value="value.buffer.total_limit_size"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.totalLimitSize')"
         />
       </div>
     </div>
     <div class="row mb-20">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.flush_interval"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.flushInterval')"
+        <LabeledInput
+          v-model:value="value.buffer.flush_interval"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.flushInterval')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekey')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekey')"
         />
       </div>
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.buffer.timekey_wait"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyWait')"
+        <LabeledInput
+          v-model:value="value.buffer.timekey_wait"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyWait')"
         />
       </div>
     </div>
-    <div class="row mb-10">
+    <div class="row">
       <div class="col span-6">
-        <Checkbox
-          v-model:value="value.buffer.timekey_use_utc"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.syslog.buffer.timekeyUseUTC')"
+        <Checkbox
+          v-model:value="value.buffer.timekey_use_utc"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.syslog.buffer.timekeyUseUTC')"
         />
       </div>
     </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashboard-shell-shell",
-  "version": "3.0.5-test.52",
+  "version": "3.0.5-test.55",
   "description": "Rancher Dashboard Shell",
   "repository": "https://github.com/rancherlabs/dashboard",
   "license": "Apache-2.0",

package/scripts/publish-shell.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # 执行命令示例：
-# TAG=shell-pkg-v3.0.5-test.52 ./shell/scripts/publish-shell.sh
+# TAG=shell-pkg-v3.0.5-test.55 ./shell/scripts/publish-shell.sh
 
 set -euo pipefail
 

package/utils/errorTranslate.json

@@ -1259,6 +1259,22 @@
       "pattern": "schedulevmbackup.cloudhci.io",
       "replacement": "虚拟机备份策略"
     },
+    {
+      "pattern": "clusterflow.logging.banzaicloud.io",
+      "replacement": "集群流"
+    },
+    {
+      "pattern": "clusteroutput.logging.banzaicloud.io",
+      "replacement": "集群输出"
+    },
+    {
+      "pattern": "flow.logging.banzaicloud.io",
+      "replacement": "流"
+    },
+    {
+      "pattern": "output.logging.banzaicloud.io",
+      "replacement": "输出"
+    },
     {
       "pattern": "spec.retain",
       "replacement": "保存数量"
@@ -1672,6 +1688,10 @@
       "pattern": " or ",
       "replacement": "或"
     },
+    {
+      "pattern": "is",
+      "replacement": "是"
+    },
     {
       "pattern": "parameters",
       "replacement": "参数"