Skip to content

Allow Configuration of Puppet Reports URL #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkabrda merged 1 commit into from
May 24, 2022
Merged

Allow Configuration of Puppet Reports URL #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
# Note: this is not for Puppet Report Tags. See report_trusted_fact_tags
# $puppet_run_reports
# Will send results from your puppet agent runs back to the datadog service.
# $reports_url
# The URL to use when sending puppet run reports. Default: https://api.${datadog_site}
# $manage_dogapi_gem
# When reports are enabled, ensure the dogapi gem (required) is installed.
# $puppetmaster_user
Expand Down Expand Up @@ -262,6 +264,7 @@
Array $facts_to_tags = [],
Array $trusted_facts_to_tags = [],
Boolean $puppet_run_reports = false,
String $reports_url = "https://api.${datadog_site}",
String $puppetmaster_user = $settings::user,
String $puppet_gem_provider = $datadog_agent::params::gem_provider,
Boolean $non_local_traffic = false,
Expand Down Expand Up @@ -809,7 +812,7 @@

class { 'datadog_agent::reports':
api_key => $api_key,
datadog_site => $datadog_site,
datadog_site => $reports_url,
manage_dogapi_gem => $manage_dogapi_gem,
puppet_gem_provider => $puppet_gem_provider,
dogapi_version => $datadog_agent::params::dogapi_version,
Expand Down
4 changes: 3 additions & 1 deletion manifests/reports.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# Parameters:
# $api_key:
# Your DataDog API Key. Please replace with your key value
# $datadog_site:
# URL to use to talk to the Datadog API
#
# Actions:
#
Expand All @@ -23,7 +25,7 @@
$proxy_https = undef,
$report_fact_tags = [],
$report_trusted_fact_tags = [],
$datadog_site = 'datadoghq.com',
$datadog_site = 'https://api.datadoghq.com',
$puppet_gem_provider = $datadog_agent::params::gem_provider,
) inherits datadog_agent::params {

Expand Down
2 changes: 1 addition & 1 deletion templates/datadog-reports.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

---
:datadog_api_key: '<%= @api_key %>'
:api_url: https://api.<%= @datadog_site %>
:api_url: <%= @datadog_site %>
<% if @hostname_extraction_regex -%>
:hostname_extraction_regex: '<%= @hostname_extraction_regex %>'
<% end -%>
Expand Down
⚡