dashboard-shell-shell 3.0.5-test.6 → 3.0.5-test.61

package/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue

@@ -18,35 +18,59 @@ import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
 // i18n-uses monitoringReceiver.opsgenie.*, monitoringReceiver.webhook.*, monitoringReceiver.custom.*
 export const RECEIVERS_TYPES = [
   {
-    name:  'slack',
-    label: 'monitoringReceiver.slack.label',
-    title: 'monitoringReceiver.slack.title',
+    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:  'email',
-    label: 'monitoringReceiver.email.label',
-    title: 'monitoringReceiver.email.title',
-    key:   'emailConfigs',
-    logo:  require(`@shell/assets/images/vendor/email.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:  'pagerduty',
-    label: 'monitoringReceiver.pagerduty.label',
-    title: 'monitoringReceiver.pagerduty.title',
-    info:  'monitoringReceiver.pagerduty.info',
-    key:   'pagerdutyConfigs',
-    logo:  require(`@shell/assets/images/vendor/pagerduty.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:  'opsgenie',
-    label: 'monitoringReceiver.opsgenie.label',
-    title: 'monitoringReceiver.opsgenie.title',
-    key:   'opsgenieConfigs',
+    name:  'email',
+    label: 'monitoringReceiver.email.label',
+    title: 'monitoringReceiver.email.title',
+    key:   'emailConfigs',
     logo:  require(`@shell/assets/images/vendor/email.svg`)
   },
+  // {
+  //   name:  'pagerduty',
+  //   label: 'monitoringReceiver.pagerduty.label',
+  //   title: 'monitoringReceiver.pagerduty.title',
+  //   info:  'monitoringReceiver.pagerduty.info',
+  //   key:   'pagerdutyConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/pagerduty.svg`)
+  // },
+  // {
+  //   name:  'opsgenie',
+  //   label: 'monitoringReceiver.opsgenie.label',
+  //   title: 'monitoringReceiver.opsgenie.title',
+  //   key:   'opsgenieConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/email.svg`)
+  // },
   {
     name:  'webhook',
     label: 'monitoringReceiver.webhook.label',
@@ -54,14 +78,14 @@ export const RECEIVERS_TYPES = [
     key:   'webhookConfigs',
     logo:  require(`@shell/assets/images/vendor/webhook.svg`),
   },
-  {
-    name:  'custom',
-    label: 'monitoringReceiver.custom.label',
-    title: 'monitoringReceiver.custom.title',
-    info:  'monitoringReceiver.custom.info',
-    key:   'webhookConfigs',
-    logo:  require(`@shell/assets/images/vendor/custom.svg`)
-  },
+  // {
+  //   name:  'custom',
+  //   label: 'monitoringReceiver.custom.label',
+  //   title: 'monitoringReceiver.custom.title',
+  //   info:  'monitoringReceiver.custom.info',
+  //   key:   'webhookConfigs',
+  //   logo:  require(`@shell/assets/images/vendor/custom.svg`)
+  // },
 ];
 
 export default {

package/edit/monitoring.coreos.com.alertmanagerconfig/routeConfig.vue

@@ -46,30 +46,34 @@ export default {
 </script>
 <template>
   <div>
-    <h3>
-      Receiver
+    <div class="route-title-config  mb-20">
+      接收器
       <i
         v-clean-tooltip="t('monitoring.alertmanagerConfig.receiverTooltip')"
         class="icon icon-info"
       />
-    </h3>
+    </div>
     <Banner
       color="info"
       :label="t('monitoring.alertmanagerConfig.routeInfo')"
     />
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <LabeledSelect
           v-model:value="value.receiver"
           :mode="mode"
+          :isLabel="true"
+          :leftWidth="'225px'"
           :options="receiverOptions"
         />
       </div>
     </div>
-    <h3>Grouping</h3>
-    <div class="row mb-20">
+    <div class="route-title-config  config-top  mb-20">
+      分组
+    </div>
+    <div class="row">
       <div class="col span-6">
-        <span class="label">
+        <span class="label mb-10">
           {{ t("monitoringRoute.groups.addGroupByLabel'") }}
           <i
             v-clean-tooltip="t('monitoringRoute.groups.groupByTooltip')"
@@ -84,8 +88,10 @@ export default {
         />
       </div>
     </div>
-    <h3>Waiting and Intervals</h3>
-    <div class="row mb-20">
+    <div class="route-title-config config-top  mb-20">
+      等待和间隔
+    </div>
+    <div class="row">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.groupWait"
@@ -101,7 +107,7 @@ export default {
         />
       </div>
     </div>
-    <div class="row mb-20">
+    <div class="row">
       <div class="col span-6">
         <LabeledInput
           v-model:value="value.repeatInterval"
@@ -111,7 +117,9 @@ export default {
       </div>
     </div>
 
-    <h3>Matchers</h3>
+    <div class="route-title-config config-top mb-20  mb-20">
+      匹配器
+    </div>
     <ArrayListGrouped
       v-model:value="value.matchers"
       class="mt-20"
@@ -120,7 +128,7 @@ export default {
       :default-add-value="{ matchers: [] }"
     >
       <template #default="props">
-        <div class="row mt-20 mb-20">
+        <div class="row ">
           <div class="col span-4">
             <LabeledInput
               v-model:value="props.row.value.name"
@@ -150,3 +158,19 @@ export default {
     </ArrayListGrouped>
   </div>
 </template>
+
+<style scoped>
+.route-title-config{
+  font-size: 14px;
+}
+
+.row{
+  flex-wrap: wrap;
+}
+.col{
+  width: 49.125%;
+}
+.config-top{
+  margin-top: 32px;
+}
+</style>

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/email.vue

@@ -80,7 +80,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -88,7 +88,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="Default Recipient Address"
+          label="默认收件人地址"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.sendResolved"
           :mode="mode"
           class="mt-20"
-          label="Enable send resolved alerts"
+          label="启用发送已解决的警报"
         />
       </div>
     </div>
@@ -109,7 +109,7 @@ export default {
         <LabeledInput
           v-model:value="value.from"
           :mode="mode"
-          label="Sender"
+          label="发件人"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -119,7 +119,7 @@ export default {
         <LabeledInput
           v-model:value="value.smarthost"
           :mode="mode"
-          label="Host"
+          label="主机"
           placeholder="e.g. 192.168.1.121:587"
         />
       </div>
@@ -128,7 +128,7 @@ export default {
           v-model:value="value.requireTLS"
           :mode="mode"
           class="mt-20"
-          label="Use TLS"
+          label="启用TLS"
         />
       </div>
     </div>

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/opsgenie.vue

@@ -165,7 +165,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -192,7 +192,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -201,12 +201,12 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
     <div class="row">
       <div class="col span-12">
-        <h3>Responders</h3>
+        <h3>响应者</h3>
         <ArrayList
           v-model:value="responders"
           :mode="mode"
@@ -219,18 +219,18 @@ export default {
                 class="row"
                 :class="{'mb-15': isView, 'mb-10': !isView}"
               >
-                <div class="col span-6">
-                  <span class="text-label">Type</span>
+              <div class="col" style="width:400px">
+                  <span class="text-label">类型</span>
                 </div>
-                <div class="col span-6 send-to">
-                  <span class="text-label">Send To</span>
+                <div class="col send-to ml-10" style="flex: 1;">
+                  <span class="text-label">发送至</span>
                 </div>
               </div>
             </div>
           </template>
           <template v-slot:columns="scope">
             <div class="row responder">
-              <div class="col span-6">
+              <div style="width:400px">
                 <span v-if="isView">{{ typeLabel(scope.row.value.type) }}</span>
                 <Select
                   v-else
@@ -239,7 +239,7 @@ export default {
                   :options="TYPES"
                 />
               </div>
-              <div class="col-span-6 target-container">
+              <div class="target-container ml-10" style="flex: 1;">
                 <span v-if="isView">{{ targetLabel(scope.row.value.target) }}: {{ scope.row.value.value }}</span>
                 <InputWithSelect
                   v-else

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

@@ -130,7 +130,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div
@@ -142,7 +142,7 @@ export default {
           v-model:value="integrationType"
           :options="integrationTypeOptions"
           :mode="mode"
-          label="Integration Type"
+          label="整合型"
         />
       </div>
     </div>
@@ -186,7 +186,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
           data-testid="v2-monitoring-receiver-pagerduty-proxy-url"
         />
@@ -196,7 +196,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

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

@@ -82,7 +82,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -116,7 +116,7 @@ export default {
         <LabeledInput
           v-model:value="value.channel"
           :mode="mode"
-          label="Default Channel"
+          label="默认频道"
           placeholder="e.g. #example"
         />
       </div>
@@ -124,7 +124,7 @@ export default {
         <LabeledInput
           v-model:value="value.httpConfig.proxyURL"
           :mode="mode"
-          label="Proxy URL"
+          label="代理地址"
           placeholder="e.g. http://my-proxy/"
         />
       </div>
@@ -133,7 +133,7 @@ export default {
       <Checkbox
         v-model:value="value.sendResolved"
         :mode="mode"
-        label="Enable send resolved alerts"
+        label="启用发送已解决的警报"
       />
     </div>
   </div>

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/webhook.vue

@@ -160,7 +160,7 @@ export default {
     <div class="row">
       <div class="col span-12">
         <h3 class="mb-0">
-          Target
+          目标
         </h3>
       </div>
     </div>

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/monitoring.coreos.com.receiver/types/email.vue

@@ -39,7 +39,7 @@ export default {
   <div>
     <div class="row">
       <div class="col span-12">
-        <h3>Target</h3>
+        <h3>目标</h3>
       </div>
     </div>
     <div class="row mb-20">
@@ -47,7 +47,7 @@ export default {
         <LabeledInput
           v-model:value="value.to"
           :mode="mode"
-          label="Default Recipient Address"
+          label="默认收件人地址"
           placeholder="e.g. admin@example.com"
         />
       </div>
@@ -56,7 +56,7 @@ export default {
           v-model:value="value.send_resolved"
           :mode="mode"
           class="mt-20"
-          label="Enable send resolved alerts"
+          label="启用发送已解决的警报"
         />
       </div>
     </div>
@@ -97,7 +97,7 @@ export default {
           v-model:value="value.require_tls"
           :mode="mode"
           class="mt-20"
-          label="Use TLS"
+          label="启用TLS"
         />
       </div>
     </div>
@@ -106,7 +106,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_username"
           :mode="mode"
-          label="Username"
+          label="用户名"
           placeholder="e.g. John"
         />
       </div>
@@ -114,7 +114,7 @@ export default {
         <LabeledInput
           v-model:value="value.auth_password"
           :mode="mode"
-          label="Password"
+          label="密码"
           type="password"
           autocomplete="current-password"
         />