Skip to content
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

Add configuration options to the terminus to filter facts out #2634

Open
wants to merge 1 commit into
base: 6.x
Choose a base branch
from
Open

Add configuration options to the terminus to filter facts out #2634

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
12 changes: 12 additions & 0 deletions puppet/lib/puppet/indirector/facts/puppetdb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ def save(request)
package_inventory = inventory['packages'] if inventory.respond_to?(:keys)
facts.values.delete('_puppet_inventory_1')

fact_names_blacklist = Puppet::Util::Puppetdb.config.fact_names_blacklist

fact_names_blacklist.each{|blacklisted_fact_name|
facts.values.delete(blacklisted_fact_name)
}

fact_names_blacklist_regexps = Puppet::Util::Puppetdb.config.fact_names_blacklist_regex

fact_names_blacklist_regexps.each{|blacklisted_fact_name_regexp_str|
facts.values.reject!{|k,v| k =~ Regexp.new(blacklisted_fact_name_regexp_str)}
}

payload_value = {
"certname" => facts.name,
"values" => facts.values,
Expand Down
24 changes: 20 additions & 4 deletions puppet/lib/puppet/util/puppetdb/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ def self.load(config_file = nil)
:server_url_timeout => 30,
:include_unchanged_resources => false,
:min_successful_submissions => 1,
:submit_only_server_urls => "",
:command_broadcast => false,
:sticky_read_failover => false
:submit_only_server_urls => "",
:command_broadcast => false,
:sticky_read_failover => false,
:fact_names_blacklist => "",
:fact_names_blacklist_regex => ""
}

config_file ||= File.join(Puppet[:confdir], "puppetdb.conf")
Expand Down Expand Up @@ -67,7 +69,9 @@ def self.load(config_file = nil)
:min_successful_submissions,
:submit_only_server_urls,
:command_broadcast,
:sticky_read_failover].include?(k))
:sticky_read_failover,
:fact_names_blacklist,
:fact_names_blacklist_regex].include?(k))
end

parsed_urls = config_hash[:server_urls].split(",").map {|s| s.strip}
Expand Down Expand Up @@ -102,6 +106,10 @@ def self.load(config_file = nil)
"or equal to the number of server_urls (#{config_hash[:server_urls].length})"
end

config_hash[:fact_names_blacklist] = config_hash[:fact_names_blacklist].split(",").map {|s| s.strip}

config_hash[:fact_names_blacklist_regex] = config_hash[:fact_names_blacklist_regex].split(",").map {|s| s.strip}

self.new(config_hash)
rescue => detail
Puppet.warning "Could not configure PuppetDB terminuses: #{detail}"
Expand Down Expand Up @@ -147,6 +155,14 @@ def sticky_read_failover
config[:sticky_read_failover]
end

def fact_names_blacklist
config[:fact_names_blacklist]
end

def fact_names_blacklist_regex
config[:fact_names_blacklist_regex]
end

# @!group Private instance methods

# @!attribute [r] count
Expand Down