even more properties

Author: flyinprogrammer

manifests/integrations/docker_daemon.pp

@@ -29,11 +29,20 @@
   $tls_client_key = '/path/to/client-key.pem',
   $tls_cacert = '/path/to/ca.pem',
   $tls_verify = true,
+  $init_retry_interval = 0,
+  $init_retries = 0,
   $url = 'unix://var/run/docker.sock',
   $collect_events = true,
+  $filtered_event_types = [],
   $collect_container_size = false,
+  $custom_cgroups = false,
+  $health_service_check_whitelist = [],
+  $collect_container_count = false,
+  $collect_volume_count = false,
   $collect_images_stats = false,
   $collect_image_size = false,
+  $collect_disk_stats = false,
+  $collect_exit_codes = false,
   $exclude = [],
   $include = [],
   $tags = [],
@@ -44,6 +53,7 @@
   $container_tags = [],
   # Ex. "com.docker.compose.service", "com.docker.compose.project"
   $collect_labels_as_tags = [],
+  $event_attributes_as_tags = [],
 ) inherits datadog_agent::params {
   include datadog_agent
 

templates/agent-conf.d/docker_daemon.yaml.erb

@@ -20,6 +20,22 @@ init_config:
   tls_cacert: <%= @tls_cacert %>
   tls_verify: <%= @tls_verify %>
 
+  # Initialization retries
+  #
+  # if the agent is expected to start before Docker,
+  # use these settings to configure the retry policy.
+
+  # init_retry_interval defines how long (in seconds) the docker client
+  # will wait before retrying initialization.
+  # Defaults to 0.
+  #
+  init_retry_interval: <%= @init_retry_interval %>
+
+  # init_retries configures how many retries are made before failing permanently.
+  # Defaults to 0.
+  #
+  init_retries: <%= @init_retries %>
+
 instances:
   - ## Daemon and system configuration
     ##
@@ -37,6 +53,11 @@ instances:
     #
     collect_events: <%= @collect_events %>
 
+    # By default we do not collect events with a status ['top', 'exec_start', 'exec_create'].
+    # Here can be added additional statuses to be filtered.
+    # List of available statuses can be found here https://docs.docker.com/engine/reference/commandline/events/#object-types
+    filtered_event_types: [<%= @filtered_event_types && !@filtered_event_types.empty? ? '"' + @filtered_event_types.reject(&:empty?).join('", "') + '"' : nil %>]
+
     # Collect disk usage per container with docker.container.size_rw and
     # docker.container.size_rootfs metrics.
     # Warning: This might take time for Docker daemon to generate,
@@ -45,6 +66,34 @@ instances:
     #
     collect_container_size: <%= @collect_container_size %>
 
+    # Do you use custom cgroups for this particular instance?
+    # Note: enabling this option modifies the way in which we inspect the containers and causes
+    #       some overhead - if you run a high volume of containers we may timeout.
+    #
+    custom_cgroups: <%= @custom_cgroups %>
+
+    # Report docker container healthcheck events as service checks
+    # Note: enabling this option modifies the way in which we inspect the containers and causes
+    #       some overhead - if you run a high volume of containers we may timeout.
+    #       Container Healthchecks are available starting with docker 1.12, enabling with older
+    #       versions will result in an UNKNOWN state for the service check.
+    #
+    # You must whitelist the containers you wish to submit health service checks for.
+    # Use the same mechanism as the tagging system (see Tag:performance_tags section).
+    # Example: ["docker_image:tomcat", "container_name:web_front_nginx"]
+    #
+    health_service_check_whitelist: [<%= @health_service_check_whitelist && !@health_service_check_whitelist.empty? ? '"' + @health_service_check_whitelist.reject(&:empty?).join('", "') + '"' : nil %>]
+
+    # Collect the container count tagged by state (running, paused, exited, dead)
+    # Defaults to false.
+    #
+    collect_container_count: <%= @collect_container_count %>
+
+    # Collect the volume count for attached and dangling volumes.
+    # Defaults to false.
+    #
+    collect_volume_count: <%= @collect_volume_count %>
+
     # Collect images stats
     # Number of available active images and intermediate images as gauges.
     # Defaults to false.
@@ -58,6 +107,20 @@ instances:
     #
     collect_image_size: <%= @collect_image_size %>
 
+    # Collect disk metrics (total, used, free) through the docker info command for data and metadata.
+    # This is useful when these values can't be obtained by the disk check.
+    # Example: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-optimized_AMI.html
+    # Note that it only works when the storage driver is devicemapper.
+    # Explanation of these metrics can be found here:
+    # https://github.com/docker/docker/blob/v1.11.1/daemon/graphdriver/devmapper/README.md
+    # Defaults to false.
+    #
+    collect_disk_stats: <%= @collect_disk_stats %>
+
+    # Collect containers exit codes and send service checks critical when exit code is not 0
+    # Defaults to false.
+    #
+    collect_exit_codes: <%= @collect_exit_codes %>
 
     # Exclude containers based on their tags
     # An excluded container will be completely ignored. The rule is a regex on the tags.
@@ -113,3 +176,8 @@ instances:
     # Default to None
     # Example:
     collect_labels_as_tags: [<%= @collect_labels_as_tags && !@collect_labels_as_tags.empty? ? '"' + @collect_labels_as_tags.reject(&:empty?).join('", "') + '"' : nil %>]
+
+    # List of docker event attributes to add as tags of the datadog events
+    # Defaults to None.
+    #
+    event_attributes_as_tags: [<%= @event_attributes_as_tags && !@event_attributes_as_tags.empty? ? '"' + @event_attributes_as_tags.reject(&:empty?).join('", "') + '"' : nil %>]