[SNMP] Add device_hostname tag (#17433)

* Update tests with new device_id and device_ip tags

* Add device_hostname tag

* Format

* Add changelog

Author: TCheruy

snmp/changelog.d/17433.added

@@ -0,0 +1 @@
+[SNMP] Add device_hostname tag

snmp/datadog_checks/snmp/data/default_profiles/_base.yaml

@@ -4,6 +4,9 @@ metric_tags:
   - OID: 1.3.6.1.2.1.1.5.0
     symbol: sysName
     tag: snmp_host
+  - OID: 1.3.6.1.2.1.1.5.0
+    symbol: sysName
+    tag: device_hostname
 
 metadata:
   device:

snmp/tests/test_e2e_core.py

@@ -253,6 +253,7 @@ def test_e2e_memory_cpu_f5_big_ip(dd_agent_check):
         'device_namespace:default',
         'device_vendor:f5',
         'snmp_host:f5-big-ip-adc-good-byol-1-vm.c.datadog-integrations-lab.internal',
+        'device_hostname:f5-big-ip-adc-good-byol-1-vm.c.datadog-integrations-lab.internal',
         'snmp_profile:f5-big-ip',
     ]
     device_ip = instance['ip_address']
@@ -417,6 +418,7 @@ def test_e2e_meraki_cloud_controller(dd_agent_check):
     common_tags = [
         'snmp_profile:meraki-cloud-controller',
         'snmp_host:dashboard.meraki.com',
+        'device_hostname:dashboard.meraki.com',
         'device_vendor:meraki',
         'device_namespace:default',
         'snmp_device:' + ip_address,
@@ -515,6 +517,7 @@ def test_e2e_core_detect_metrics_using_apc_ups_metrics(dd_agent_check):
         'ups_name:testIdentName',
         # metric_tags from _base.yaml
         'snmp_host:APC_UPS_NAME',
+        'device_hostname:APC_UPS_NAME',
     ]
     device_ip = instance['ip_address']
 
@@ -620,6 +623,7 @@ def test_e2e_cisco_nexus(dd_agent_check):
         "device_ip:{}".format(device_ip),
         "device_id:default:{}".format(device_ip),
         'snmp_host:Nexus-eu1.companyname.managed',
+        'device_hostname:Nexus-eu1.companyname.managed',
     ]
 
     common.assert_common_metrics(aggregator, common_tags, is_e2e=True, loader='core')
@@ -828,6 +832,7 @@ def test_e2e_cisco_legacy_wlc(dd_agent_check):
         'snmp_profile:cisco-legacy-wlc',
         'device_vendor:cisco',
         'snmp_host:DDOGWLC',
+        'device_hostname:DDOGWLC',
         'snmp_device:' + ip_address,
         "device_ip:" + ip_address,
         "device_id:default:" + ip_address,

snmp/tests/test_e2e_core_metadata.py

@@ -79,6 +79,7 @@ def test_e2e_core_metadata_f5(dd_agent_check):
                     u'status': 1,
                     u'sys_object_id': u'1.3.6.1.4.1.3375.2.1.3.4.43',
                     u'tags': [
+                        u'device_hostname:f5-big-ip-adc-good-byol-1-vm.c.datadog-integrations-lab.internal',
                         u'device_id:' + device_id,
                         u'device_ip:' + device_ip,
                         u'device_namespace:default',
@@ -213,6 +214,7 @@ def test_e2e_core_metadata_cisco_3850(dd_agent_check):
         u'status': 1,
         u'sys_object_id': u'1.3.6.1.4.1.9.1.1745',
         u'tags': [
+            u'device_hostname:Cat-3850-4th-Floor.companyname.local',
             u'device_id:' + device_id,
             u'device_ip:' + device_ip,
             u'device_namespace:default',
@@ -279,6 +281,7 @@ def test_e2e_core_metadata_cisco_catalyst(dd_agent_check):
             u'device_vendor:cisco',
             u'snmp_device:' + device_ip,
             u'snmp_host:catalyst-6000.example',
+            u'device_hostname:catalyst-6000.example',
             u'snmp_profile:cisco-catalyst',
         ],
         u'vendor': u'cisco',
@@ -326,6 +329,7 @@ def test_e2e_core_metadata_hp_ilo4(dd_agent_check):
             u'device_vendor:hp',
             u'snmp_device:' + device_ip,
             u'snmp_host:hp-ilo4.example',
+            u'device_hostname:hp-ilo4.example',
             u'snmp_profile:hp-ilo4',
         ],
         u'vendor': u'hp',
@@ -373,6 +377,7 @@ def test_e2e_core_metadata_hpe_proliant(dd_agent_check):
             u'device_vendor:hp',
             u'snmp_device:' + device_ip,
             u'snmp_host:hpe-proliant.example',
+            u'device_hostname:hpe-proliant.example',
             u'snmp_profile:hpe-proliant',
         ],
         u'vendor': u'hp',
@@ -618,6 +623,7 @@ def test_e2e_core_metadata_aruba_switch(dd_agent_check):
             'device_vendor:aruba',
             'snmp_device:' + device_ip,
             'snmp_host:aruba-switch.device.name',
+            'device_hostname:aruba-switch.device.name',
             'snmp_profile:aruba-switch',
         ],
         'vendor': 'aruba',
@@ -664,6 +670,7 @@ def test_e2e_core_metadata_aruba_access_point(dd_agent_check):
             'device_vendor:aruba',
             'snmp_device:' + device_ip,
             'snmp_host:aruba-335-name',
+            'device_hostname:aruba-335-name',
             'snmp_profile:aruba-access-point',
         ],
         'vendor': 'aruba',
@@ -712,6 +719,7 @@ def test_e2e_core_metadata_arista(dd_agent_check):
             'device_vendor:arista',
             'snmp_device:' + device_ip,
             'snmp_host:DCS-7504-name',
+            'device_hostname:DCS-7504-name',
             'snmp_profile:arista',
         ],
         'vendor': 'arista',
@@ -805,6 +813,7 @@ def test_e2e_core_metadata_netapp(dd_agent_check):
             'device_vendor:netapp',
             'snmp_device:' + device_ip,
             'snmp_host:example-datacenter.company',
+            'device_hostname:example-datacenter.company',
             'snmp_profile:netapp',
         ],
         'vendor': 'netapp',
@@ -853,6 +862,7 @@ def test_e2e_core_metadata_checkpoint(dd_agent_check):
             'device_vendor:checkpoint',
             'snmp_device:' + device_ip,
             'snmp_host:checkpoint.device.name',
+            'device_hostname:checkpoint.device.name',
             'snmp_profile:checkpoint',
         ],
         'vendor': 'checkpoint',
@@ -902,6 +912,7 @@ def test_e2e_core_metadata_checkpoint_firewall(dd_agent_check):
             'device_vendor:checkpoint',
             'snmp_device:' + device_ip,
             'snmp_host:checkpoint.device.name',
+            'device_hostname:checkpoint.device.name',
             'snmp_profile:checkpoint-firewall',
         ],
         'vendor': 'checkpoint',
@@ -949,6 +960,7 @@ def test_e2e_core_metadata_fortinet_fortigate(dd_agent_check):
             'device_vendor:fortinet',
             'snmp_device:' + device_ip,
             'snmp_host:fortinet-fortigate.device.name',
+            'device_hostname:fortinet-fortigate.device.name',
             'snmp_profile:fortinet-fortigate',
         ],
         'vendor': 'fortinet',
@@ -1370,6 +1382,7 @@ def test_e2e_core_metadata_cisco_wlc(dd_agent_check):
             u'device_vendor:cisco',
             u'snmp_device:' + device_ip,
             u'snmp_host:DDOGWLC',
+            'device_hostname:DDOGWLC',
             u'snmp_profile:cisco-legacy-wlc',
         ],
         u'vendor': u'cisco',

snmp/tests/test_e2e_core_profiles/test_profile_3com.py

@@ -28,6 +28,7 @@ def test_e2e_profile_3com(dd_agent_check):
     common_tags = [
         'snmp_profile:3com',
         'snmp_host:3com.device.name',
+        'device_hostname:3com.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,
@@ -54,6 +55,7 @@ def test_e2e_profile_3com(dd_agent_check):
             'device_namespace:default',
             'snmp_device:' + ip_address,
             'snmp_host:3com.device.name',
+            'device_hostname:3com.device.name',
             'snmp_profile:3com',
         ],
         'vendor': '3com',

snmp/tests/test_e2e_core_profiles/test_profile_3com_huawei.py

@@ -28,6 +28,7 @@ def test_e2e_profile_3com_huawei(dd_agent_check):
     common_tags = [
         'snmp_profile:3com-huawei',
         'snmp_host:3com-huawei.device.name',
+        'device_hostname:3com-huawei.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,
@@ -84,6 +85,7 @@ def test_e2e_profile_3com_huawei(dd_agent_check):
             'device_namespace:default',
             'snmp_device:' + ip_address,
             'snmp_host:3com-huawei.device.name',
+            'device_hostname:3com-huawei.device.name',
             'snmp_profile:3com-huawei',
         ],
         'vendor': '3com',

snmp/tests/test_e2e_core_profiles/test_profile__checkpoint_firewall_cpu_memory.py

@@ -27,6 +27,7 @@ def test_e2e_profile__checkpoint_firewall_cpu_memory(dd_agent_check):
     common_tags = [
         'snmp_profile:checkpoint-firewall-cpu-memory',
         'snmp_host:_checkpoint-firewall-cpu-memory.device.name',
+        'device_hostname:_checkpoint-firewall-cpu-memory.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__cisco_generic.py

@@ -34,6 +34,7 @@ def test_e2e_profile__cisco_generic(dd_agent_check):
     common_tags = [
         'snmp_profile:cisco-generic',
         'snmp_host:_cisco-generic.device.name',
+        'device_hostname:_cisco-generic.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__cisco_ipsec_flow_monitor.py

@@ -25,6 +25,7 @@ def test_e2e_profile__cisco_ipsec_flow_monitor(dd_agent_check):
     common_tags = [
         'snmp_profile:cisco-ipsec-flow-monitor',
         'snmp_host:_cisco-ipsec-flow-monitor.device.name',
+        'device_hostname:_cisco-ipsec-flow-monitor.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__dell_rac.py

@@ -27,6 +27,7 @@ def test_e2e_profile__dell_rac(dd_agent_check):
     common_tags = [
         'snmp_profile:dell-rac',
         'snmp_host:_dell-rac.device.name',
+        'device_hostname:_dell-rac.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_bgp4.py

@@ -27,6 +27,7 @@ def test_e2e_profile__generic_bgp4(dd_agent_check):
     common_tags = [
         'snmp_profile:generic-bgp4',
         'snmp_host:_generic-bgp4.device.name',
+        'device_hostname:_generic-bgp4.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_entity_sensor.py

@@ -27,6 +27,7 @@ def test_e2e_profile__generic_entity_sensor(dd_agent_check):
     common_tags = [
         'snmp_profile:generic-entity-sensor',
         'snmp_host:_generic-entity-sensor.device.name',
+        'device_hostname:_generic-entity-sensor.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_rtp.py

@@ -25,6 +25,7 @@ def test_e2e_profile__generic_rtp(dd_agent_check):
     common_tags = [
         'snmp_profile:generic-rtp',
         'snmp_host:_generic-rtp.device.name',
+        'device_hostname:_generic-rtp.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_sip.py

@@ -25,6 +25,7 @@ def test_e2e_profile__generic_sip(dd_agent_check):
     common_tags = [
         'snmp_profile:generic-sip',
         'snmp_host:_generic-sip.device.name',
+        'device_hostname:_generic-sip.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_ucd.py

@@ -27,6 +27,7 @@ def test_e2e_profile__generic_ucd(dd_agent_check):
     common_tags = [
         'snmp_profile:generic-ucd',
         'snmp_host:_generic-ucd.device.name',
+        'device_hostname:_generic-ucd.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__generic_ups.py

@@ -27,6 +27,7 @@ def test_e2e_profile__generic_ups(dd_agent_check):
     common_tags = [
         'snmp_profile:abstract-generic-ups',
         'snmp_host:_generic-ups.device.name',
+        'device_hostname:_generic-ups.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile__hp_compaq_health.py

@@ -27,6 +27,7 @@ def test_e2e_profile__hp_compaq_health(dd_agent_check):
     common_tags = [
         'snmp_profile:hp-compaq-health',
         'snmp_host:_hp-compaq-health.device.name',
+        'device_hostname:_hp-compaq-health.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_a10_thunder.py

@@ -28,6 +28,7 @@ def test_e2e_profile_a10_thunder(dd_agent_check):
     common_tags = [
         'snmp_profile:a10-thunder',
         'snmp_host:a10-thunder.device.name',
+        'device_hostname:a10-thunder.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_alcatel_lucent_ent.py

@@ -28,6 +28,7 @@ def test_e2e_profile_alcatel_lucent_ent(dd_agent_check):
     common_tags = [
         'snmp_profile:alcatel-lucent-ent',
         'snmp_host:alcatel-lucent-ent.device.name',
+        'device_hostname:alcatel-lucent-ent.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_alcatel_lucent_ind.py

@@ -28,6 +28,7 @@ def test_e2e_profile_alcatel_lucent_ind(dd_agent_check):
     common_tags = [
         'snmp_profile:alcatel-lucent-ind',
         'snmp_host:alcatel-lucent-ind.device.name',
+        'device_hostname:alcatel-lucent-ind.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_alcatel_lucent_omni_access_wlc.py

@@ -28,6 +28,7 @@ def test_e2e_profile_alcatel_lucent_omni_access_wlc(dd_agent_check):
     common_tags = [
         'snmp_profile:alcatel-lucent-omni-access-wlc',
         'snmp_host:alcatel-lucent-omni-access-wlc.device.name',
+        'device_hostname:alcatel-lucent-omni-access-wlc.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_anue.py

@@ -28,6 +28,7 @@ def test_e2e_profile_anue(dd_agent_check):
     common_tags = [
         'snmp_profile:anue',
         'snmp_host:anue-packet-broker.device.name',
+        'device_hostname:anue-packet-broker.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_apc_netbotz.py

@@ -27,6 +27,7 @@ def test_e2e_profile_apc_netbotz(dd_agent_check):
     common_tags = [
         'snmp_profile:apc-netbotz',
         'snmp_host:apc-netbotz.device.name',
+        'device_hostname:apc-netbotz.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_apc_pdu.py

@@ -29,6 +29,7 @@ def test_e2e_profile_apc_pdu(dd_agent_check):
     common_tags = [
         'snmp_profile:apc-pdu',
         'snmp_host:apc-pdu.device.name',
+        'device_hostname:apc-pdu.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_arista_switch.py

@@ -31,6 +31,7 @@ def test_e2e_profile_arista_switch(dd_agent_check):
     common_tags = [
         'snmp_profile:arista-switch',
         'snmp_host:arista-switch.device.name',
+        'device_hostname:arista-switch.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_aruba_clearpass.py

@@ -29,6 +29,7 @@ def test_e2e_profile_aruba_clearpass(dd_agent_check):
     common_tags = [
         'snmp_profile:aruba-clearpass',
         'snmp_host:aruba-clearpass.device.name',
+        'device_hostname:aruba-clearpass.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_aruba_cx_switch.py

@@ -29,6 +29,7 @@ def test_e2e_profile_aruba_cx_switch(dd_agent_check):
     common_tags = [
         'snmp_profile:aruba-cx-switch',
         'snmp_host:aruba-cx-switch.device.name',
+        'device_hostname:aruba-cx-switch.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_aruba_mobility_controller.py

@@ -28,6 +28,7 @@ def test_e2e_profile_aruba_mobility_controller(dd_agent_check):
     common_tags = [
         'snmp_profile:aruba-mobility-controller',
         'snmp_host:aruba-mobility-controller.device.name',
+        'device_hostname:aruba-mobility-controller.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_aruba_switch.py

@@ -30,6 +30,7 @@ def test_e2e_profile_aruba_switch(dd_agent_check):
     common_tags = [
         'snmp_profile:aruba-switch',
         'snmp_host:aruba-switch.device.name',
+        'device_hostname:aruba-switch.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_aruba_wireless_controller.py

@@ -28,6 +28,7 @@ def test_e2e_profile_aruba_wireless_controller(dd_agent_check):
     common_tags = [
         'snmp_profile:aruba-wireless-controller',
         'snmp_host:aruba-wireless-controller.device.name',
+        'device_hostname:aruba-wireless-controller.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_audiocodes_mediant_sbc.py

@@ -28,6 +28,7 @@ def test_e2e_profile_audiocodes_mediant_sbc(dd_agent_check):
     common_tags = [
         'snmp_profile:audiocodes-mediant-sbc',
         'snmp_host:audiocodes-mediant-sbc.device.name',
+        'device_hostname:audiocodes-mediant-sbc.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,

snmp/tests/test_e2e_core_profiles/test_profile_avaya_aura_media_server.py

@@ -29,6 +29,7 @@ def test_e2e_profile_avaya_aura_media_server(dd_agent_check):
     common_tags = [
         'snmp_profile:avaya-aura-media-server',
         'snmp_host:avaya-aura-media-server.device.name',
+        'device_hostname:avaya-aura-media-server.device.name',
         'device_namespace:default',
         'snmp_device:' + ip_address,
         'device_ip:' + ip_address,