cheftacular 2.12.1 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beb5fbd1287af65d3d6bb6cc57548ebfd4dfcdc6
-  data.tar.gz: 49b01ae599af945412cfa5e192f10099fdc9b54c
+  metadata.gz: c17eeab4b20203f67317841f8f8bfbef7b0d63ae
+  data.tar.gz: b890661e40949e1b6588298e363899ad4b54445d
 SHA512:
-  metadata.gz: c838c68b82fc04160920297b30ac80ccef096d18254c9eedb76f15014b9d789edeea667ecd42108e8064ff3d36ac5a08ee4c248be7a63490856cc141c4a3a232
-  data.tar.gz: 57709f757fc71defb4224104a4b95940287a45ac292df54f3337ffbf6c83067d3f225d0eec3082bd6e320e10e838b6a8a62f6041f0482467ea9aa1124ff912ae
+  metadata.gz: 1c89fe7d7a292a2490e8c4f86a7d4d0485dcb37b3a7729e7bad0d35d67df6f5a14b6e98708304060e099d945a2e0d01fe5a203d944a3e406e6f4221752aad44c
+  data.tar.gz: a5e6ced3e2072ff71c093267bb665af25dfc20b3bd1a07d73ed57f589a11cab9469615af6021a2e2e581eb36391c37211647fb4d596da7db986d3eaacccaa03d

data/lib/cheftacular/README.md

@@ -7,66 +7,6 @@
 3. [DevOps Commands](https://github.com/SocialCentivPublic/cheftacular/blob/master/lib/cheftacular/README.md#commands-that-can-only-be-run-in-the-devops-context)
 
 
-## Arguments and flags for cheftacular
-
-### Environment flags
-
-1.  `-d|--dev-remote` toggles on dev-remote mode. Commands passed to cft will hit the devremote server(s) instead of the default server(s)
-
-2.  `--env ENV` sets the environment commands hit to one you specify instead of the default one.
-
-3.  `-p|--prod` toggles on production mode. Commands passed to cft will hit the production server(s) instead of the default server(s)
-
-4.  `-Q|--qa` toggles on QA mode. Commands passed to cft will hit the QA server(s) instead of the default server(s)
-
-5.  `-s|--staging` toggles on staging mode. Commands passed to cft will hit the staging server(s) instead of the default server(s)
-
-6.  `--split-env SPLIT_ENV_NAME` sets the sub-environment to SPLIT_ENV_NAME. This only slightly affects certain commands.
-
-7.  `-t|--test` toggles on test mode. Commands passed to cft will hit the test server(s) instead of the default server(s)
-
-### General Flags
-
-1.  `-a|--address ADDRESS` will force the command to only run against the specified address if it belongs to a node
-
-2.  `-D|--debug` toggles on extremely verbose logging. Chef-client runs will generate ~10 times the amounts of logs including any additional effects that the `-v` flag will activate
-
-3. `--no-logs` will make the cft commands not generate log files, you must still specify `-v` if you want output of most verbose commands to your terminal.
-
-4.  `-n|--node-name NODE_NAME` will force the command to only run against the specified name if it belongs to a node
-
-5.  `-q|--quiet` will make the cft commands only output information that is a direct result of the command being run
-
-6.  `-r|--role-name ROLE_NAME` will force the command to only run against the specified role if it exists (this argument is generally not needed though it can be used to deploy a codebase for an application you're not currently cd'd into when running this as a gem)
-
-7.  `-R|--repository NAME` will make the command run against a specific repository or context (automatically set for application mode)
-
-8.  `-s|--search-node-name NODE_NAME` option will make this command return results that INCLUDE the NODE_NAME.
-
-9.  `-S|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.
-
-10. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.
-
-11.  `-v|--verbose` toggles on verbose logging. All commands that write logs will also output to terminal AND write the logs.
-
-### Help Related
-
-1. `-h|--help` Displays the full readme and exits.
-
-### Action Flags
-
-1.  `-e|--except-role ROLE_NAME` will *prevent* any server with this role from being *deployed to* for the deploy command. Other commands will ignore this argument.
-
-2.  `-z|--unset-github-deploy-args` will unset a custom revision specified in the arg below and make the codebase utilize the default.
-
-3.  `-Z|--revision REVISION` will force the role you're deploying to to utilize the revision specified here. This can be a specific commit, a branch name or even a tag.
-
-    1. Note: The system does not check if the revision exists, if you pass a non-existent revision no one will be able to deploy to that role until -Z with a correction revision or -z is passed.
-
-4.  The `-O ORGANIZATION` flag can be used with TheCheftacularCookbook to set an *organization* your app can try deploying from, your git user needs access to these forks / organization(s).
-
-    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags.
-
 ## Arguments and flags for cheftacular
 
 ### Environment flags
@@ -168,17 +108,25 @@
 
     3. `sync` will sync your local cheftacular yaml keys ONTO the server's keys. Will send a slack notification if slack is configured (the slack notification contains the diffed keys). The sync only occurs if there are CHANGES to the file.
 
+    4. This command is aliased to `cc`
+
 5. `cft cheftacular_yml_help KEY` this commandallows you to get help on the meaning of each key in your cheftacular.yml overall config.
 
     1. This command can also by run with `cft yaml_help`.
 
     2. To examine nested keys, you can use colons inbetween the keys like cloud_authentication:rackspace:email
 
-6. `cft clear_caches` this command allows you to clear all of your local caches.
+6. `cft cleanup_logs [DIRECTORIES_TO_NOT_DELETE]` this command allows you to clear your local log files
+
+    1. By default, this command will delete all the cheftacular directories in your log folder.
+
+    2. This command supports a comma separated list of folders you don't want to delete.
+
+7. `cft clear_caches` this command allows you to clear all of your local caches.
 
     1. This command will force you to refetch all previously cached chef server data on the next `cft` run.
 
-7. `cft client_list` Allows you check the basic information for all the servers setup via chef. Shows the server's short name, its public ip address and roles (run_list) by default.
+8. `cft client_list` Allows you check the basic information for all the servers setup via chef. Shows the server's short name, its public ip address and roles (run_list) by default.
 
     1. `-v` option will make this command display the server's domain name, whether its password is stored on the chef server and what that password is.
 
@@ -190,17 +138,21 @@
 
     5. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.
 
-8. `cft console` will create a console session on the first node found for a repository.
+    6. This command is aliased to `cft clients` and `cft c`
+
+9. `cft console` will create a console session on the first node found for a repository.
 
     1. Attempts to setup a console for the unique stack, stacks currently supported for console is only Rails.
 
-9. `cft db_console` will create a database console session on the first node found for a database stack in the current environment.
+    2. If there is a node in the repository set that has the role `preferred_console`, this node will come before others.
+
+10. `cft db_console` will create a database console session on the first node found for a database stack in the current environment.
 
     1. This command is aliased to psql, typing `cft psql` will drop you into a rails stack database psql session.
 
     2. This command is also aliased to mongo, typing `cft mongo` will drop you into a mongodb mongo session.
 
-10. `cft deploy` will do a simple chef-client run on the servers for a role. Logs of the run itself will be sent to the local log directory in the application (or chef-repo) where the run was conducted.
+11. `cft deploy` will do a simple chef-client run on the servers for a role. Logs of the run itself will be sent to the local log directory in the application (or chef-repo) where the run was conducted.
 
     1.  The `-Z REVISION` flag can be used with TheCheftacularCookbook to set a revision your app will run. 
 
@@ -212,9 +164,9 @@
 
     5. The `-v|--verbose` option will cause failed deploys to output to the terminal window and to their normal log file. Useful for debugging.
 
-11. `cft disk_report` will fetch useful statistics from every server for every environment and output it into your log directory.
+12. `cft disk_report` will fetch useful statistics from every server for every environment and output it into your log directory.
 
-12. `cft environment boot|boot_without_deploy|destroy|destroy_raw_servers [SERVER_NAMES]` will boot / destroy the current environment
+13. `cft environment boot|boot_without_deploy|destroy|destroy_raw_servers [SERVER_NAMES]` will boot / destroy the current environment
 
     1. `boot` will spin up servers and bring them to a stable state. This includes setting up their subdomains for the target environment.
 
@@ -228,7 +180,7 @@
 
     6. This command also accepts a *comma delimited list* of server names to boot / destroy instead of all the stored ones for an environment.
 
-13. `cft file NODE_NAME LOCATION_ALIAS MODE FILE_NAME` interacts with a file on the remote server
+14. `cft file NODE_NAME LOCATION_ALIAS MODE FILE_NAME` interacts with a file on the remote server
 
     1. `LOCATION_ALIAS` will be parsed as a path if it has backslash characters. Otherwise it will be parsed from your location_aliases hash in your cheftacular.yml
 
@@ -244,7 +196,7 @@
 
         3. `edit:TEXT_EDITOR` will attempt to edit the file with the TEXT_EDITOR listed. NOTE! This editor must be installed on the node you're accessing. If the editor is not present via a `which` command, the cft file command will say so.
 
-        4. `fetch|scp` will attempt to fetch the FILE_NAME listed via SCP. This file is saved to /Users/mrlocus/Code/chef-repo/tmp (based on your directory structure) under the same FILE_NAME as the remote file.
+        4. `fetch|scp` will attempt to fetch the FILE_NAME listed via SCP. This file is saved to /Users/louis/Code/chef-repo/tmp (based on your directory structure) under the same FILE_NAME as the remote file.
 
             1. The deploy must have access to said file without sudo!
 
@@ -258,25 +210,29 @@
 
         1. `--save-to-file FILE_PATH` can also be used in the `fetch` context to specify where exactly to save the file and what to name it as.
 
-14. `cft fix_known_hosts [HOSTNAME]` this command will delete entries in your known_hosts file for all the servers that are in our system (ip addresses AND dns names)
+15. `cft fix_known_hosts [HOSTNAME]` this command will delete entries in your known_hosts file for all the servers that are in our system (ip addresses AND dns names)
 
     1. Passing in a hostname will make the command only remove entries with that hostname / ip specifically
 
-15. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
+16. `cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory.
+
+    1. This command runs on all servers in an environment by default
+
+17. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
 
     1. In devops mode, this command will not do anything without the -R repository passed.
 
-16. `cft get_log_from_bag <NODE_NAME-COMMAND_TYPE>` this command grabs the latest command run log from the data bags and saves it to your log directory. There are different types of logs saved per server depending on command.
+18. `cft get_log_from_bag <NODE_NAME-COMMAND_TYPE>` this command grabs the latest command run log from the data bags and saves it to your log directory. There are different types of logs saved per server depending on command.
 
-17. `cft get_pg_pass ['clip']` command will output the current environment's pg_password to your terminal. Optionally you can pass in clip like `cft get_pg_pass clip` to have it also copy the pass to your clipboard.
+19. `cft get_pg_pass ['clip']` command will output the current environment's pg_password to your terminal. Optionally you can pass in clip like `cft get_pg_pass clip` to have it also copy the pass to your clipboard.
 
-18. `cft help COMMAND|MODE` this command returns the documentation for a specific command if COMMAND matches the name of a command. Alternatively, it can be passed `action|arguments|application|current|devops|stateless_action` to fetch the commands for a specific mode.Misspellings of commands will display near hits.
+20. `cft help COMMAND|MODE` this command returns the documentation for a specific command if COMMAND matches the name of a command. Alternatively, it can be passed `action|arguments|application|current|devops|stateless_action` to fetch the commands for a specific mode.Misspellings of commands will display near hits.
 
-19. `cft list_toggleable_roles NODE_NAME` This command will allow you to see all toggleable roles for a node
+21. `cft list_toggleable_roles NODE_NAME` This command will allow you to see all toggleable roles for a node
 
-20. `cft location_aliases` will list all location aliases listed in your cheftacular.yml. These aliases can be used in the `cft file` command.
+22. `cft location_aliases` will list all location aliases listed in your cheftacular.yml. These aliases can be used in the `cft file` command.
 
-21. `cft log` this command will output the last 500 lines of logs from every server set for the repository (can be given additional args to specify) to the log directory
+23. `cft log` this command will output the last 500 lines of logs from every server set for the repository (can be given additional args to specify) to the log directory
 
     1.  `--nginx` will fetch the nginx logs as well as the application logs
 
@@ -288,13 +244,13 @@
 
     4. `--fetch-backup` If doing a pg_data log, this will fetch the latest logs from the pg_data log directory for each database.
 
-22. `cft migrate` this command will grab the first alphabetical node for a repository and run a migration that will hit the database primary server.
+24. `cft migrate` this command will grab the first alphabetical node for a repository and run a migration that will hit the database primary server.
 
     1. Currently only supports rails stacks.
 
-23. `cft pass NODE_NAME` will drop the server's sudo password into your clipboard. Useful for when you need to ssh into the server itself and try advanced linux commands
+25. `cft pass NODE_NAME` will drop the server's sudo password into your clipboard. Useful for when you need to ssh into the server itself and try advanced linux commands
 
-24. `cft role_toggle NODE_NAME ROLE_NAME activate|deactivate` This command will allow you to **toggle** roles on nodes without using `cft upload_nodes`
+26. `cft role_toggle NODE_NAME ROLE_NAME activate|deactivate` This command will allow you to **toggle** roles on nodes without using `cft upload_nodes`
 
     1. This command uses your *role_toggling:deactivated_role_suffix* attribute set in your cheftacular.yml to toggle the role, it checks to see if the toggled name exists then sets the node's run_list to include the toggled role
 
@@ -306,7 +262,7 @@
 
         1. Please run `cft list_toggleable_roles NODE_NAME` to get a list of your org's toggleable roles for a node.
 
-25. `cft run COMMAND [--all]` will trigger the command on the first server in the role. Can be used to run rake commands or anything else.
+27. `cft run COMMAND [--all]` will trigger the command on the first server in the role. Can be used to run rake commands or anything else.
 
     1. `--all` will make the command run against all servers in a role rather than the first server it comes across. Don't do this if you're modifying the database with the command.
 
@@ -316,11 +272,11 @@
 
     4. IMPORTANT NOTE: You cannot run `cft run rake -T` as is, you have to enclose any command that uses command line dash arguments in quotes like `cft run "rake -T"`
 
-26. `cft scale up|down [NUM_TO_SCALE]` will add (or remove) NUM_TO_SCALE servers from the server array. This command will not let you scale down below 1 server.
+28. `cft scale up|down [NUM_TO_SCALE]` will add (or remove) NUM_TO_SCALE servers from the server array. This command will not let you scale down below 1 server.
 
     1. In the case of server creation, this command takes a great deal of time to execute. It will output what stage it is currently on to the terminal but <b>you must not kill this command while it is executing</b>.A failed build may require the server to be destroyed / examined by a DevOps engineer.
 
-27. `cft tail [PATTERN_TO_MATCH]` will tail the logs (return continuous output) of the first node if finds that has an application matching the repository running on it. Currently only supports rails stacks
+29. `cft tail [PATTERN_TO_MATCH]` will tail the logs (return continuous output) of the first node if finds that has an application matching the repository running on it. Currently only supports rails stacks
 
     1. pass `-n NODE_NAME` to grab the output of a node other than the first.
 
@@ -328,22 +284,20 @@
 
     3. if the `PATTERN_TO_MATCH` argument exists, the tail will only return entries that have that pattern rather than everything written to the file.
 
-28. `cft update_cheftacular` this command attempts to update cheftacular to the latest version.
+30. `cft update_cheftacular` this command attempts to update cheftacular to the latest version.
 
-29. `cft version` this command prints out the current version of cheftacular.
+31. `cft version` this command prints out the current version of cheftacular.
 
 
 ## Commands that can ONLY be run in the devops context
 
-1. [NYI]`cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory.
+1. [NYI]`cft update_chef_client` attempts to update the chef-client of all nodes to the latest version. Should be done with caution and with the chef_server's version in mind.
 
-2. [NYI]`cft update_chef_client` attempts to update the chef-client of all nodes to the latest version. Should be done with caution and with the chef_server's version in mind.
-
-3. `cft add_ssh_key_to_bag "<NEW SSH PUB KEY>" [SPECIFIC_REPOSITORY]` this command will add the given ssh key to the default authentication data bag. After this your server recipes should read the contents of the 'default' 'authentication' bag for the authorized_keys array.
+2. `cft add_ssh_key_to_bag "<NEW SSH PUB KEY>" [SPECIFIC_REPOSITORY]` this command will add the given ssh key to the default authentication data bag. After this your server recipes should read the contents of the 'default' 'authentication' bag for the authorized_keys array.
 
     1. `SPECIFIC_REPOSITORY` is a special argument, if left blank the key will be placed in the authorized_keys array in the bag, otherwise it will be placed in the specific_authorized_keys hash under a key named for the repository that is passed. The script will error if SPECIFIC_REPOSITORY does not exist in the cheftacular.yml respositories hash. You can then use this data to give users selective ssh access to certain servers.
 
-4. `cft backups [activate|deactivate|fetch|load|restore]` this command sets the fetch_backups and restore_backups flags in your config data bag for an environment. These can be used to give application developers a way to trigger / untrigger restores in an environment
+3. `cft backups [activate|deactivate|fetch|load|restore]` this command sets the fetch_backups and restore_backups flags in your config data bag for an environment. These can be used to give application developers a way to trigger / untrigger restores in an environment
 
     1. `activate` will turn on automated backup running (turns on the flag for the env in the config bag).
 
@@ -355,13 +309,13 @@
 
     5. `restore` will simply just run the _backup loading command_ to load the latest backup onto the server.
 
-5. `cft check_cheftacular_yml_keys` allows you to check to see if your cheftacular yml keys are valid to the current version of cheftacular. It will also set your missing keys to their likely default and let you know to update the cheftacular.yml file.
+4. `cft check_cheftacular_yml_keys` allows you to check to see if your cheftacular yml keys are valid to the current version of cheftacular. It will also set your missing keys to their likely default and let you know to update the cheftacular.yml file.
 
-6. `cft chef_bootstrap_from_queue` allows you to register a node in the chef system, remove any lingering data that may be associated with it and update the node's runlist if it has an entry in nodes_dir for its NODE_NAME.
+5. `cft chef_bootstrap_from_queue` allows you to register a node in the chef system, remove any lingering data that may be associated with it and update the node's runlist if it has an entry in nodes_dir for its NODE_NAME.
 
     1. This command is part of the `cft full_bootstrap` command and cannot be called directly
 
-7. `cft chef_server [restart|processes|memory]` this command can be used to query the chef server for stats if the cheftacular.yml has the chef_server key filled out. Useful for low resource chef-servers.
+6. `cft chef_server [restart|processes|memory]` this command can be used to query the chef server for stats if the cheftacular.yml has the chef_server key filled out. Useful for low resource chef-servers.
 
     1. `restart` restarts all chef processes on the chef server which may alleviate slow cheftacular load times for some users. (NOTE) do not run this command while the chef-server is performing actions or instability may result! Not tested for high volume chef servers.
 
@@ -373,7 +327,7 @@
 
     5. NOTE 2! Cheftacular does not (and will not) support accessing your chef server over ssh with password auth. If you have done this, you should feel bad and immediately switch ssh access to key authentication...
 
-8. `cft cheftacular_config [diff|display|sync|overwrite]` this command Allows you to interact with your complete cheftacular configuration, the union of all repository's cheftacular.ymls. 
+7. `cft cheftacular_config [diff|display|sync|overwrite]` this command Allows you to interact with your complete cheftacular configuration, the union of all repository's cheftacular.ymls. 
 
     1. `display` will show the current overall configuration for cheftacular.
 
@@ -381,18 +335,26 @@
 
     3. `sync` will sync your local cheftacular yaml keys ONTO the server's keys. Will send a slack notification if slack is configured (the slack notification contains the diffed keys). The sync only occurs if there are CHANGES to the file.
 
-9. `cft cheftacular_yml_help KEY` this commandallows you to get help on the meaning of each key in your cheftacular.yml overall config.
+    4. This command is aliased to `cc`
+
+8. `cft cheftacular_yml_help KEY` this commandallows you to get help on the meaning of each key in your cheftacular.yml overall config.
 
     1. This command can also by run with `cft yaml_help`.
 
     2. To examine nested keys, you can use colons inbetween the keys like cloud_authentication:rackspace:email
 
-10. `cft clean_cookbooks [force] [remove_cookbooks]` allows you to update the internal chef-repo's cookbooks easily. By default this script will force you to decide what to do with each cookbook individually (shows version numbers and whether to overwrite it to cookbooks or not).
+9. `cft clean_cookbooks [force] [remove_cookbooks]` allows you to update the internal chef-repo's cookbooks easily. By default this script will force you to decide what to do with each cookbook individually (shows version numbers and whether to overwrite it to cookbooks or not).
 
     1. `force` argument will cause the downloaded cookbooks to *always* overwrite the chef-repo's cookbooks as long as the downloaded cookbook has a higher version number.
 
     2. If you would like to remove all the cookbooks on the chef server, run `knife cookbook bulk delete '.*' -p -c ~/.chef/knife.rb`
 
+10. `cft cleanup_logs [DIRECTORIES_TO_NOT_DELETE]` this command allows you to clear your local log files
+
+    1. By default, this command will delete all the cheftacular directories in your log folder.
+
+    2. This command supports a comma separated list of folders you don't want to delete.
+
 11. `cft clear_caches` this command allows you to clear all of your local caches.
 
     1. This command will force you to refetch all previously cached chef server data on the next `cft` run.
@@ -409,6 +371,8 @@
 
     5. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.
 
+    6. This command is aliased to `cft clients` and `cft c`
+
 13. `cft cloud <FIRST_LEVEL_ARG> [<SECOND_LEVEL_ARG>[:<SECOND_LEVEL_ARG_QUERY>]*] ` this command handles talking to various cloud APIs. If no args are passed nothing will happen.
 
     1. `domain` first level argument for interacting with cloud domains
@@ -563,7 +527,7 @@
 
         3. `edit:TEXT_EDITOR` will attempt to edit the file with the TEXT_EDITOR listed. NOTE! This editor must be installed on the node you're accessing. If the editor is not present via a `which` command, the cft file command will say so.
 
-        4. `fetch|scp` will attempt to fetch the FILE_NAME listed via SCP. This file is saved to /Users/mrlocus/Code/chef-repo/tmp (based on your directory structure) under the same FILE_NAME as the remote file.
+        4. `fetch|scp` will attempt to fetch the FILE_NAME listed via SCP. This file is saved to /Users/louis/Code/chef-repo/tmp (based on your directory structure) under the same FILE_NAME as the remote file.
 
             1. The deploy must have access to said file without sudo!
 
@@ -585,21 +549,17 @@
 
     1. This command is run by `cft cloud_bootstrap` and should not be run on its own.
 
-24. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
+24. `cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory.
 
-    1. In devops mode, this command will not do anything without the -R repository passed.
+    1. This command runs on all servers in an environment by default
 
-25. `cft get_log_from_bag <NODE_NAME-COMMAND_TYPE>` this command grabs the latest command run log from the data bags and saves it to your log directory. There are different types of logs saved per server depending on command.
+25. `cft get_haproxy_log` this command will generate a haproxy html file for the load balancer(s) associated with a repository in the log directory. Opening this log file in the browser will show the status of that haproxy at the time of the log. 
 
-26. `cft get_pg_pass ['clip']` command will output the current environment's pg_password to your terminal. Optionally you can pass in clip like `cft get_pg_pass clip` to have it also copy the pass to your clipboard.
-
-27. `cft get_shorewall_allowed_connections [PATH_TO_LOCAL_FILE] -n NODE_NAME` 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.
-
-    1. You must pass in a node name to query with `-n NODE_NAME`
+    1. In devops mode, this command will not do anything without the -R repository passed.
 
-    2. This command will attempt to `dig` each ip address to give you the most likely culprit.
+26. `cft get_log_from_bag <NODE_NAME-COMMAND_TYPE>` this command grabs the latest command run log from the data bags and saves it to your log directory. There are different types of logs saved per server depending on command.
 
-    3. If `PATH_TO_LOCAL_FILE` is not blank, the command will use that file instead of building a file on the remote server
+27. `cft get_pg_pass ['clip']` command will output the current environment's pg_password to your terminal. Optionally you can pass in clip like `cft get_pg_pass clip` to have it also copy the pass to your clipboard.
 
 28. `cft help COMMAND|MODE` this command returns the documentation for a specific command if COMMAND matches the name of a command. Alternatively, it can be passed `action|arguments|application|current|devops|stateless_action` to fetch the commands for a specific mode.Misspellings of commands will display near hits.
 
@@ -615,6 +575,8 @@
 
     1. The force option will add the force option to knife upload.
 
+    2. Utilize `knife cookbook upload -a -V --cookbook-path ./cookbooks` if this command gives you trouble
+
 32. `cft list_toggleable_roles NODE_NAME` This command will allow you to see all toggleable roles for a node
 
 33. `cft location_aliases` will list all location aliases listed in your cheftacular.yml. These aliases can be used in the `cft file` command.
@@ -705,7 +667,7 @@
 
     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.
 
-49. `cft update_cookbook [COOKBOOK_NAME]` allows you to specifically update a single cookbook
+49. `cft update_cookbook [COOKBOOK_NAME] [INSTALL_VERSION]` allows you to specifically update a single cookbook
 
     1. This command passed with no arguments will update TheCheftacularCookbook
 

data/lib/cheftacular/actions/deploy.rb

@@ -36,6 +36,8 @@ class Cheftacular
 
       deployment_args = { in: :groups, limit: 10, wait: 5 } if @options['env'] == 'production'
 
+      @config['pleasantries'].good_luck_fridays if @config['cheftacular']['pleasantries']
+
       #on is namespaced to SSHKit::Backend::Netssh.on 
       on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ), deployment_args do |host|
         n = get_node_from_address(nodes, host.hostname)

data/lib/cheftacular/actions/migrate.rb

@@ -52,13 +52,13 @@ class Cheftacular
     end
 
     def migrate_wordpress nodes=[]
-      puts "Method #{ __method__ } is not yet implemented"
+      puts("Method #{ __method__ } is not yet implemented") if @options['verbose']
 
       return false
     end
 
     def migrate_nodejs nodes=[]
-      puts "Method #{ __method__ } is not yet implemented"
+      puts("Method #{ __method__ } is not yet implemented") if @options['verbose']
 
       return false
     end
@@ -68,7 +68,7 @@ class Cheftacular
     end
 
     def migrate_ nodes=[]
-      puts "Migrate method tried to migrate the role \"#{ @options['role'] }\" but it doesn't appear to have a repository set! Skipping..."
+      puts("Migrate method tried to migrate the role \"#{ @options['role'] }\" but it doesn't appear to have a repository set! Skipping...") if @options['verbose']
 
       return false
     end

data/lib/cheftacular/auditor.rb

@@ -23,6 +23,7 @@ class Cheftacular
     def audit_run_as_hash ret_hash={}, options_to_ignore=[]
       ret_hash['hostname']  = Socket.gethostname
       ret_hash['directory'] = @config['locs']['root']
+      ret_hash['version']   = Cheftacular::VERSION
       ret_hash['command']   = @options['command']
       
       options_to_ignore << :preferred_cloud        if @options['preferred_cloud'] == @config['cheftacular']['preferred_cloud']
@@ -40,11 +41,12 @@ class Cheftacular
       ret_hash
     end
 
-    def compile_audit_hash_entry_as_array audit_hash, entry_number=0, ret_array=[], directory_content=''
+    def compile_audit_hash_entry_as_array audit_hash, entry_number=0, ret_array=[], directory_content='', version_content=''
       directory_content = " (#{ audit_hash['directory'] })" if audit_hash.has_key?('directory')
+      version_content   = " [#{ audit_hash['version'] }]"   if audit_hash.has_key?('version')
 
       ret_array << "#{ (entry_number.to_s + '. ') unless entry_number == 0 }#{ audit_hash['command'] }"
-      ret_array << "  Hostname:  #{ audit_hash['hostname'] }#{ directory_content }"
+      ret_array << "  Hostname:  #{ audit_hash['hostname'] }#{ directory_content }#{ version_content }"
       ret_array << "  Arguments: #{ audit_hash['arguments'] }"       if !audit_hash['arguments'].nil? && !audit_hash['arguments'].empty?
       ret_array << "  Options:   #{ audit_hash['options'].to_hash }" unless audit_hash['options'].empty?
       

data/lib/cheftacular/cloud_provider.rb

@@ -23,6 +23,9 @@ class Cheftacular
       raise "CRITICAL! Unable to capture addresses for the server!" if ret_array[0].nil? || ret_array[1].nil?
 
       ret_array
+    rescue StandardError => e
+      puts "Encountered #{ e } for server hash:"
+      ap cloud_server_hash
     end
 
     def parse_server_root_password_from_server_create_hash server_hash, real_node_name

data/lib/cheftacular/file_system.rb

@@ -4,6 +4,10 @@ class Cheftacular
       @options, @config  = options, config
     end
 
+    def log_directories
+      ['applog', 'deploy', 'failed-deploy', 'rolelog', 'rvm', 'server-setup', 'stashedlog']
+    end
+
     def write_version_file version
       File.open( current_version_file_path, "w") { |f| f.write(version) }
     end
@@ -214,6 +218,44 @@ class Cheftacular
       end
     end
 
+    def initialize_log_directories should_cleanup_file_caches=true
+      log_directories.each do |sub_log_directory|
+        FileUtils.mkdir_p File.join( @config['locs']['chef-log'], sub_log_directory )
+      end
+
+      FileUtils.mkdir_p File.join( @config['locs']['app-tmp'], @config['helper'].declassify)
+
+      FileUtils.mkdir_p @config['filesystem'].current_nodes_file_cache_path
+
+      cleanup_file_caches if should_cleanup_file_caches
+    end
+
+    def remove_log_directories directories_to_not_remove_array=[]
+      (log_directories - directories_to_not_remove_array).each do |log_directory|
+        FileUtils.rm_rf File.join( @config['locs']['chef-log'], log_directory.strip )
+      end
+    end
+
+    def generate_report_from_node_hash report_name, node_hash={}, out=[]
+      node_hash.each_pair do |serv_name, output|
+        out << "#{ serv_name }:"
+
+        output.join("\n").split("\n").each do |line|
+          out << " #{ line }"
+        end
+
+        out << "\n"
+      end
+
+      puts(out) if @options['no_logs'] || @options['verbose']
+
+      log_loc, timestamp = @config['helper'].set_log_loc_and_timestamp
+
+      puts("Generating log file for #{ report_name } at #{ log_loc }/#{ report_name.gsub(' ', '-') }-#{ timestamp }.txt") unless @options['quiet']
+
+      File.open("#{ log_loc }/#{ report_name.gsub(' ', '-') }-#{ timestamp }.txt", "w") { |f| f.write(out.join("\n").scrub_pretty_text) } unless @options['no_logs']
+    end
+
     private
     def current_file_path file_name, use_timestamp=true
       File.join( @config['locs']['app-root'], 'tmp', @config['helper'].declassify, ( use_timestamp ? "#{ Time.now.strftime("%Y%m%d") }-#{ file_name }" : file_name ))

data/lib/cheftacular/helper.rb

@@ -325,7 +325,8 @@ class Cheftacular
       diff_hash = @config['initial_cheftacular_yml'].deep_diff(@config['default']['cheftacular_bag_hash'], true).except('mode', 'default_repository').compact
 
       recursive_hash_scrub(diff_hash)
-      recursive_hash_scrub(diff_hash) #scrub out any leftover empty hashes
+
+      recursive_hash_scrub(diff_hash) unless diff_hash.empty? #scrub out any leftover empty hashes
 
       if diff_hash.empty?
         puts "No difference detected between your cheftacular.yml and the global environment."

data/lib/cheftacular/initializer.rb

@@ -489,6 +489,7 @@ class Cheftacular
       @config['action_documentation']           = Cheftacular::ActionDocumentation.new(@options, @config)
       @config['stateless_action_documentation'] = Cheftacular::StatelessActionDocumentation.new(@options, @config)
       @config['error']                          = Cheftacular::Error.new(@options, @config)
+      @config['pleasantries']                   = Cheftacular::Pleasantries.new(@options, @config)
       @config['dummy_sshkit']                   = SSHKit::Backend::Netssh.new(SSHKit::Host.new('127.0.0.1'))
       @config['DNS']                            = Cheftacular::DNS.new(@options, @config)
       @config['queue_master']                   = Cheftacular::QueueMaster.new(@options, @config)
@@ -496,15 +497,7 @@ class Cheftacular
     end
 
     def initialize_directories
-      ['applog', 'deploy', 'failed-deploy', 'rolelog', 'rvm', 'server-setup', 'stashedlog'].each do |sub_log_directory|
-        FileUtils.mkdir_p File.join( @config['locs']['chef-log'], sub_log_directory )
-      end
-
-      FileUtils.mkdir_p File.join( @config['locs']['app-tmp'], @config['helper'].declassify)
-
-      FileUtils.mkdir_p @config['filesystem'].current_nodes_file_cache_path
-
-      @config['filesystem'].cleanup_file_caches
+      @config['filesystem'].initialize_log_directories
     end
 
     def initialize_cloud_checks exit_on_finish = false

data/lib/cheftacular/pleasantries.rb

@@ -0,0 +1,25 @@
+class Cheftacular
+  class Pleasantries
+    def initialize options, config
+      @options, @config  = options, config
+    end
+
+    def good_luck_fridays #https://gist.github.com/exAspArk/4f18795bc89b6e2666ee
+      friday_jumper = %{
+┓┏┓┏┓┃
+┛┗┛┗┛┃⟍ ○⟋
+┓┏┓┏┓┃  ∕       Friday
+┛┗┛┗┛┃ノ)
+┓┏┓┏┓┃          deploy,
+┛┗┛┗┛┃
+┓┏┓┏┓┃          good
+┛┗┛┗┛┃
+┓┏┓┏┓┃          luck!
+┃┃┃┃┃┃
+┻┻┻┻┻┻
+      }.strip!
+
+      puts(friday_jumper) if Time.now.friday? && @options['env'] == 'production'
+    end
+  end
+end

data/lib/cheftacular/stateless_actions/arguments.rb

@@ -62,7 +62,7 @@ class Cheftacular
         "deploying from, your git user needs access to these forks / organization(s).",
 
         "    3.  The `-z|--unset-github-deploy-args` option will clear your current `-Z` and `-O` flags."
-      ]
+      ] if @config['documentation']['arguments'].empty?
     end
 
     alias_method :flags, :arguments

data/lib/cheftacular/stateless_actions/bootstrappers/ubuntu_bootstrap_from_queue.rb

@@ -175,7 +175,7 @@ class Cheftacular
 
           if execution_hash.has_key?(:retries)
             execution_hash[:retries] = execution_hash[:retries] -= 1
-            puts "There are #{ execution_hash[:retries] } tries left to evaluate the command."
+            puts "#{ server_name_output(server_hash) }_@@@@@@@@@@@ There are #{ execution_hash[:retries] } tries left to evaluate the above command."
 
             sleep 60
 

data/lib/cheftacular/stateless_actions/check_cheftacular_yml_keys.rb

@@ -15,6 +15,12 @@ class Cheftacular
   class StatelessAction
     def check_cheftacular_yml_keys out=[], exit_on_missing=false, warn_on_missing=false
       base_message = "Your cheftacular.yml is missing the key KEY, its default value is being set to DEFAULT for this run."
+      
+      #############################2.13.0################################################
+
+      unless @config['cheftacular'].has_key?('pleasantries')
+        @config['cheftacular']['pleasantries'] = true
+      end
 
       #############################2.11.0################################################
 

data/lib/cheftacular/stateless_actions/cheftacular_config.rb

@@ -13,7 +13,9 @@ class Cheftacular
           "    2. `diff` will show the difference between your current cheftacular.yml and the server's. Run automatically on a sync.",
 
           "    3. `sync` will sync your local cheftacular yaml keys ONTO the server's keys. Will send a slack notification " +
-          "if slack is configured (the slack notification contains the diffed keys). The sync only occurs if there are CHANGES to the file."
+          "if slack is configured (the slack notification contains the diffed keys). The sync only occurs if there are CHANGES to the file.",
+
+          "    4. This command is aliased to `cc`"
         ]
       ]
 
@@ -32,6 +34,8 @@ class Cheftacular
       self.send("cheftacular_config_#{ command }")
     end
 
+    alias_method :cc, :cheftacular_config
+
     private
 
     def cheftacular_config_display

data/lib/cheftacular/stateless_actions/cleanup_logs.rb

@@ -0,0 +1,38 @@
+
+class Cheftacular
+  class StatelessActionDocumentation
+    def cleanup_logs
+      @config['documentation']['stateless_action'][__method__] ||= {}
+      @config['documentation']['stateless_action'][__method__]['long_description'] = [
+        "`cft cleanup_logs [DIRECTORIES_TO_NOT_DELETE]` this command allows you to clear your local log files",
+
+        [
+          "    1. By default, this command will delete all the cheftacular directories in your log folder.",
+
+          "    2. This command supports a comma separated list of folders you don't want to delete."
+        ]
+      ]
+
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Clears cheftacular log directories'
+
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
+    end
+  end
+
+  class InitializationAction
+    def cleanup_logs
+      
+    end
+  end
+
+  class StatelessAction
+    def cleanup_logs directories_to_not_delete=''
+      directories_to_not_delete   = ARGV[1] if directories_to_not_delete.blank?
+      directories_to_not_delete ||= ''
+      
+      @config['filesystem'].remove_log_directories(directories_to_not_delete.split(','))
+
+      @config['filesystem'].initialize_log_directories(false)
+    end
+  end
+end

data/lib/cheftacular/stateless_actions/client_list.rb

@@ -18,7 +18,9 @@ class Cheftacular
 
           "    4. `-S|--search-role-name ROLE_NAME` option will make this command return results that INCLUDE the ROLE_NAME.",
 
-          "    5. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment."
+          "    5. `-E|--search-env-name ENV_NAME` option will make this command return results that have this environment.",
+
+          "    6. This command is aliased to `cft clients` and `cft c`"
         ]
       ]
 
@@ -96,5 +98,8 @@ class Cheftacular
         end
       end
     end
+
+    alias_method :clients, :client_list
+    alias_method :c, :client_list
   end
 end

data/lib/cheftacular/stateless_actions/disk_report.rb

@@ -35,27 +35,7 @@ class Cheftacular
         disk_hash[n.name] = start_disk_report( n.name, n.public_ipaddress, options, locs, passwords)
       end
 
-      disk_hash.each_pair do |serv_name, output|
-        out << "#{ serv_name }:"
-
-        line_count = 1
-
-        output.join("\n").split("\n").each do |line|
-          out << line_count == 1 ? "               #{ line }" : "  #{ line }"
-
-          line_count += 1
-        end
-
-        out << "\n"
-      end
-
-      puts(out) if @options['no_logs'] || @options['verbose']
-
-      log_loc, timestamp = @config['helper'].set_log_loc_and_timestamp
-
-      puts("Generating log file for disk report at #{ log_loc }/disk-report-#{ timestamp }.txt") unless @options['quiet']
-
-      File.open("#{ log_loc }/disk-report-#{ timestamp }.txt", "w") { |f| f.write(out.join("\n").scrub_pretty_text) } unless @options['no_logs']
+      @config['filesystem'].generate_report_from_node_hash('disk report', disk_hash)
     end
   end
 end

data/lib/cheftacular/stateless_actions/get_active_ssh_connections.rb

@@ -3,17 +3,50 @@ class Cheftacular
     def get_active_ssh_connections
       @config['documentation']['stateless_action'][__method__] ||= {}
       @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "[NYI]`cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory."
+        "`cft get_active_ssh_connections` will fetch the active ssh connections from every server and output it into your log directory.",
+
+        [
+          "    1. This command runs on all servers in an environment by default"
+        ]
       ]
 
-      #@config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
+      @config['documentation']['stateless_action'][__method__]['short_description'] = 'Check servers for active ssh connections'
+      @config['documentation']['application'][__method__] = @config['documentation']['stateless_action'][__method__]
     end
   end
 
   class StatelessAction
-    def get_active_ssh_connections
-      # netstat -atn | grep ':22'
-      raise "Not yet implemented"
+    def get_active_ssh_connections connections_hash={}, out=[]
+      nodes = @config['getter'].get_true_node_objects(true)
+
+      nodes = @config['parser'].exclude_nodes( nodes, [{ unless: { env: @options['env'] }}] )
+
+      options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
+
+      on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
+        n = get_node_from_address(nodes, host.hostname)
+
+        puts "Beginning ssh connection check run for #{ n.name } (#{ n.public_ipaddress })"
+
+        connections_hash[n.name] = start_connection_report( n.name, n.public_ipaddress, options, locs, passwords)
+      end
+
+      @config['filesystem'].generate_report_from_node_hash('connections report', connections_hash)
+    end
+  end
+end
+
+module SSHKit
+  module Backend
+    class Netssh
+      def start_connection_report name, ip_address, options, locs, passwords, out=[]
+
+        out << capture( :netstat, '-atn', :|, :grep, ':22' )
+
+        puts(out.join("\n")) if options['output'] || options['verbose']
+
+        out
+      end
     end
   end
 end

data/lib/cheftacular/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheftacular
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.0
 platform: ruby
 authors:
 - Louis Alridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -276,6 +276,7 @@ files:
 - lib/cheftacular/initialization_action.rb
 - lib/cheftacular/initializer.rb
 - lib/cheftacular/parser.rb
+- lib/cheftacular/pleasantries.rb
 - lib/cheftacular/queue_master.rb
 - lib/cheftacular/stateless_action.rb
 - lib/cheftacular/stateless_actions/add_ssh_key_to_bag.rb
@@ -294,7 +295,7 @@ files:
 - lib/cheftacular/stateless_actions/cheftacular_yml_help.rb
 - lib/cheftacular/stateless_actions/clean_cookbooks.rb
 - lib/cheftacular/stateless_actions/clean_server_passwords.rb
-- lib/cheftacular/stateless_actions/cleanup_log_files.rb
+- lib/cheftacular/stateless_actions/cleanup_logs.rb
 - lib/cheftacular/stateless_actions/clear_caches.rb
 - lib/cheftacular/stateless_actions/client_list.rb
 - lib/cheftacular/stateless_actions/cloud.rb
@@ -312,7 +313,6 @@ files:
 - lib/cheftacular/stateless_actions/get_haproxy_log.rb
 - lib/cheftacular/stateless_actions/get_log_from_bag.rb
 - lib/cheftacular/stateless_actions/get_pg_pass.rb
-- lib/cheftacular/stateless_actions/get_shorewall_allowed_connections.rb
 - lib/cheftacular/stateless_actions/help.rb
 - lib/cheftacular/stateless_actions/initialize_cheftacular_yml.rb
 - lib/cheftacular/stateless_actions/initialize_data_bag_contents.rb

data/lib/cheftacular/stateless_actions/cleanup_log_files.rb

@@ -1,15 +0,0 @@
-
-class Cheftacular
-  class StatelessActionDocumentation
-    def cleanup_log_files
-
-    end
-  end
-
-  class StatelessAction
-    def cleanup_log_files
-      #TODO
-      raise "This method is not yet implemented"
-    end
-  end
-end

data/lib/cheftacular/stateless_actions/get_shorewall_allowed_connections.rb

@@ -1,130 +0,0 @@
-class Cheftacular
-  class StatelessActionDocumentation
-    def get_shorewall_allowed_connections
-      @config['documentation']['stateless_action'][__method__] ||= {}
-      @config['documentation']['stateless_action'][__method__]['long_description'] = [
-        "`cft get_shorewall_allowed_connections [PATH_TO_LOCAL_FILE] -n NODE_NAME` 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.",
-
-        [
-          "    1. You must pass in a node name to query with `-n NODE_NAME`",
-
-          "    2. This command will attempt to `dig` each ip address to give you the most likely culprit.",
-
-          "    3. If `PATH_TO_LOCAL_FILE` is not blank, the command will use that file instead of building a file on the remote server"
-        ]
-      ]
-    end
-  end
-
-  class StatelessAction
-    def get_shorewall_allowed_connections master_log_data=''
-
-      if ARGV[1].nil?
-        raise "Please pass a NODE_NAME with -n NODE_NAME" if @options['node_name'].nil? || @options['node_name'].empty?
-
-        nodes = @config['getter'].get_true_node_objects true
-
-        nodes = @config['parser'].exclude_nodes(nodes, [{ unless: { env: @options['env'] }}, { unless: { node: @options['node_name'] }}], true)
-
-        #this must always precede on () calls so they have the instance variables they need
-        options, locs, ridley, logs_bag_hash, pass_bag_hash, bundle_command, cheftacular, passwords = @config['helper'].set_local_instance_vars
-
-        #on is namespaced to SSHKit::Backend::Netssh.on 
-        on ( nodes.map { |n| @config['cheftacular']['deploy_user'] + "@" + n.public_ipaddress } ) do |host|
-          n = get_node_from_address(nodes, host.hostname)
-
-          puts("Beginning shorewall log capture run for #{ n.name } (#{ n.public_ipaddress })") unless options['quiet']
-
-          master_log_data = start_shorewall_log_capture( n.name, n.public_ipaddress, options, locs, cheftacular, passwords)
-        end
-      else
-        master_log_file = ARGV[1]
-
-        raise "File not found! Did you enter the path correctly?" unless File.exist?(master_log_file)
-
-        master_log_data = File.read(File.expand_path(master_log_file))
-      end
-
-      puts("Parsing addresses from log data...") unless @options['quiet']
-
-      addresses = {}
-
-      master_log_data.scan(/^.*Shorewall:net2fw:ACCEPT.*SRC=([\d]+\.[\d]+\.[\d]+\.[\d]+) DST.*DPT=80.*$/).each do |ip_address|
-        addresses[ip_address] ||= 0
-        addresses[ip_address] += 1
-      end
-
-      final_addresses = {}
-      check_count = 0
-      addresses.each_pair do |address, count|
-        next if count < 100
-        
-        domain = `dig +short -x #{ address[0] }`.chomp.split("\n").join('|')
-        domain = domain[0..(domain.length-2)]
-
-        domain = address[0] if domain.blank?
-
-        final_addresses[domain] ||= {}
-        final_addresses[domain]['addresses'] ||= []
-        final_addresses[domain]['addresses'] <<  address[0] unless final_addresses[domain]['addresses'].include?(address[0])
-        final_addresses[domain]['count']     =   count   unless final_addresses[domain].has_key?('count')
-        final_addresses[domain]['count']     +=  count   if final_addresses[domain].has_key?('count')
-
-        check_count += 1
-
-        puts("Processed #{ check_count } addresses (#{ address[0] }):#{ domain }:#{ count }") unless @options['quiet']
-      end
-
-      final_addresses = final_addresses.sort_by {|key, value_hash| value_hash['count']}.to_h
-
-      final_addresses = Hash[final_addresses.to_a.reverse]
-
-      ap(final_addresses) if @options['verbose']
-
-      log_loc, timestamp = @config['helper'].set_log_loc_and_timestamp
-
-      CSV.open(File.expand_path("#{ @config['locs']['chef-log'] }/shorewall-parse-#{ timestamp }.csv"), "wb") do |csv| 
-        final_addresses.each_pair do |dns, info_hash|
-          csv << [dns, info_hash['addresses'].join('|'), info_hash['count']]
-        end
-      end
-    end
-  end
-end
-
-module SSHKit
-  module Backend
-    class Netssh
-      def start_shorewall_log_capture name, ip_address, options, locs, cheftacular, passwords, out=[]
-        log_loc, timestamp = set_log_loc_and_timestamp(locs)
-
-        puts("Generating master log file for shorewall for #{ name } (#{ ip_address }) at #{ log_loc }/#{ name }-shorewall-#{ timestamp }.html") unless options['quiet']
-
-        syslog_files = capture(:ls, '/var/log', :|, :grep, :syslog).split("\n")
-
-        puts("Found #{ syslog_files.count } syslog files to parse (#{ syslog_files.join(', ') }).\nPreparing to parse...") unless options['quiet']
-
-        syslog_files.each do |file|
-          puts("Parsing #{ file } into master log file...") unless options['quiet']
-
-          if file.include?('.gz')
-            sudo_execute(passwords[ip_address], :gunzip, '-c', "/var/log/#{ file }", '>>', '/tmp/syslog_master.log' )
-          else
-            sudo_execute(passwords[ip_address], :cat, "/var/log/#{ file }", '>>', '/tmp/syslog_master.log' )
-          end
-        end
-
-        puts("Writing master log...") unless options['quiet']
-
-        out << sudo_capture( passwords[ip_address], :cat, "/tmp/syslog_master.log" )
-
-        ::File.open("#{ log_loc }/#{ name }-shorewall-#{ timestamp }.html", "w") { |f| f.write(out.join("\n").scrub_pretty_text.gsub('[sudo] password for deploy: ', '')) } unless options['no_logs']
-
-        sudo_execute(passwords[ip_address], :rm, '-f', '/tmp/syslog_master.log')
-
-        out.join("\n")
-      end
-    end
-  end
-end