[improve] update docker-compose license and fix compose config yml (#…

…2778) Signed-off-by: tomsun28 <[email protected]>
apache · Oct 22, 2024 · 1f22a61 · 1f22a61
1 parent fac3f5b
commit 1f22a61
Show file tree

Hide file tree

Showing 15 changed files with 326 additions and 62 deletions.
diff --git a/manager/src/main/resources/define/app-cisco_switch.yml b/manager/src/main/resources/define/app-cisco_switch.yml
@@ -338,13 +338,11 @@ metrics:
           en-US: In Octets
       - field: in_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
       - field: in_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入错包数
           en-US: In Errors
@@ -356,13 +354,11 @@ metrics:
           en-US: Out Octets
       - field: out_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
       - field: out_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
@@ -397,11 +393,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 8 / 1024 / 1024
-      - in_octets=ifInOctets / 1024 / 1024
+      - speed=ifSpeed / 1000 / 1000
+      - in_octets=ifInOctets / 1000 / 1000
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets / 1024 / 1024
+      - out_octets=ifOutOctets / 1000 / 1000
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/manager/src/main/resources/define/app-h3c_switch.yml b/manager/src/main/resources/define/app-h3c_switch.yml
@@ -338,13 +338,11 @@ metrics:
           en-US: In Octets
       - field: in_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
       - field: in_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入错包数
           en-US: In Errors
@@ -356,13 +354,11 @@ metrics:
           en-US: Out Octets
       - field: out_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
       - field: out_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
@@ -396,11 +392,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 8 / 1024 / 1024
-      - in_octets=ifInOctets / 1024 / 1024
+      - speed=ifSpeed / 1000 / 1000
+      - in_octets=ifInOctets / 1000 / 1000
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets / 1024 / 1024
+      - out_octets=ifOutOctets / 1000 / 1000
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/manager/src/main/resources/define/app-hpe_switch.yml b/manager/src/main/resources/define/app-hpe_switch.yml
@@ -338,13 +338,11 @@ metrics:
           en-US: In Octets
       - field: in_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
       - field: in_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入错包数
           en-US: In Errors
@@ -356,13 +354,11 @@ metrics:
           en-US: Out Octets
       - field: out_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
       - field: out_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
@@ -397,11 +393,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 8 / 1024 / 1024
-      - in_octets=ifInOctets / 1024 / 1024
+      - speed=ifSpeed / 1000 / 1000
+      - in_octets=ifInOctets / 1000 / 1000
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets / 1024 / 1024
+      - out_octets=ifOutOctets / 1000 / 1000
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/manager/src/main/resources/define/app-huawei_switch.yml b/manager/src/main/resources/define/app-huawei_switch.yml
@@ -337,13 +337,11 @@ metrics:
           en-US: In Octets
       - field: in_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
       - field: in_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入错包数
           en-US: In Errors
@@ -355,13 +353,11 @@ metrics:
           en-US: Out Octets
       - field: out_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
       - field: out_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
@@ -395,11 +391,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 8 / 1024 / 1024
-      - in_octets=ifInOctets / 1024 / 1024
+      - speed=ifSpeed / 1000 / 1000
+      - in_octets=ifInOctets / 1000 / 1000
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets / 1024 / 1024
+      - out_octets=ifOutOctets / 1000 / 1000
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/manager/src/main/resources/define/app-tplink_switch.yml b/manager/src/main/resources/define/app-tplink_switch.yml
@@ -337,13 +337,11 @@ metrics:
           en-US: In Octets
       - field: in_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
       - field: in_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 入错包数
           en-US: In Errors
@@ -355,13 +353,11 @@ metrics:
           en-US: Out Octets
       - field: out_discards
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
       - field: out_errors
         type: 0
-        unit: 'package'
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
@@ -395,11 +391,11 @@ metrics:
       - index=ifIndex
       - descr=ifDescr
       - mtu=ifMtu
-      - speed=ifSpeed / 8 / 1024 / 1024
-      - in_octets=ifInOctets / 1024 / 1024
+      - speed=ifSpeed / 1000 / 1000
+      - in_octets=ifInOctets / 1000 / 1000
       - in_discards=ifInDiscards
       - in_errors=ifInErrors
-      - out_octets=ifOutOctets / 1024 / 1024
+      - out_octets=ifOutOctets / 1000 / 1000
       - out_discards=ifOutDiscards
       - out_errors=ifOutErrors
       - admin_status=ifAdminStatus

diff --git a/script/assembly/server/assembly-docker-compose.xml b/script/assembly/server/assembly-docker-compose.xml
@@ -77,6 +77,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
             <filtered>true</filtered>
             <includes>
                 <include>README.md</include>
+                <include>LICENSE</include>
             </includes>
             <outputDirectory>/</outputDirectory>
         </fileSet>
@@ -89,7 +90,6 @@ http://maven.apache.org/ASSEMBLY/2.0.0 ">
                 <include>DISCLAIMER</include>
                 <include>LICENSE</include>
                 <include>NOTICE</include>
-                <include>README.md</include>
             </includes>
         </fileSet>
     </fileSets>