cheftacular 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c20403e9a06c24107c229161f34ed5ae10eb2360
-  data.tar.gz: e9edf5b27994a98c4dbbc5aa07eab3907d5303ab
+  metadata.gz: 29520ff1bae99c83bce312f6f5f582505776a007
+  data.tar.gz: 7f79d595110a8850083c5314671129d08709560b
 SHA512:
-  metadata.gz: e1a81ce225e84ab00701c15cee3d7cc5c519134795b4b382f55e4e9a4c8a59183d934cecc85e8afdedd2e49dafc80e1913da1e480cf4631f2e67836724001877
-  data.tar.gz: 294dda1dc967aca367b832dcee99e6a2b5dac916b4ae877af379727ad9f71c3f5f7ad649701c60a6a075eb7b5d62519895f7f3ac2de9c61f774660e9d54cdc2e
+  metadata.gz: a52cf49de433628aab008679c6df07a7f42a9ca290f7895ee2e780a21db5481be3cefc09c9887981b9b4c089c7a1e8b418fb5bfc123102cd81fa5965c77999ef
+  data.tar.gz: cb443b1cc185d8ce16f4987415b396f8eb14473f9d66615612cfea10daab85972c38b8ce43c4a59390ebbc5339be8f6e7ecc052db81d8af33e295fcdf0e39f1f

data/lib/cheftacular/chef/data_bag.rb

@@ -37,7 +37,7 @@ class Cheftacular
       rescue Ridley::Errors::HTTPRequestEntityTooLarge => e
         puts "WARNING! #{ e }! The logs from this run will not be saved on the chef server. Wiping the bag so future runs can be saved."
 
-        item.attributes = {id: 'logs', description: "store logs for an environment"}
+        item.attributes = @config[env]['logs_bag_hash'].keep_if {|key,val| key == 'id'}
 
         item.save
 

data/lib/cheftacular/dns.rb

@@ -25,7 +25,7 @@ class Cheftacular
 
       cloudflare_records_hash = fetch_cloudflare_records_as_hash target_domain
 
-      puts('#'.ljust(4) + 'subdomain'.ljust(50) + 'type'.ljust(6) + 'ttl'.ljust(5) + 'mode'.ljust(20) + 'value') unless @options['quiet']
+      puts('#'.ljust(4) + 'subdomain'.ljust(50) + 'type'.ljust(6) + 'ttl'.ljust(5) + 'cloudflare_on ' + 'mode'.ljust(20) + 'value') unless @options['quiet']
 
       domain_count = 1
 
@@ -36,7 +36,12 @@ class Cheftacular
           record_hash['activate_cloudflare'] = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['cloudflare_activated_domains'].include?(record_hash['name'])
         end
 
-        print(domain_count.to_s.ljust(4, '_') + record_hash['name'].ljust(50, '_') + record_hash['type'].ljust(6, '_') + record_hash['ttl'].to_s.ljust(5, '_'))
+        print(domain_count.to_s.ljust(4, '_') + 
+          record_hash['name'].ljust(50, '_') + 
+          record_hash['type'].ljust(6, '_') + 
+          record_hash['ttl'].to_s.ljust(5, '_') + 
+          record_hash['activate_cloudflare'].to_s.ljust(14, '_')
+        )
 
         if cloudflare_records_hash.has_key?("#{ record_hash['name'] }-#{ record_hash['type'] }") && ( !cloudflare_records_hash["#{ record_hash['name'] }-#{ record_hash['type'] }"].empty? ||
           cloudflare_record_does_include_value?(cloudflare_records_hash["#{ record_hash['name'] }-#{ record_hash['type'] }"], record_hash['value']) )
@@ -57,7 +62,7 @@ class Cheftacular
             record_hash['SRV_weight'],
             record_hash['SRV_port'],
             record_hash['SRV_target'],
-            (record_hash['activate_cloudflare'] ? '1' : '0') #service_mode
+            (record_hash['activate_cloudflare'] ? 1 : 0) #service_mode
           )
 
           print 'create'.ljust(20, '_')
@@ -72,7 +77,8 @@ class Cheftacular
     end
 
     def create_dns_record_for_domain_from_address_hash domain, address_hash, *args
-      domain_obj = PublicSuffix.parse domain
+      domain_obj   = PublicSuffix.parse("#{ address_hash['name'] }.#{ domain }") if args.empty?
+      domain_obj ||= PublicSuffix.parse domain
 
       if args.include?('specific_domain_mode')
         puts("running cloud domain create_record:#{ domain_obj.domain }:#{ domain_obj.trd }:#{ address_hash['public'] }") if @options['verbose']
@@ -121,7 +127,9 @@ class Cheftacular
           'ttl'   => 300
         }
 
-        update_cloudflare_from_array_of_domain_hashes domain_obj.tld, target_domain_records
+        #ap target_domain_records
+
+        update_cloudflare_from_array_of_domain_hashes domain_obj.domain, target_domain_records
       end
     end
 
@@ -257,7 +265,7 @@ class Cheftacular
       else
         print 'edit'.ljust(20, '_')
 
-        @config['cloudflare'].rec_edit(target_domain, record_hash['type'], possible_matches[0]['rec_id'], record_hash['name'], record_hash['value'], record_hash['ttl'])
+        @config['cloudflare'].rec_edit(target_domain, record_hash['type'], possible_matches[0]['rec_id'], record_hash['name'], record_hash['value'], record_hash['ttl'], record_hash['activate_cloudflare'])
       end
     end
 

data/lib/cheftacular/initializer.rb

@@ -296,7 +296,7 @@ class Cheftacular
 
       @config['ridley'] = Ridley.new(
         server_url:                @config['cheftacular']['chef_server_url'],
-        client_name:               (@config['helper'].running_on_chef_node? ? @config['parser'].parse_node_name_from_client_file : @config['cheftacular']['cheftacular_chef_user']),
+        client_name:               (@config['helper'].running_on_chef_node? ? @config['helper'].parse_node_name_from_client_file : @config['cheftacular']['cheftacular_chef_user']),
         client_key:                File.expand_path("#{ @config['locs']['chef'] }/#{ @config['helper'].running_on_chef_node? ? 'client' : @config['cheftacular']['cheftacular_chef_user'] }.pem"),
         encrypted_data_bag_secret: @config['data_bag_secret'],
         ssl:                       { verify: @config['cheftacular']['ssl_verify'] == 'true' }

data/lib/cheftacular/stateless_actions/get_shorewall_allowed_connections.rb

@@ -2,7 +2,7 @@ class Cheftacular
   class StatelessActionDocumentation
     def get_shorewall_allowed_connections
       @config['documentation']['stateless_action'] <<  [
-        "`cft get_shorewall_allowed_connections` command will query a single server and return all of its ACCEPT connections " +
+        "`[NYI]cft get_shorewall_allowed_connections` command will query a single server and return all of its ACCEPT connections " +
         "from shorewall in it's syslog and return the results in a CSV format. Useful for tracking IP activity.",
 
         [
@@ -14,12 +14,8 @@ class Cheftacular
 
   class StatelessAction
     def get_shorewall_allowed_connections
+      raise "Not yet implemented"
       #TODO find and load syslog files from nodes!
-      log_data << File.read(File.expand_path("#{ @locs['chef-log'] }/marketing_site_syslog_2.txt"))
-      log_data << File.read(File.expand_path("#{ @locs['chef-log'] }/marketing_site_syslog_1.txt"))
-      log_data << File.read(File.expand_path("#{ @locs['chef-log'] }/marketing_site_syslog.txt"))
-
-      exit
 
       addresses = {}
 

data/lib/cheftacular/stateless_actions/replication_status.rb

@@ -51,7 +51,7 @@ class Cheftacular
         out << "#{ serv_name }:"
 
         output.join("\n").split("\n").each do |line|
-          out << "  #{ line }"
+          out << "  #{ line }\n"
         end
 
         out << "\n"
@@ -70,6 +70,21 @@ module SSHKit
 
         psql_commands = [
           "select client_addr, state, sent_location, write_location, flush_location, replay_location, sync_priority from pg_stat_replication;",
+          %{
+            SELECT
+                client_addr,
+                sent_offset - (
+                    replay_offset - (sent_xlog - replay_xlog) * 255 * 16 ^ 6 ) AS byte_lag
+            FROM (
+                SELECT
+                    client_addr,
+                    ('x' || lpad(split_part(sent_location,   '/', 1), 8, '0'))::bit(32)::bigint AS sent_xlog,
+                    ('x' || lpad(split_part(replay_location, '/', 1), 8, '0'))::bit(32)::bigint AS replay_xlog,
+                    ('x' || lpad(split_part(sent_location,   '/', 2), 8, '0'))::bit(32)::bigint AS sent_offset,
+                    ('x' || lpad(split_part(replay_location, '/', 2), 8, '0'))::bit(32)::bigint AS replay_offset
+                FROM pg_stat_replication
+            ) AS s;
+          } #http://www.dansketcher.com/2013/01/27/monitoring-postgresql-streaming-replication/
         ]
 
         psql_commands.each do |cmnd|

data/lib/cheftacular/stateless_actions/{update_cloudflare.rb → update_cloudflare_dns_from_cloud.rb}

@@ -2,7 +2,7 @@ class Cheftacular
   class StatelessActionDocumentation
     def update_cloudflare_dns_from_cloud
       @config['documentation']['stateless_action'] <<  [
-        "`cft update_cloudflare_dns_from_cloud` command will force a full dns update for cloudflare. ",
+        "`cft update_cloudflare_dns_from_cloud [skip_update_tld]` command will force a full dns update for cloudflare. ",
 
         [
           "    1. It will ensure all the subdomain entries are correct (based on the contents of the addresses data bag) " +
@@ -10,7 +10,10 @@ class Cheftacular
           "does exist and point it to the correct private address for an environment.",
 
           "    2. This command will also ensure any dns records on your cloud are also migrated over to cloudflare as well. " +
-          "This also includes the reverse in the event you would like to turn off cloudflare."
+          "This also includes the reverse in the event you would like to turn off cloudflare.",
+
+          "    3. The argument `skip_update_tld` will stop the long process of checking and updating all the server domains " +
+          "_before_ cloudflare is updated. Only skip if you believe your domain info on your cloud is accurate."
         ]
       ]
     end
@@ -22,7 +25,7 @@ class Cheftacular
 
       target_domain = @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld']
 
-      @config['stateless_action'].update_tld 'self'
+      @config['stateless_action'].update_tld 'self' unless ARGV[1] == 'skip_update_tld'
 
       target_domain_records = @config['stateless_action'].cloud('domain', "read:#{ target_domain }")["records_for_#{ target_domain }"]
 

data/lib/cheftacular/stateless_actions/update_tld.rb

@@ -51,7 +51,7 @@ class Cheftacular
 
         @config['DNS'].compile_address_hash_for_server_from_options("set_specific_domain_name:#{ specific_domain }")
 
-        sleep 5 #prepare for next domain
+        sleep 1 #prepare for next domain
       end
 
       @config[@options['env']]['config_bag_hash'][@options['sub_env']]['tld'] = target_tld

data/lib/cheftacular/version.rb

@@ -1,5 +1,5 @@
 class Cheftacular
   #major_version.minor_version.bugfixes
-  VERSION      = "2.2.1"
+  VERSION      = "2.2.2"
   RUBY_VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -242,7 +242,6 @@ files:
 - lib/cheftacular/action.rb
 - lib/cheftacular/actions/check.rb
 - lib/cheftacular/actions/console.rb
-- lib/cheftacular/actions/database.rb
 - lib/cheftacular/actions/db_console.rb
 - lib/cheftacular/actions/deploy.rb
 - lib/cheftacular/actions/log.rb
@@ -306,7 +305,7 @@ files:
 - lib/cheftacular/stateless_actions/service.rb
 - lib/cheftacular/stateless_actions/slack.rb
 - lib/cheftacular/stateless_actions/test_env.rb
-- lib/cheftacular/stateless_actions/update_cloudflare.rb
+- lib/cheftacular/stateless_actions/update_cloudflare_dns_from_cloud.rb
 - lib/cheftacular/stateless_actions/update_split_branches.rb
 - lib/cheftacular/stateless_actions/update_tld.rb
 - lib/cheftacular/stateless_actions/upload_nodes.rb

data/lib/cheftacular/actions/database.rb

@@ -1,13 +0,0 @@
-class Cheftacular
-  class ActionDocumentation
-    def database
-
-    end
-  end
-
-  class Action
-    def database
-      #TODO allow checking of postgres settings
-    end
-  end
-end