From 044a9cee7431378929cd95789f80f348b517435a Mon Sep 17 00:00:00 2001 From: Bill Glick Date: Fri, 5 Mar 2021 09:06:23 -0600 Subject: [PATCH] ASDPLNG-29: Update ncsa/puppet-profile_monitoring Move parameters to control repo update module ncsa/profile_monitoring to tag v0.1.3 --- Puppetfile | 2 +- data/common.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 4e891df..b775d3b 100644 --- a/Puppetfile +++ b/Puppetfile @@ -16,7 +16,7 @@ mod 'ncsa/profile_allow_ssh_from_bastion', tag: 'v0.2.1', git: 'https://github.c # mod 'ncsa/profile_chrony', tag: 'v0.1.0', git: 'https://github.com/ncsa/puppet-profile_chrony' # 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.0', git: 'https://github.com/ncsa/puppet-profile_monitoring' +mod 'ncsa/profile_monitoring', tag: 'v0.1.3', 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.0', git: 'https://github.com/ncsa/puppet-profile_puppet_master' diff --git a/data/common.yaml b/data/common.yaml index 4416e89..f63c88c 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -1,4 +1,18 @@ --- +lookup_options: + profile_monitoring::telegraf::outputs: + merge: + strategy: "deep" + merge_hash_arrays: true + +anchors: + - &telegraf_outputs_influxdb_common + database: "" + username: "" + password: "" + insecure_skip_verify: false + skip_database_creation: true + message: "This node is using common data" profile::sssd::enablemkhomedir: true @@ -12,6 +26,18 @@ profile_allow_ssh_from_bastion::groups: - org_asd - org_irst +profile_monitoring::telegraf::enabled: false +profile_monitoring::telegraf::outputs: + influxdb: + npcf-influxdb-collector: + <<: *telegraf_outputs_influxdb_common + urls: + - "https://npcf-influxdb.ncsa.illinois.edu:8086" + ncsa-influxdb-collector: + <<: *telegraf_outputs_influxdb_common + urls: + - "https://ncsa-influxdb.ncsa.illinois.edu:8086" + profile_sudo::configs: common_disabled_users: priority: 1