Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions manager/src/main/resources/define/app-cisco_switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions manager/src/main/resources/define/app-h3c_switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions manager/src/main/resources/define/app-hpe_switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions manager/src/main/resources/define/app-huawei_switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions manager/src/main/resources/define/app-tplink_switch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/assembly/server/assembly-docker-compose.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading
Loading