diff --git a/marathon/assets/configuration/spec.yaml b/marathon/assets/configuration/spec.yaml index eed1c00160b2e..f6a42be398130 100644 --- a/marathon/assets/configuration/spec.yaml +++ b/marathon/assets/configuration/spec.yaml @@ -37,6 +37,30 @@ files: - - template: instances/default - template: instances/http + overrides: + auth_token.description: | + This allows for the use of authentication information from dynamic sources. + Both a reader and writer must be configured. + + The available readers are: + + - type: file + path (required): The absolute path for the file to read from. + pattern: A regular expression pattern with a single capture group used to find the + token rather than using the entire file, for example: Your secret is (.+) + + - type: dcos_auth + login_url (required): DC/OS login endpoint + service_account (required): The DC/OS service account to authenticate. + private_key_path (required): The absolute path for the DC/OS service account. + expiration: Token expiration in seconds, defaults to 300 (5 min). + + The available writers are: + + - type: header + name (required): The name of the field, for example: Authorization + value: The template value, for example `Bearer `. The default is: + placeholder: The substring in `value` to replace by the token, defaults to: - template: logs example: - type: file diff --git a/marathon/datadog_checks/marathon/data/conf.yaml.example b/marathon/datadog_checks/marathon/data/conf.yaml.example index bd990bf48f07e..9576c0327dde9 100644 --- a/marathon/datadog_checks/marathon/data/conf.yaml.example +++ b/marathon/datadog_checks/marathon/data/conf.yaml.example @@ -244,6 +244,12 @@ instances: ## pattern: A regular expression pattern with a single capture group used to find the ## token rather than using the entire file, for example: Your secret is (.+) ## + ## - type: dcos_auth + ## login_url (required): DC/OS login endpoint + ## service_account (required): The DC/OS service account to authenticate. + ## private_key_path (required): The absolute path for the DC/OS service account. + ## expiration: Token expiration in seconds, defaults to 300 (5 min). + ## ## The available writers are: ## ## - type: header diff --git a/marathon/setup.py b/marathon/setup.py index 4a4f4aea525b3..ff3d36a05d3db 100644 --- a/marathon/setup.py +++ b/marathon/setup.py @@ -25,7 +25,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.1.0' setup( name='datadog-marathon', diff --git a/mesos_master/assets/configuration/spec.yaml b/mesos_master/assets/configuration/spec.yaml index 3a7b87e487c5d..27df489c256bb 100644 --- a/mesos_master/assets/configuration/spec.yaml +++ b/mesos_master/assets/configuration/spec.yaml @@ -16,4 +16,28 @@ files: type: string example: http://localhost:5050 - template: instances/http + overrides: + auth_token.description: | + This allows for the use of authentication information from dynamic sources. + Both a reader and writer must be configured. + + The available readers are: + + - type: file + path (required): The absolute path for the file to read from. + pattern: A regular expression pattern with a single capture group used to find the + token rather than using the entire file, for example: Your secret is (.+) + + - type: dcos_auth + login_url (required): DC/OS login endpoint + service_account (required): The DC/OS service account to authenticate. + private_key_path (required): The absolute path for the DC/OS service account. + expiration: Token expiration in seconds, defaults to 300 (5 min). + + The available writers are: + + - type: header + name (required): The name of the field, for example: Authorization + value: The template value, for example `Bearer `. The default is: + placeholder: The substring in `value` to replace by the token, defaults to: - template: instances/default diff --git a/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example b/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example index ef25118babf51..d11f511428f96 100644 --- a/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example +++ b/mesos_master/datadog_checks/mesos_master/data/conf.yaml.example @@ -199,6 +199,12 @@ instances: ## pattern: A regular expression pattern with a single capture group used to find the ## token rather than using the entire file, for example: Your secret is (.+) ## + ## - type: dcos_auth + ## login_url (required): DC/OS login endpoint + ## service_account (required): The DC/OS service account to authenticate. + ## private_key_path (required): The absolute path for the DC/OS service account. + ## expiration: Token expiration in seconds, defaults to 300 (5 min). + ## ## The available writers are: ## ## - type: header diff --git a/mesos_master/setup.py b/mesos_master/setup.py index 705345bd4b8ba..1907cf60a74b7 100644 --- a/mesos_master/setup.py +++ b/mesos_master/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.1.0' setup( name='datadog-mesos_master', diff --git a/mesos_slave/assets/configuration/spec.yaml b/mesos_slave/assets/configuration/spec.yaml index 807011f362cfe..71f1d2222b1c3 100644 --- a/mesos_slave/assets/configuration/spec.yaml +++ b/mesos_slave/assets/configuration/spec.yaml @@ -30,4 +30,28 @@ files: example: - - template: instances/http + overrides: + auth_token.description: | + This allows for the use of authentication information from dynamic sources. + Both a reader and writer must be configured. + + The available readers are: + + - type: file + path (required): The absolute path for the file to read from. + pattern: A regular expression pattern with a single capture group used to find the + token rather than using the entire file, for example: Your secret is (.+) + + - type: dcos_auth + login_url (required): DC/OS login endpoint + service_account (required): The DC/OS service account to authenticate. + private_key_path (required): The absolute path for the DC/OS service account. + expiration: Token expiration in seconds, defaults to 300 (5 min). + + The available writers are: + + - type: header + name (required): The name of the field, for example: Authorization + value: The template value, for example `Bearer `. The default is: + placeholder: The substring in `value` to replace by the token, defaults to: - template: instances/default diff --git a/mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example b/mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example index ff6e5ddc10bcc..cd127a1302ccd 100644 --- a/mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example +++ b/mesos_slave/datadog_checks/mesos_slave/data/conf.yaml.example @@ -210,6 +210,12 @@ instances: ## pattern: A regular expression pattern with a single capture group used to find the ## token rather than using the entire file, for example: Your secret is (.+) ## + ## - type: dcos_auth + ## login_url (required): DC/OS login endpoint + ## service_account (required): The DC/OS service account to authenticate. + ## private_key_path (required): The absolute path for the DC/OS service account. + ## expiration: Token expiration in seconds, defaults to 300 (5 min). + ## ## The available writers are: ## ## - type: header diff --git a/mesos_slave/setup.py b/mesos_slave/setup.py index 64288111d1127..5ba0e511ce80d 100644 --- a/mesos_slave/setup.py +++ b/mesos_slave/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.1.0' setup( name='datadog-mesos_slave', diff --git a/spark/assets/configuration/spec.yaml b/spark/assets/configuration/spec.yaml index a875b52e8ad80..f74cdcc8eb984 100644 --- a/spark/assets/configuration/spec.yaml +++ b/spark/assets/configuration/spec.yaml @@ -80,6 +80,30 @@ files: type: boolean example: true - template: instances/http + overrides: + auth_token.description: | + This allows for the use of authentication information from dynamic sources. + Both a reader and writer must be configured. + + The available readers are: + + - type: file + path (required): The absolute path for the file to read from. + pattern: A regular expression pattern with a single capture group used to find the + token rather than using the entire file, for example: Your secret is (.+) + + - type: dcos_auth + login_url (required): DC/OS login endpoint + service_account (required): The DC/OS service account to authenticate. + private_key_path (required): The absolute path for the DC/OS service account. + expiration: Token expiration in seconds, defaults to 300 (5 min). + + The available writers are: + + - type: header + name (required): The name of the field, for example: Authorization + value: The template value, for example `Bearer `. The default is: + placeholder: The substring in `value` to replace by the token, defaults to: - template: instances/default - template: logs example: diff --git a/spark/datadog_checks/spark/data/conf.yaml.example b/spark/datadog_checks/spark/data/conf.yaml.example index ee38b1ca8f05c..b12ccd8ba12c1 100644 --- a/spark/datadog_checks/spark/data/conf.yaml.example +++ b/spark/datadog_checks/spark/data/conf.yaml.example @@ -258,6 +258,12 @@ instances: ## pattern: A regular expression pattern with a single capture group used to find the ## token rather than using the entire file, for example: Your secret is (.+) ## + ## - type: dcos_auth + ## login_url (required): DC/OS login endpoint + ## service_account (required): The DC/OS service account to authenticate. + ## private_key_path (required): The absolute path for the DC/OS service account. + ## expiration: Token expiration in seconds, defaults to 300 (5 min). + ## ## The available writers are: ## ## - type: header diff --git a/spark/setup.py b/spark/setup.py index 9763fe7edd4e4..7196dce630dff 100644 --- a/spark/setup.py +++ b/spark/setup.py @@ -27,7 +27,7 @@ def get_dependencies(): return f.readlines() -CHECKS_BASE_REQ = 'datadog-checks-base>=11.0.0' +CHECKS_BASE_REQ = 'datadog-checks-base>=15.1.0' setup( name='datadog-spark',