Skip to content

Commit 91460ce

Browse files
FlorianVeauxFlorianVeaux
authored
snmp: Fix tests with agent_host tag (DataDog#21405)
* snmp: Fix tests with agent_host tag * style
1 parent ffcd561 commit 91460ce

149 files changed

Lines changed: 207 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎snmp/tests/common.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,3 +350,7 @@ def dd_agent_check_wrapper(dd_agent_check, *args, **kwargs):
350350

351351
aggregator._metrics = new_agg_metrics
352352
return aggregator
353+
354+
355+
def get_agent_hostname():
356+
return socket.gethostname().lower()

‎snmp/tests/conftest.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import requests
1212
import yaml
1313

14+
from datadog_checks.base.agent import datadog_agent
1415
from datadog_checks.dev import TempDir, WaitFor, docker_run, run_command
1516
from datadog_checks.dev.docker import get_container_ip
1617

@@ -104,6 +105,7 @@ def create_datadog_conf_file(tmp_dir):
104105
# Setting check_runners to a negative number to disable check runners is a workaround,
105106
# Datadog Agent might not guarantee this behaviour in the future.
106107
'check_runners': -1,
108+
'hostname': datadog_agent.get_hostname(),
107109
'network_devices': {
108110
'autodiscovery': {
109111
'workers': 4,

‎snmp/tests/test_e2e_core.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ def test_e2e_user_profiles(dd_agent_check):
9292
"snmp_device:{}".format(device_ip),
9393
"device_ip:{}".format(device_ip),
9494
"device_id:default:{}".format(device_ip),
95+
'agent_host:' + common.get_agent_hostname(),
9596
]
9697

9798
aggregator.assert_metric('snmp.upsAdvBatteryNumOfBattPacks', metric_type=aggregator.GAUGE, tags=tags, count=2)
@@ -122,6 +123,7 @@ def test_e2e_user_profiles(dd_agent_check):
122123
'device_namespace:default',
123124
"device_id:default:" + device_ip,
124125
"device_ip:" + device_ip,
126+
'agent_host:' + common.get_agent_hostname(),
125127
'firmware_version:2.0.3-test',
126128
'model:APC Smart-UPS 600',
127129
'serial_num:test_serial',
@@ -157,6 +159,7 @@ def test_e2e_user_profiles_that_extend_profile_with_same_name(dd_agent_check):
157159
"snmp_device:{}".format(device_ip),
158160
"device_ip:{}".format(device_ip),
159161
"device_id:default:{}".format(device_ip),
162+
'agent_host:' + common.get_agent_hostname(),
160163
]
161164

162165
aggregator.assert_metric('snmp.panSessionUtilization', metric_type=aggregator.GAUGE, tags=tags, count=2)
@@ -179,6 +182,7 @@ def test_e2e_user_profiles_that_extend_profile_with_same_name(dd_agent_check):
179182
'device_namespace:default',
180183
"device_id:default:" + device_ip,
181184
"device_ip:" + device_ip,
185+
'agent_host:' + common.get_agent_hostname(),
182186
'snmp_device:' + device_ip,
183187
'snmp_profile:palo-alto',
184188
],
@@ -210,6 +214,7 @@ def assert_apc_ups_metrics(dd_agent_check, config):
210214
"snmp_device:{}".format(device_ip),
211215
"device_ip:{}".format(device_ip),
212216
"device_id:default:{}".format(device_ip),
217+
'agent_host:' + common.get_agent_hostname(),
213218
]
214219

215220
common.assert_common_metrics(aggregator, tags, is_e2e=True, loader='core')
@@ -264,6 +269,7 @@ def test_e2e_memory_cpu_f5_big_ip(dd_agent_check):
264269
"snmp_device:{}".format(device_ip),
265270
"device_ip:{}".format(device_ip),
266271
"device_id:default:{}".format(device_ip),
272+
'agent_host:' + common.get_agent_hostname(),
267273
]
268274

269275
common.assert_common_metrics(aggregator, tags, is_e2e=True, loader='core')
@@ -312,6 +318,7 @@ def test_e2e_core_discovery(dd_agent_check):
312318
'snmp_device:' + ip_address,
313319
"device_ip:" + ip_address,
314320
"device_id:default:" + ip_address,
321+
'agent_host:' + common.get_agent_hostname(),
315322
]
316323

317324
tags_with_loader = tags + ['loader:core']
@@ -400,6 +407,7 @@ def test_e2e_regex_match(dd_agent_check):
400407
'device_ip:' + device_ip,
401408
'device_id:default:' + device_ip,
402409
'device_namespace:default',
410+
'agent_host:' + common.get_agent_hostname(),
403411
],
404412
)
405413

@@ -426,6 +434,7 @@ def test_e2e_meraki_cloud_controller(dd_agent_check):
426434
'snmp_device:' + ip_address,
427435
"device_ip:" + ip_address,
428436
"device_id:default:" + ip_address,
437+
'agent_host:' + common.get_agent_hostname(),
429438
]
430439

431440
common.assert_common_metrics(aggregator, tags=common_tags, is_e2e=True, loader='core')
@@ -513,6 +522,7 @@ def test_e2e_core_cisco_csr(dd_agent_check):
513522
"snmp_device:{}".format(device_ip),
514523
"device_ip:{}".format(device_ip),
515524
"device_id:default:{}".format(device_ip),
525+
'agent_host:' + common.get_agent_hostname(),
516526
]
517527

518528
common.assert_common_metrics(aggregator, global_tags, is_e2e=True, loader='core')
@@ -552,6 +562,7 @@ def test_e2e_cisco_nexus(dd_agent_check):
552562
"snmp_device:{}".format(device_ip),
553563
"device_ip:{}".format(device_ip),
554564
"device_id:default:{}".format(device_ip),
565+
'agent_host:' + common.get_agent_hostname(),
555566
'snmp_host:Nexus-eu1.companyname.managed',
556567
'device_hostname:Nexus-eu1.companyname.managed',
557568
]
@@ -766,6 +777,7 @@ def test_e2e_cisco_legacy_wlc(dd_agent_check):
766777
'snmp_device:' + ip_address,
767778
"device_ip:" + ip_address,
768779
"device_id:default:" + ip_address,
780+
'agent_host:' + common.get_agent_hostname(),
769781
]
770782
common.assert_common_metrics(aggregator, tags, is_e2e=True, loader='core')
771783

‎snmp/tests/test_e2e_core_metadata.py‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ def test_e2e_core_metadata_f5(dd_agent_check):
8080
'status': 1,
8181
'sys_object_id': '1.3.6.1.4.1.3375.2.1.3.4.43',
8282
'tags': [
83+
'agent_host:' + common.get_agent_hostname(),
8384
'device_hostname:f5-big-ip-adc-good-byol-1-vm.c.datadog-integrations-lab.internal',
8485
'device_id:' + device_id,
8586
'device_ip:' + device_ip,
@@ -216,6 +217,7 @@ def test_e2e_core_metadata_cisco_3850(dd_agent_check):
216217
'status': 1,
217218
'sys_object_id': '1.3.6.1.4.1.9.1.1745',
218219
'tags': [
220+
'agent_host:' + common.get_agent_hostname(),
219221
'device_hostname:Cat-3850-4th-Floor.companyname.local',
220222
'device_id:' + device_id,
221223
'device_ip:' + device_ip,
@@ -278,6 +280,7 @@ def test_e2e_core_metadata_cisco_catalyst(dd_agent_check):
278280
'status': 1,
279281
'sys_object_id': '1.3.6.1.4.1.9.1.241',
280282
'tags': [
283+
'agent_host:' + common.get_agent_hostname(),
281284
'device_id:' + device_id,
282285
'device_ip:' + device_ip,
283286
'device_namespace:default',
@@ -327,6 +330,7 @@ def test_e2e_core_metadata_hp_ilo4(dd_agent_check):
327330
'sys_object_id': '1.3.6.1.4.1.232.9.4.10',
328331
'version': 'A04-08/12/2018',
329332
'tags': [
333+
'agent_host:' + common.get_agent_hostname(),
330334
'device_id:' + device_id,
331335
'device_ip:' + device_ip,
332336
'device_namespace:default',
@@ -376,6 +380,7 @@ def test_e2e_core_metadata_hpe_proliant(dd_agent_check):
376380
'version': 'A04-08/12/2019',
377381
'sys_object_id': '1.3.6.1.4.1.232.1.2',
378382
'tags': [
383+
'agent_host:' + common.get_agent_hostname(),
379384
'device_id:' + device_id,
380385
'device_ip:' + device_ip,
381386
'device_namespace:default',
@@ -428,6 +433,7 @@ def test_e2e_core_metadata_apc_ups(dd_agent_check):
428433
'status': 1,
429434
'sys_object_id': '1.3.6.1.4.1.318.1.1.1',
430435
'tags': [
436+
'agent_host:' + common.get_agent_hostname(),
431437
'device_id:' + device_id,
432438
'device_ip:' + device_ip,
433439
'device_namespace:default',
@@ -481,6 +487,7 @@ def test_e2e_core_metadata_juniper_ex(dd_agent_check):
481487
'sys_object_id': '1.3.6.1.4.1.2636.1.1.1.2.30',
482488
'serial_number': 'dXPEdPBE5yKtjW9xx3',
483489
'tags': [
490+
'agent_host:' + common.get_agent_hostname(),
484491
'device_id:' + device_id,
485492
'device_ip:' + device_ip,
486493
'device_namespace:default',
@@ -530,6 +537,7 @@ def test_e2e_core_metadata_juniper_mx(dd_agent_check):
530537
'sys_object_id': '1.3.6.1.4.1.2636.1.1.1.2.25',
531538
'serial_number': 'dXPEdPBE5yKtjW9xx4',
532539
'tags': [
540+
'agent_host:' + common.get_agent_hostname(),
533541
'device_id:' + device_id,
534542
'device_ip:' + device_ip,
535543
'device_namespace:default',
@@ -579,6 +587,7 @@ def test_e2e_core_metadata_juniper_srx(dd_agent_check):
579587
'sys_object_id': '1.3.6.1.4.1.2636.1.1.1.2.35',
580588
'serial_number': 'dXPEdPBE5yKtjW9xx5',
581589
'tags': [
590+
'agent_host:' + common.get_agent_hostname(),
582591
'device_id:' + device_id,
583592
'device_ip:' + device_ip,
584593
'device_namespace:default',
@@ -627,6 +636,7 @@ def test_e2e_core_metadata_aruba_switch(dd_agent_check):
627636
'status': 1,
628637
'sys_object_id': '1.3.6.1.4.1.14823.1.1.36',
629638
'tags': [
639+
'agent_host:' + common.get_agent_hostname(),
630640
'device_id:' + device_id,
631641
'device_ip:' + device_ip,
632642
'device_namespace:default',
@@ -675,6 +685,7 @@ def test_e2e_core_metadata_aruba_access_point(dd_agent_check):
675685
'status': 1,
676686
'sys_object_id': '1.3.6.1.4.1.14823.1.2.80',
677687
'tags': [
688+
'agent_host:' + common.get_agent_hostname(),
678689
'device_id:' + device_id,
679690
'device_ip:' + device_ip,
680691
'device_namespace:default',
@@ -725,6 +736,7 @@ def test_e2e_core_metadata_arista(dd_agent_check):
725736
'status': 1,
726737
'sys_object_id': '1.3.6.1.4.1.30065.1.3011.7504',
727738
'tags': [
739+
'agent_host:' + common.get_agent_hostname(),
728740
'device_id:' + device_id,
729741
'device_ip:' + device_ip,
730742
'device_namespace:default',
@@ -774,6 +786,7 @@ def test_e2e_core_metadata_palo_alto(dd_agent_check):
774786
'status': 1,
775787
'sys_object_id': '1.3.6.1.4.1.25461.2.3.18',
776788
'tags': [
789+
'agent_host:' + common.get_agent_hostname(),
777790
'device_id:' + device_id,
778791
'device_ip:' + device_ip,
779792
'device_namespace:default',
@@ -821,6 +834,7 @@ def test_e2e_core_metadata_netapp(dd_agent_check):
821834
'status': 1,
822835
'sys_object_id': '1.3.6.1.4.1.789.2.5',
823836
'tags': [
837+
'agent_host:' + common.get_agent_hostname(),
824838
'device_id:' + device_id,
825839
'device_ip:' + device_ip,
826840
'device_namespace:default',
@@ -871,6 +885,7 @@ def test_e2e_core_metadata_checkpoint(dd_agent_check):
871885
'status': 1,
872886
'sys_object_id': '1.3.6.1.4.1.2620.1.1',
873887
'tags': [
888+
'agent_host:' + common.get_agent_hostname(),
874889
'device_id:' + device_id,
875890
'device_ip:' + device_ip,
876891
'device_namespace:default',
@@ -922,6 +937,7 @@ def test_e2e_core_metadata_checkpoint_firewall(dd_agent_check):
922937
'status': 1,
923938
'sys_object_id': '1.3.6.1.4.1.2620.1.1',
924939
'tags': [
940+
'agent_host:' + common.get_agent_hostname(),
925941
'device_id:' + device_id,
926942
'device_ip:' + device_ip,
927943
'device_namespace:default',
@@ -971,6 +987,7 @@ def test_e2e_core_metadata_fortinet_fortigate(dd_agent_check):
971987
'status': 1,
972988
'sys_object_id': '1.3.6.1.4.1.12356.101.1.1',
973989
'tags': [
990+
'agent_host:' + common.get_agent_hostname(),
974991
'device_id:' + device_id,
975992
'device_ip:' + device_ip,
976993
'device_namespace:default',
@@ -1019,6 +1036,7 @@ def test_e2e_core_metadata_dell_idrac(dd_agent_check):
10191036
'version': '2.5.4',
10201037
'sys_object_id': '1.3.6.1.4.1.674.10892.2',
10211038
'tags': [
1039+
'agent_host:' + common.get_agent_hostname(),
10221040
'device_id:' + device_id,
10231041
'device_ip:' + device_ip,
10241042
'device_namespace:default',
@@ -1066,6 +1084,7 @@ def test_e2e_core_metadata_isilon(dd_agent_check):
10661084
'status': 1,
10671085
'sys_object_id': '1.3.6.1.4.1.12325.1.1.2.1.1',
10681086
'tags': [
1087+
'agent_host:' + common.get_agent_hostname(),
10691088
'device_id:' + device_id,
10701089
'device_ip:' + device_ip,
10711090
'cluster_name:testcluster1',
@@ -1167,6 +1186,7 @@ def test_e2e_core_metadata_cisco_asr_1001x(dd_agent_check):
11671186
'status': 1,
11681187
'sys_object_id': '1.3.6.1.4.1.9.1.1861',
11691188
'tags': [
1189+
'agent_host:' + common.get_agent_hostname(),
11701190
'device_id:' + device_id,
11711191
'device_ip:' + device_ip,
11721192
'device_namespace:default',
@@ -1211,6 +1231,7 @@ def test_e2e_core_metadata_cisco_asr_9001(dd_agent_check):
12111231
'status': 1,
12121232
'sys_object_id': '1.3.6.1.4.1.9.1.1639',
12131233
'tags': [
1234+
'agent_host:' + common.get_agent_hostname(),
12141235
'device_id:' + device_id,
12151236
'device_ip:' + device_ip,
12161237
'device_namespace:default',
@@ -1255,6 +1276,7 @@ def test_e2e_core_metadata_cisco_asr_9901(dd_agent_check):
12551276
'status': 1,
12561277
'sys_object_id': '1.3.6.1.4.1.9.1.2658',
12571278
'tags': [
1279+
'agent_host:' + common.get_agent_hostname(),
12581280
'device_id:' + device_id,
12591281
'device_ip:' + device_ip,
12601282
'device_namespace:default',
@@ -1403,6 +1425,7 @@ def test_e2e_core_metadata_cisco_wlc(dd_agent_check):
14031425
'status': 1,
14041426
'sys_object_id': '1.3.6.1.4.1.9.1.1069',
14051427
'tags': [
1428+
'agent_host:' + common.get_agent_hostname(),
14061429
'device_id:' + device_id,
14071430
'device_ip:' + device_ip,
14081431
'device_namespace:default',

‎snmp/tests/test_e2e_core_profiles/test_profile_3com.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def test_e2e_profile_3com(dd_agent_check):
3333
'snmp_device:' + ip_address,
3434
'device_ip:' + ip_address,
3535
'device_id:default:' + ip_address,
36+
'agent_host:' + common.get_agent_hostname(),
3637
]
3738

3839
# --- TEST METRICS ---
@@ -51,6 +52,7 @@ def test_e2e_profile_3com(dd_agent_check):
5152
'sys_object_id': '1.3.6.1.4.1.43.1.999',
5253
'tags': [
5354
'device_id:default:' + ip_address,
55+
'agent_host:' + common.get_agent_hostname(),
5456
'device_ip:' + ip_address,
5557
'device_namespace:default',
5658
'snmp_device:' + ip_address,

‎snmp/tests/test_e2e_core_profiles/test_profile_3com_huawei.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def test_e2e_profile_3com_huawei(dd_agent_check):
3333
'snmp_device:' + ip_address,
3434
'device_ip:' + ip_address,
3535
'device_id:default:' + ip_address,
36+
'agent_host:' + common.get_agent_hostname(),
3637
]
3738

3839
# --- TEST METRICS ---
@@ -81,6 +82,7 @@ def test_e2e_profile_3com_huawei(dd_agent_check):
8182
'sys_object_id': '1.3.6.1.4.1.43.45.1.2.999',
8283
'tags': [
8384
'device_id:default:' + ip_address,
85+
'agent_host:' + common.get_agent_hostname(),
8486
'device_ip:' + ip_address,
8587
'device_namespace:default',
8688
'snmp_device:' + ip_address,

‎snmp/tests/test_e2e_core_profiles/test_profile__checkpoint_firewall_cpu_memory.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def test_e2e_profile__checkpoint_firewall_cpu_memory(dd_agent_check):
3232
'snmp_device:' + ip_address,
3333
'device_ip:' + ip_address,
3434
'device_id:default:' + ip_address,
35+
'agent_host:' + common.get_agent_hostname(),
3536
] + []
3637

3738
# --- TEST EXTENDED METRICS ---

‎snmp/tests/test_e2e_core_profiles/test_profile__cisco_generic.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def test_e2e_profile__cisco_generic(dd_agent_check):
3939
'snmp_device:' + ip_address,
4040
'device_ip:' + ip_address,
4141
'device_id:default:' + ip_address,
42+
'agent_host:' + common.get_agent_hostname(),
4243
] + []
4344

4445
# --- TEST EXTENDED METRICS ---

‎snmp/tests/test_e2e_core_profiles/test_profile__cisco_ipsec_flow_monitor.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ def test_e2e_profile__cisco_ipsec_flow_monitor(dd_agent_check):
3030
'snmp_device:' + ip_address,
3131
'device_ip:' + ip_address,
3232
'device_id:default:' + ip_address,
33+
'agent_host:' + common.get_agent_hostname(),
3334
] + []
3435

3536
# --- TEST EXTENDED METRICS ---

‎snmp/tests/test_e2e_core_profiles/test_profile__dell_rac.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def test_e2e_profile__dell_rac(dd_agent_check):
3232
'snmp_device:' + ip_address,
3333
'device_ip:' + ip_address,
3434
'device_id:default:' + ip_address,
35+
'agent_host:' + common.get_agent_hostname(),
3536
] + []
3637

3738
# --- TEST EXTENDED METRICS ---

0 commit comments

Comments
 (0)