Skip to content

Commit b95cd9f

Browse files
m0dularm0dular
committed
Make file-sync metrics configurable
This commit adds $include_pe_metrics to the defined types and templates to allow for configuring whether we want to include file sync metrics.
1 parent 7991a2e commit b95cd9f

13 files changed

+78
-11
lines changed

‎manifests/telegraf/agent.pp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@
349349
protocol => $protocol,
350350
http_timeout_seconds => $http_timeout_seconds,
351351
template_format => $template_format,
352+
include_pe_metrics => $include_pe_metrics,
352353
}
353354
}
354355
@@ -358,6 +359,7 @@
358359
protocol => $protocol,
359360
http_timeout_seconds => $http_timeout_seconds,
360361
template_format => $template_format,
362+
include_pe_metrics => $include_pe_metrics,
361363
}
362364
}
363365
@@ -367,6 +369,7 @@
367369
protocol => $protocol,
368370
http_timeout_seconds => $http_timeout_seconds,
369371
template_format => $template_format,
372+
include_pe_metrics => $include_pe_metrics,
370373
}
371374
}
372375
@@ -413,6 +416,7 @@
413416
protocol => $protocol,
414417
http_timeout_seconds => $http_timeout_seconds,
415418
template_format => $template_format,
419+
include_pe_metrics => $include_pe_metrics,
416420
}
417421
}
418422
}
@@ -429,6 +433,7 @@
429433
protocol => $protocol,
430434
http_timeout_seconds => $http_timeout_seconds,
431435
template_format => $template_format,
436+
include_pe_metrics => $include_pe_metrics,
432437
}
433438
}
434439
@@ -438,13 +443,15 @@
438443
protocol => $protocol,
439444
http_timeout_seconds => $http_timeout_seconds,
440445
template_format => $template_format,
446+
include_pe_metrics => $include_pe_metrics,
441447
}
442448
if $include_pe_metrics {
443449
puppet_operational_dashboards::telegraf::config { 'pcp':
444450
hosts => ["${trusted['certname']}:${pcp_port}"],
445451
protocol => $protocol,
446452
http_timeout_seconds => $http_timeout_seconds,
447453
template_format => $template_format,
454+
include_pe_metrics => $include_pe_metrics,
448455
}
449456
}
450457
}
@@ -455,6 +462,7 @@
455462
protocol => $protocol,
456463
http_timeout_seconds => $http_timeout_seconds,
457464
template_format => $template_format,
465+
include_pe_metrics => $include_pe_metrics,
458466
}
459467
}
460468

‎manifests/telegraf/config.pp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
# Timeout for HTTP Telegraf inputs. Might be usefull in huge environments with slower API responses
1212
# @param template_format
1313
# Template format to use for puppet template toml or yaml config
14+
# @param include_pe_metrics
15+
# Whether to include Filesync metrics in Puppetserver
1416
define puppet_operational_dashboards::telegraf::config (
1517
Array[String[1]] $hosts,
1618
Enum['https', 'http'] $protocol,
1719
Integer[1] $http_timeout_seconds,
1820
String $service = $title,
1921
Enum['present', 'absent'] $ensure = 'present',
2022
Enum['yaml','toml'] $template_format = 'toml',
23+
Boolean $include_pe_metrics,
2124
) {
2225
unless $service in ['puppetserver', 'puppetdb', 'puppetdb_jvm', 'orchestrator', 'pcp'] {
2326
fail("Unknown service type ${service}")
@@ -43,7 +46,7 @@
4346

4447
$inputs = epp(
4548
"puppet_operational_dashboards/${service}_metrics.${template_format}.epp",
46-
{ urls => $urls, protocol => $protocol, http_timeout_seconds => $http_timeout_seconds }
49+
{ urls => $urls, protocol => $protocol, http_timeout_seconds => $http_timeout_seconds, include_pe_metrics => $include_pe_metrics }
4750
)
4851

4952
$_inputs = $template_format ? {

‎spec/defines/puppet_operational_dashboards_telegraf_config_spec.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
protocol: 'https',
1010
http_timeout_seconds: 5,
1111
hosts: ['localhost.foo.com'],
12+
include_pe_metrics: true,
1213
}
1314
end
1415

@@ -135,6 +136,7 @@
135136
protocol: 'http',
136137
http_timeout_seconds: 5,
137138
hosts: ['localhost.foo.com'],
139+
include_pe_metrics: true,
138140
}
139141
end
140142

‎templates/orchestrator_metrics.toml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert = "/etc/telegraf/puppet_cert.pem"
49
tls_key = "/etc/telegraf/puppet_key.pem"

‎templates/orchestrator_metrics.yaml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert: "/etc/telegraf/puppet_cert.pem"
49
tls_key: "/etc/telegraf/puppet_key.pem"

‎templates/pcp_metrics.toml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert = "/etc/telegraf/puppet_cert.pem"
49
tls_key = "/etc/telegraf/puppet_key.pem"

‎templates/pcp_metrics.yaml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert: "/etc/telegraf/puppet_cert.pem"
49
tls_key: "/etc/telegraf/puppet_key.pem"

‎templates/puppetdb_jvm_metrics.toml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert = "/etc/telegraf/puppet_cert.pem"
49
tls_key = "/etc/telegraf/puppet_key.pem"

‎templates/puppetdb_jvm_metrics.yaml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert: /etc/telegraf/puppet_cert.pem
49
tls_key: /etc/telegraf/puppet_key.pem

‎templates/puppetdb_metrics.toml.epp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<%- | Array[String] $urls, Enum['https', 'http'] $protocol, Integer[1] $http_timeout_seconds | -%>
1+
<%- |
2+
Array[String] $urls,
3+
Enum['https', 'http'] $protocol,
4+
Integer[1] $http_timeout_seconds,
5+
Boolean $include_pe_metrics,
6+
| -%>
27
<% if $protocol == 'https' { -%>
38
tls_cert = "/etc/telegraf/puppet_cert.pem"
49
tls_key = "/etc/telegraf/puppet_key.pem"

0 commit comments

Comments
 (0)