From a81f04f3499295558f7de8b486b39f96573b98ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=BCller?= Date: Fri, 27 May 2016 10:00:01 +0200 Subject: [PATCH] added statsite_prefix and newly introduced (in 0.6.4) nested object telemetry --- libraries/consul_config.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb index d60df00d..9fe8dc69 100644 --- a/libraries/consul_config.rb +++ b/libraries/consul_config.rb @@ -84,6 +84,8 @@ class ConsulConfig < Chef::Resource attribute(:start_join_wan, kind_of: Array) attribute(:statsd_addr, kind_of: String) attribute(:statsite_addr, kind_of: String) + attribute(:statsite_prefix, kind_of: String) + attribute(:telemetry, kind_of: [Hash, Mash]) attribute(:syslog_facility, kind_of: String) attribute(:translate_wan_addrs, equal_to: [true, false], default: false) attribute(:ui, equal_to: [true, false], default: false) @@ -97,7 +99,7 @@ class ConsulConfig < Chef::Resource # Transforms the resource into a JSON format which matches the # Consul service's configuration format. def to_json - for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recursor recursors retry_interval retry_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr syslog_facility translate_wan_addrs ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} + for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recursor recursors retry_interval retry_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr statsite_prefix telemetry syslog_facility translate_wan_addrs ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} for_keeps << %i{ca_file cert_file key_file} if tls? for_keeps = for_keeps.flatten