Use auto-discovery for log collection

azure_iot_edge/assets/configuration/spec.yaml

@@ -26,11 +26,3 @@ files:
               type: string
               example: http://localhost:15580
           - template: instances/default
-
-      - template: logs
-        example:
-          # Requires setting DD_CONTAINER_INCLUDE_LOGS="name:<CONTAINER_1> name:<CONTAINER_2> ..."
-          # See: https://docs.datadoghq.com/agent/guide/autodiscovery-management/?tab=containerizedagent#include-containers
-          - type: docker
-            source: azure_iot_edge
-            service: "<SERVICE_NAME>"

azure_iot_edge/datadog_checks/azure_iot_edge/data/auto_conf.yaml

@@ -0,0 +1,22 @@
+## @param ad_identifiers - list of strings - required
+## A list of container identifiers that are used by Autodiscovery to identify
+## which container the check should be run against. For more information, see:
+## https://docs.datadoghq.com/agent/guide/ad_identifiers/
+#
+ad_identifiers:
+  - azure_iot_edge
+
+## Must be empty.
+#
+init_config: {}
+
+## Must be empty
+#
+instances: []
+
+## Logs collection configuration.
+#
+logs:
+  - type: docker
+    source: azure_iot_edge
+    service: azure_iot_edge

azure_iot_edge/datadog_checks/azure_iot_edge/data/conf.yaml.example

@@ -57,21 +57,3 @@ instances:
     ## This is useful for cluster-level checks.
     #
     # empty_default_hostname: false
-
-## Log Section
-##
-## type - required - Type of log input source (tcp / udp / file / windows_event)
-## port / path / channel_path - required - Set port if type is tcp or udp.
-##                                         Set path if type is file.
-##                                         Set channel_path if type is windows_event.
-## source  - required - Attribute that defines which Integration sent the logs.
-## service - optional - The name of the service that generates the log.
-##                      Overrides any `service` defined in the `init_config` section.
-## tags - optional - Add tags to the collected logs.
-##
-## Discover Datadog log collection: https://docs.datadoghq.com/logs/log_collection/
-#
-# logs:
-#   - type: docker
-#     source: azure_iot_edge
-#     service: <SERVICE_NAME>

azure_iot_edge/tests/common.py

@@ -364,22 +364,15 @@
     'iothub:iot-edge-dev-hub.azure-devices.net',
 ]
 
-E2E_LOGS_CONFIG = [
-    {
-        'type': 'docker',
-        'source': 'azure_iot_edge',
-        'service': 'azure_iot_edge_dev',
-    },
-]
-
-E2E_CONTAINERS = ['iot-edge-device'] + MODULES
-
 E2E_METADATA = {
     'env_vars': {
         'DD_LOGS_ENABLED': 'true',
-        'DD_CONTAINER_INCLUDE_LOGS': ' '.join('name:{}'.format(name) for name in E2E_CONTAINERS),
     },
     'docker_volumes': [
         '/var/run/docker.sock:/var/run/docker.sock',
     ],
+    'start_commands': [
+        # Ensure the Agent has access to the autodiscovery config template.
+        'cp -r /home/azure_iot_edge/datadog_checks/azure_iot_edge/data/auto_conf.yaml /etc/datadog-agent/conf.d/azure_iot_edge.d/auto_conf.yaml',  # noqa: E501
+    ],
 }

azure_iot_edge/tests/compose/docker-compose.yaml

@@ -20,6 +20,8 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - iot-edge-network
+    labels:
+      com.datadoghq.ad.check.id: azure_iot_edge
 
 networks:
   iot-edge-network:

azure_iot_edge/tests/conftest.py

@@ -39,14 +39,8 @@ def dd_environment(e2e_instance):
     up = e2e_utils.IoTEdgeUp(compose_file, network_name=common.E2E_NETWORK)
     down = e2e_utils.IoTEdgeDown(compose_file, stop_extra_containers=common.E2E_EXTRA_SPAWNED_CONTAINERS)
 
-    e2e_config = {
-        'init_config': {},
-        'instances': [e2e_instance],
-        'logs': common.E2E_LOGS_CONFIG,
-    }
-
     with docker_run(conditions=conditions, env_vars=env_vars, up=up, down=down):
-        yield e2e_config, common.E2E_METADATA
+        yield e2e_instance, common.E2E_METADATA
 
 
 @pytest.fixture(scope='session')