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.

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

fix snmp integration test, #3894 #3912

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions docker/integration-tests/integration-tests-snmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@ services:
condition: service_healthy
links:
- snmp
volumes:
- content:/tmp/snmptraps
snmp:
image: 'zabbix/zabbix-snmptraps:latest'
ports:
- "1162/udp"
volumes:
- type: bind
source: ./../../integration-tests/snmp/files
target: /var/lib/zabbix/snmptraps
- content:/var/lib/zabbix/snmptraps
healthcheck:
test: [ "CMD-SHELL", "true" ]
start_period: 2s
retries: 5
interval: 3s
timeout: 15s
timeout: 15s

volumes:
content:
4 changes: 2 additions & 2 deletions integration-tests/snmp/001-check-log.hpl
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ limitations under the License.
<length>Characters</length>
<add_to_result_filenames>Y</add_to_result_filenames>
<file>
<name>${PROJECT_HOME}/files/snmptraps.log</name>
<name>/tmp/snmptraps/snmptraps.log</name>
<filemask/>
<exclude_filemask/>
<file_required>Y</file_required>
Expand Down Expand Up @@ -149,6 +149,7 @@ limitations under the License.
<error_count_field/>
<error_fields_field/>
<error_text_field/>
<schema_definition/>
<bad_line_files_destination_directory/>
<bad_line_files_extension>warning</bad_line_files_extension>
<error_line_files_destination_directory/>
Expand Down Expand Up @@ -193,7 +194,6 @@ limitations under the License.
<value>
<isnull>N</isnull>
<length>-1</length>
<mask/>
<name>constant</name>
<precision>-1</precision>
<text>SNMPv2-TM::snmpUDPDomain.0 = "Trap received"</text>
Expand Down
1 change: 0 additions & 1 deletion integration-tests/snmp/main-001-snmp-trap-test.hwf
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ limitations under the License.
<type>SNMP_TRAP</type>
<attributes/>
<comstring>public</comstring>
<engineid/>
<message>Trap received</message>
<nrretry>5000</nrretry>
<oid>1.3.6.1.6.1.1.0</oid>
Expand Down
Loading