dashboard-shell-shell 3.0.5-test.8 → 3.0.5-test.80

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/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -17,14 +17,38 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 // i18n-uses monitoringReceiver.slack.*, monitoringReceiver.email.*, monitoringReceiver.pagerduty.*
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
-  // {
-  //   name:  'slack',
-  //   label: 'monitoringReceiver.slack.label',
-  //   title: 'monitoringReceiver.slack.title',
-  //   info:  'monitoringReceiver.slack.info',
-  //   key:   'slackConfigs',
-  //   logo:  require(`@shell/assets/images/vendor/slack.svg`)
-  // },
+  {
+    name:  'message',
+    label: 'monitoringReceiver.message.label',
+    title: 'monitoringReceiver.message.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'slackConfigs',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'dingding',
+    label: 'monitoringReceiver.dingding.label',
+    title: 'monitoringReceiver.dingding.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'dingding',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'work',
+    label: 'monitoringReceiver.weixin.label',
+    title: 'monitoringReceiver.weixin.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'work',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
+  {
+    name:  'snmp',
+    label: 'monitoringReceiver.snmp.label',
+    title: 'monitoringReceiver.snmp.title',
+    info:  'monitoringReceiver.slack.info',
+    key:   'snmp',
+    logo:  require(`@shell/assets/images/vendor/slack.svg`)
+  },
   {
     name:  'email',
     label: 'monitoringReceiver.email.label',

package/edit/monitoring.coreos.com.alertmanagerconfig/types/dingding.vue

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'webhook地址'"
+        :label="'webhook地址'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'签名密钥'"
+        :label="'签名密钥'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/message.vue

@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'请输入手机号'"
+        :label="'默认手机人电话'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'API密钥ID'"
+        :label="'默认API密钥ID'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'API密钥secret'"
+        :label="'默认API密钥secret'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="templateId"
+        :placeholder="'请输入模板ID'"
+        :label="'模板ID'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/snmp.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'目标主机'"
+        :label="'目标主机'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="id"
+        :placeholder="'端口'"
+        :label="'端口'"
+      />
+    </div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="scret"
+        :placeholder="'团体字'"
+        :label="'团体字'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/monitoring.coreos.com.alertmanagerconfig/types/work.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <div class="mb-20">
+      <LabeledInput
+        v-model:value="message"
+        :placeholder="'webhook地址'"
+        :label="'webhook地址'"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+// import { ref } from 'vue';
+// const id = ref('');
+// const scret = ref('');
+// const message = ref('');
+// const templateId = ref('');
+
+export default {
+  components: { LabeledInput },
+  data() {
+    return {
+      message:    '',
+      id:         '',
+      scret:      '',
+      templateId: ''
+    };
+  }
+};
+</script>

package/edit/networking.k8s.io.ingress/Certificate.vue

@@ -89,10 +89,10 @@ export default {
 
 <template>
   <div
-    class="cert row"
+    class="cert row mb-10"
     @update:value="update"
   >
-    <div class="col span-6">
+    <div>
       <LabeledSelect
         v-model:value="secretVal"
         class="secret-name"
@@ -107,7 +107,9 @@ export default {
         @update:value="onSecretInput"
       />
     </div>
-    <div class="col span-6">
+  </div>
+  <div class="row ingressBox">
+    <div style="padding-left: 160px;">
       <ArrayList
         :value="hosts"
         :add-label="t('ingress.certificates.addHost')"
@@ -127,6 +129,13 @@ export default {
   position: absolute;
 }
 
+.ingressBox 
+  :deep() .box {
+    border: 0px solid var(--tabbed-border);
+    >.remove {
+    top: 1px;
+  }
+}
 .cert {
   position: relative;
 
@@ -135,8 +144,8 @@ export default {
   }
 
   &:not(:last-of-type) {
-    padding-bottom: 10px;
-    margin-bottom: 30px;
+    // padding-bottom: 10px;
+    // margin-bottom: 30px;
   }
 }
 </style>

package/edit/networking.k8s.io.ingress/DefaultBackend.vue

@@ -96,7 +96,7 @@ export default {
       v-if="serviceName || !isView"
       class="row"
     >
-      <div class="col span-4">
+      <div class="col span-6">
         <LabeledSelect
           v-model:value="serviceName"
           :taggable="true"
@@ -111,7 +111,7 @@ export default {
         />
       </div>
       <div
-        class="col span-3"
+        class="col span-6"
         :style="{'margin-right': '0px'}"
       >
         <LabeledInput