Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ then it is safe to upgrade.

* [FEATURE] Support EU site in the reporter. See [#468][]
* [FEATURE] Add `datadog_site` for EU/USA region support. See [#464][]
* [FEATURE] Add `agent_flavor` for selecting the IoT agent.
* [FEATURE] Make Agent 6 `cmd_port` configurable. See [#473][] (Thanks [@arkpoah][])
* [FEATURE] Support backup keyservers. See [#470][]
* [FEATURE] Support `hostname_fqdn`. See [#481][] (Thanks [@alexfouche][])
Expand Down Expand Up @@ -925,4 +926,4 @@ Please read the [docs]() for more details.
[@yrcjaya]: https://github.com/yrcjaya
[@zabacad]: https://github.com/zabacad
[@zickzackv]: https://github.com/zickzackv
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson
[@zoom-kris-anderson]: https://github.com/zoom-kris-anderson
3 changes: 3 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# This option is only available with agent version >= 6.6.0.
# $host:
# Force the hostname to whatever you want. (default: auto-detected)
# $agent_flavor:
# Change the flavor of the Datadog agent to the IOT agent. (default: datadog-agent)
# $api_key:
# Your DataDog API Key. Please replace with your key value.
# $collect_ec2_tags
Expand Down Expand Up @@ -242,6 +244,7 @@
String $datadog_site = $datadog_agent::params::datadog_site,
String $host = '',
String $api_key = 'your_API_key',
String $agent_flavor = $datadog_agent::params::agent_flavor,
Boolean $collect_ec2_tags = false,
Boolean $collect_gce_tags = false,
Boolean $collect_instance_metadata = true,
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#

class datadog_agent::params {
$agent_flavor = 'datadog-agent'
$datadog_site = 'datadoghq.com'
$dd_groups = undef
$default_agent_major_version = 7
Expand Down
1 change: 1 addition & 0 deletions manifests/reports.pp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#
class datadog_agent::reports(
$api_key,
$agent_flavor = 'datadog-agent',
$puppetmaster_user,
$dogapi_version,
$manage_dogapi_gem = true,
Expand Down
4 changes: 4 additions & 0 deletions spec/classes/datadog_agent_reports_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
context 'all supported operating systems' do
let(:params) do
{
agent_flavor: 'datadog-agent',
api_key: 'notanapikey',
puppetmaster_user: 'puppet',
dogapi_version: 'installed',
Expand Down Expand Up @@ -115,6 +116,7 @@
context 'specific gem provider' do
let(:params) do
{
agent_flavor: 'datadog-agent',
api_key: 'notanapikey',
puppetmaster_user: 'puppet',
dogapi_version: '1.2.2',
Expand Down Expand Up @@ -153,6 +155,7 @@
context 'EU site in report' do
let(:params) do
{
agent_flavor: 'datadog-agent',
api_key: 'notanapikey',
puppetmaster_user: 'puppet',
dogapi_version: 'installed',
Expand Down Expand Up @@ -194,6 +197,7 @@
context 'disabled ruby-manage' do
let(:params) do
{
agent_flavor: 'datadog-agent',
api_key: 'notanapikey',
hostname_extraction_regex: nil,
dogapi_version: 'installed',
Expand Down