diff --git a/Puppetfile b/Puppetfile
index 9475ad2..c0de1ee 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -17,7 +17,7 @@ mod 'ncsa/profile_allow_ssh_from_bastion', tag: 'v0.2.1', git: 'https://github.c
 mod 'ncsa/profile_dns_cache', tag: 'v1.0.0', git: 'https://github.com/ncsa/puppet-profile_dns_cache'
 # mod 'ncsa/profile_email', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_email'
 mod 'ncsa/profile_firewall', tag: 'v1.0.1', git: 'https://github.com/ncsa/puppet-profile_firewall'
-mod 'ncsa/profile_monitoring', tag: 'v0.1.4', git: 'https://github.com/ncsa/puppet-profile_monitoring'
+mod 'ncsa/profile_monitoring', tag: 'v0.1.5', git: 'https://github.com/ncsa/puppet-profile_monitoring'
 mod 'ncsa/profile_motd', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_motd'
 mod 'ncsa/profile_pam_access', tag: 'v0.0.4', git: 'https://github.com/ncsa/puppet-profile_pam_access'
 mod 'ncsa/profile_puppet_master', tag: 'v0.1.1', git: 'https://github.com/ncsa/puppet-profile_puppet_master'
diff --git a/data/common.yaml b/data/common.yaml
index f63c88c..c85ca34 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1,5 +1,13 @@
 ---
 lookup_options:
+  profile_monitoring::telegraf::inputs_extra:
+    merge:
+      strategy: "deep"
+      merge_hash_arrays: true
+  profile_monitoring::telegraf::input_extra_scripts:
+    merge:
+      strategy: "deep"
+      merge_hash_arrays: true
   profile_monitoring::telegraf::outputs:
     merge:
       strategy: "deep"
@@ -308,6 +316,7 @@ telegraf::agent:
   flush_interval: "10s"
   metric_buffer_limit: "100000"
 telegraf::flush_jitter: "10s"
+telegraf::hostname: "%{::fqdn}"
 telegraf::inputs:
   cpu:
     percpu: false
diff --git a/site-modules/role/manifests/puppet_master.pp b/site-modules/role/manifests/puppet_master.pp
index 24ab82f..1d53b49 100644
--- a/site-modules/role/manifests/puppet_master.pp
+++ b/site-modules/role/manifests/puppet_master.pp
@@ -5,5 +5,7 @@ class role::puppet_master {
   include ::profile::base
   include ::profile_puppet_master
   include ::profile_monitoring::telegraf_ping_check
+  include ::profile_monitoring::telegraf_sslcert_check
+  include ::profile_monitoring::telegraf_website_check
 
 }