poise-monit 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9eed9d6be8fea50a14e11d1d7d6121df701f523
-  data.tar.gz: c772a05c0c3e5847273aef9dee0a3badda59c8ff
+  metadata.gz: 3b8431aa0868c66f89d7de71426b2f9f1cfb3dbd
+  data.tar.gz: ae851e48383783f8ee8c18731aea27310a9c2077
 SHA512:
-  metadata.gz: f4b482f94cffcb183b05928211f331b39d939855692c6e58dbe9981ff37aa289f69d97416189e53564e14cc826dd589e14fde90208afef68e3480cb3b57cb808
-  data.tar.gz: 1fa4a28e969c98219be54689fc7b3b5d3f79d03b55d723d4c41c62e0b2dfb363b29120d9640c3cb3bf2b2977c082d0df109c52f2d9e4551e565e1956ca8ecac0
+  metadata.gz: a057f285f6ab413378e3a6cc863ff11a98698ce8470f5e2b249d0cb2a0576aa28574c14bdb60cacc5d6d83d1c71d00368e12b168d675ca735a97a5454c4b3183
+  data.tar.gz: 1a8a1a3895ac84e20bb6d747af4af3724362ac4737231fcf69af42f1b51e24e3613e28c07995fff485afcfe229253a4d9a526234fa005d93220e23c87d91ec16

data/.kitchen.yml

@@ -1,8 +1,3 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: 'linux') %>
-
-suites:
-- name: default
-  run_list:
-  - recipe[poise-monit_test]
+<%= PoiseBoiler.kitchen %>

data/.travis.yml

@@ -17,4 +17,10 @@ script:
 - "./bin/rake travis"
 gemfile:
 - test/gemfiles/chef-12.gemfile
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/master.gemfile

data/Berksfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,7 @@
 #
 
 source 'https://supermarket.chef.io/'
-extension 'halite'
-
-# Force the rebuild every time for development.
-cookbook 'poise', gem: 'poise'
-cookbook 'poise-languages', gem: 'poise-languages'
-cookbook 'poise-service', gem: 'poise-service'
-cookbook 'poise-monit', gem: 'poise-monit'
 
 group :test do
-  cookbook 'poise-monit_test', path: 'test/cookbooks/poise-monit_test'
-  cookbook 'apt'
+  cookbook 'yum-epel'
 end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Poise-Monit Changelog
 
+## v1.1.0
+
+* Improve compatibility with Chef 12.4 and earlier.
+* New property for `monit` resource: `demon_delay` to control start delay.
+* More verbose output from Monit when Chef is running in debug mode.
+* Update binaries provider for Monit 5.16.
+
 ## v1.0.1
 
 * Small fix for compatibility with `poise-service-monit`.

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,5 +31,6 @@ dev_gem 'halite'
 dev_gem 'poise'
 dev_gem 'poise-boiler'
 dev_gem 'poise-languages'
+dev_gem 'poise-profiler'
 dev_gem 'poise-service'
 

data/README.md

@@ -88,6 +88,10 @@ end
 
 * `service_name` – Name of the Monit instance. *(name attribute)*
 * `daemon_interval` – Number of seconds between service checks. *(default: 120)*
+* `daemon_delay` – Number of intervals to wait on startup before running service
+  checks. If unset or 0, no start delay is used. *(default: nil)*
+* `daemon_verbose` – Run the daemon in verbose mode for debugging. *(default:
+  log_level==debug)*
 * `event_slots` – Number of slots in the Monit event buffer. Set to 0 to disable
   event buffering, or -1 for an unlimited queue. *(default: 100)*
 * `httpd_port` – Port to listen on for Monit's HTTPD. If a path is specified, it
@@ -227,7 +231,7 @@ The Poise test server infrastructure is sponsored by [Rackspace](https://rackspa
 
 ## License
 
-Copyright 2015, Noah Kantrowitz
+Copyright 2015-2016, Noah Kantrowitz
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/attributes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ default['poise-monit']['options'] = {}
 # Attributes for recipe[poise-monit]. All values are nil because the actual
 # defaults live in the resource.
 default['poise-monit']['recipe']['daemon_interval'] = nil
+default['poise-monit']['recipe']['daemon_delay'] = nil
+default['poise-monit']['recipe']['daemon_verbose'] = nil
 default['poise-monit']['recipe']['event_slots'] = nil
 default['poise-monit']['recipe']['httpd_port'] = nil
 default['poise-monit']['recipe']['httpd_password'] = nil

data/chef/recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/chef/templates/monit.conf.erb

@@ -1,5 +1,13 @@
 # Generated by Chef for <%= @new_resource.to_s %>
 
+<%# If daemon_delay is nil/false we put the value on the command line with -d %>
+<%- if @new_resource.daemon_delay -%>
+SET DAEMON <%= @new_resource.daemon_interval %>
+  <%- if @new_resource.daemon_delay > 0 -%>
+  WITH START DELAY <%= @new_resource.daemon_delay %>
+  <%- end -%>
+<%- end -%>
+
 SET PIDFILE <%= @new_resource.pidfile %>
 
 <%- if @new_resource.logfile -%>

data/lib/poise_monit.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/cheftie.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/error.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/monit_providers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/monit_providers/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -141,7 +141,7 @@ module PoiseMonit
           mode '600'
           notifies :reload, new_resource, :immediately
           owner new_resource.owner
-          verify "#{monit_binary} -t -c %{path}"
+          verify "#{monit_binary} -t -c #{Poise::Backports::VERIFY_PATH}" if defined?(verify)
         end
       end
 
@@ -163,7 +163,10 @@ module PoiseMonit
 
       # Configure properties for Monit service resource.
       def service_options(r)
-        r.command("#{monit_binary} -c #{new_resource.config_path} -I -d #{new_resource.daemon_interval}")
+        cmd = "#{monit_binary} -c #{new_resource.config_path} -I"
+        cmd << " -d #{new_resource.daemon_interval}" unless new_resource.daemon_delay
+        cmd << ' -v' if new_resource.daemon_verbose
+        r.command(cmd)
         r.provider_no_auto('monit')
         r.user(new_resource.owner)
       end

data/lib/poise_monit/monit_providers/binaries.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ module PoiseMonit
       provides(:binaries)
       include PoiseLanguages::Static(
         name: 'monit',
-        versions: %w{5.15},
+        versions: %w{5.16},
         machines: %w{aix5.3-ppc aix6.1-ppc freebsd-x64 freebsd-x86 linux-x64 linux-x86 linux-arm macosx-universal openbsd-x64 openbsd-x86 solaris-sparc solaris-x64},
         url: 'https://bitbucket.org/tildeslash/monit/downloads/monit-%{version}-%{machine_label}.tar.gz'
       )
@@ -70,7 +70,14 @@ module PoiseMonit
         raw_kernel = (node['kernel']['name'] || 'unknown').downcase
         kernel = case raw_kernel
         when 'aix'
-          "aix#{node['kernel']['version']}.#{node['kernel']['release']}"
+          # Less correct than "aix#{node['kernel']['version']}.#{node['kernel']['release']}"
+          # but more likely to work on more systems. Notably we think the 6.1
+          # build should work on AIX 7 just fine.
+          if node['kernel']['version'].to_i <= 5
+            'aix5.3'
+          else
+            'aix6.1'
+          end
         when 'sunos'
           'solaris'
         when 'darwin'

data/lib/poise_monit/monit_providers/dummy.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/monit_providers/system.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/resources.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/resources/monit.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,6 +52,17 @@ module PoiseMonit
         #   Number of seconds between service checks. Defaults to 120 seconds.
         #   @return [Integer]
         attribute(:daemon_interval, kind_of: Integer, default: 120)
+        # @!attribute daemon_delay
+        #   Number of intervals to wait on startup before running service checks.
+        #   If unset or 0, no start delay is used. Defaults to nil for backwards
+        #   compat.
+        #   @return [Integer, nil, false]
+        attribute(:daemon_delay, kind_of: [Integer, NilClass, FalseClass], default: nil)
+        # @!attribute daemon_verbose
+        #   Run the daemon in verbose mode for debugging. Defaults to true if
+        #   Chef is run with debug logging.
+        #   @return [Boolean]
+        attribute(:daemon_verbose, equal_to: [true, false], default: lazy { Chef::Log.level == :debug })
         # @!attribute event_slots
         #   Number of slots in the Monit event buffer. Set to 0 to disable
         #   event buffering, or -1 for an unlimited queue. Defaults to 100.

data/lib/poise_monit/resources/monit_config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ module PoiseMonit
             mode '600'
             notifies :reload, new_resource.parent, :immediately
             owner new_resource.parent.owner if new_resource.parent.owner
-            verify "#{new_resource.parent.monit_binary} -t -c %{path}"
+            verify "#{new_resource.parent.monit_binary} -t -c #{Poise::Backports::VERIFY_PATH}" if defined?(verify)
           end
         end
 

data/lib/poise_monit/resources/monit_service.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,7 +51,16 @@ module PoiseMonit
         provides(:monit_service)
         actions(:enable, :disable, :start, :stop, :restart)
 
+        # @!attribute monit_config_path
+        #   Optional path to a config file that corresponds to this service to
+        #   speed up some idempotence checks.
+        #   @return [String, nil, false]
         attribute(:monit_config_path, kind_of: [String, NilClass, FalseClass])
+        # @!attribute monit_verbose
+        #   Run monit commands in verbose mode for debugging. Defaults to true
+        #   if Chef is run with debug logging.
+        #   @return [Boolean]
+        attribute(:monit_verbose, equal_to: [true, false], default: lazy { Chef::Log.level == :debug })
 
         # Unsupported properties.
         %w{pattern reload_command priority timeout parameters run_levels}.each do |name|
@@ -76,10 +85,12 @@ module PoiseMonit
         provides(:monit_service)
 
         def load_current_resource
-          super
+          # Only call super if it won't ruin things. Chef 12.4 and earlier didn't
+          # declare Provider::Service#load_current_resource.
+          super if self.class.superclass.instance_method(:load_current_resource).owner != Chef::Provider
           @current_resource = MonitService::Resource.new(new_resource.name).tap do |r|
             r.service_name(new_resource.service_name)
-            if new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
+            if defined?(new_resource.monit_config_path) && new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
               Chef::Log.debug("[#{new_resource}] Config file #{new_resource.monit_config_path} does not exist, not checking status")
               r.enabled(false)
               r.running(false)
@@ -119,7 +130,7 @@ module PoiseMonit
         end
 
         def disable_service
-          if new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
+          if defined?(new_resource.monit_config_path) && new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
             Chef::Log.debug("[#{new_resource}] Config file #{new_resource.monit_config_path} does not exist, not trying to unmonitor")
             return
           end
@@ -132,11 +143,14 @@ module PoiseMonit
 
         def start_service
           monit_shell_out!('start')
+          # No this isn't a typo, it's a ragefix to make older Monit (like
+          # Ubuntu' packages) always start things even right after an enable
+          # action. I am really unclear why running start twice fixes this :-(
           monit_shell_out!('start')
         end
 
         def stop_service
-          if new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
+          if defined?(new_resource.monit_config_path) && new_resource.monit_config_path && !::File.exist?(new_resource.monit_config_path)
             Chef::Log.debug("[#{new_resource}] Config file #{new_resource.monit_config_path} does not exist, not trying to stop")
             return
           end
@@ -163,7 +177,9 @@ module PoiseMonit
 
         def monit_shell_out!(monit_cmd, timeout: DEFAULT_TIMEOUT, wait: DEFAULT_WAIT, &block)
           while true
-            cmd_args = [new_resource.parent.monit_binary, '-c', new_resource.parent.config_path, monit_cmd, new_resource.service_name]
+            cmd_args = [new_resource.parent.monit_binary]
+            cmd_args << '-v' if (defined?(new_resource.monit_verbose) && new_resource.monit_verbose) || Chef::Log.level == :debug
+            cmd_args.concat(['-c', new_resource.parent.config_path, monit_cmd, new_resource.service_name])
             Chef::Log.debug("[#{new_resource}] Running #{cmd_args.join(' ')}")
             cmd = poise_shell_out(cmd_args, user: new_resource.parent.owner, group: new_resource.parent.group)
             error = block ? block.call(cmd) : cmd.error?

data/lib/poise_monit/resources/monit_test.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/service_providers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/service_providers/monit.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/poise_monit/version.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 
 module PoiseMonit
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/poise-monit.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,11 +34,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w{lib}
 
   spec.add_dependency 'halite', '~> 1.1'
-  spec.add_dependency 'poise', '~> 2.5'
+  spec.add_dependency 'poise', '~> 2.6'
   spec.add_dependency 'poise-languages', '~> 1.3'
   spec.add_dependency 'poise-service', '~> 1.1'
 
-  spec.add_development_dependency 'poise-boiler', '~> 1.0'
+  spec.add_development_dependency 'berkshelf', '~> 4.0'
+  spec.add_development_dependency 'poise-boiler', '~> 1.6'
 
   # Leaving this hear but commented so it is clear this dependency has been
   # removed on purpose. It's going to be a rare thing, so don't pull it in.

data/test/{cookbooks/poise-monit_test → cookbook}/attributes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/{cookbooks/poise-monit_test → cookbook}/metadata.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/{cookbooks/poise-monit_test → cookbook}/recipes/default.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/gemfiles/chef-12.1.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.1.2'

data/test/gemfiles/chef-12.2.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.2.1'

data/test/gemfiles/chef-12.3.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.3.0'

data/test/gemfiles/chef-12.4.gemfile

@@ -0,0 +1,21 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.4.3'
+# Pending https://github.com/berkshelf/ridley/pull/335
+gem 'ridley', '4.4.1'

data/test/gemfiles/chef-12.5.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.5.1'

data/test/gemfiles/chef-12.6.gemfile

@@ -0,0 +1,19 @@
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
+
+gem 'chef', '~> 12.6.0'

data/test/gemfiles/chef-12.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 eval_gemfile File.expand_path('../../../Gemfile', __FILE__)
 
-gem 'chef', '~> 12.0'
+gem 'chef', '~> 12.6'

data/test/gemfiles/master.gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,4 +21,5 @@ gem 'halite', github: 'poise/halite'
 gem 'poise', github: 'poise/poise'
 gem 'poise-boiler', github: 'poise/poise-boiler'
 gem 'poise-languages', github: 'poise/poise-languages'
+gem 'poise-profiler', github: 'poise/poise-profiler'
 gem 'poise-service', github: 'poise/poise-service'

data/test/integration/default/serverspec/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/integration/default/serverspec/default_spec.rb

@@ -1,18 +1,18 @@
-# #
-# # Copyright 2015, Noah Kantrowitz
-# #
-# # Licensed under the Apache License, Version 2.0 (the "License");
-# # you may not use this file except in compliance with the License.
-# # You may obtain a copy of the License at
-# #
-# # http://www.apache.org/licenses/LICENSE-2.0
-# #
-# # Unless required by applicable law or agreed to in writing, software
-# # distributed under the License is distributed on an "AS IS" BASIS,
-# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# # See the License for the specific language governing permissions and
-# # limitations under the License.
-# #
+#
+# Copyright 2015-2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 require 'serverspec'
 set :backend, :exec

data/test/spec/monit_providers/binaries_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ describe PoiseMonit::MonitProviders::Binaries do
   end
 
   context 'with no version' do
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-linux-x64.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x64.tar.gz'
   end # /context with no version
 
   context 'with version 5.14' do
@@ -58,27 +58,39 @@ describe PoiseMonit::MonitProviders::Binaries do
 
   context 'on CentOS 7' do
     let(:chefspec_options) { {platform: 'centos', version: '7.0'} }
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-linux-x64.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x64.tar.gz'
   end # /context on CentOS 7
 
   context 'on Fedora 18 (x86)' do
     let(:chefspec_options) { {platform: 'fedora', version: '18'} }
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-linux-x86.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x86.tar.gz'
   end # /context on Fedora 18 (x86)
 
+  context 'on AIX 5' do
+    # Fauxhai doesn't have AIX 5 data, so fake it.
+    let(:chefspec_options) { {platform: 'aix', version: '6.1'} }
+    before { chef_runner.node.automatic['kernel']['version'] = 5 }
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix5.3-ppc.tar.gz'
+  end # /context on AIX 5
+
   context 'on AIX 6' do
     let(:chefspec_options) { {platform: 'aix', version: '6.1'} }
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-aix6.1-ppc.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix6.1-ppc.tar.gz'
   end # /context on AIX 6
 
+  context 'on AIX 7' do
+    let(:chefspec_options) { {platform: 'aix', version: '7.1'} }
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix6.1-ppc.tar.gz'
+  end # /context on AIX 7
+
   context 'on Solaris 5.11' do
     let(:chefspec_options) { {platform: 'solaris2', version: '5.11'} }
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-solaris-x64.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-solaris-x64.tar.gz'
   end # /context on Solaris 5.11
 
   context 'on OS X 10.11.1' do
     let(:chefspec_options) { {platform: 'mac_os_x', version: '10.11.1'} }
-    it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-macosx-universal.tar.gz'
+    it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-macosx-universal.tar.gz'
   end # /context on OS X 10.11.1
 
   context 'action :disable' do
@@ -90,6 +102,6 @@ describe PoiseMonit::MonitProviders::Binaries do
       end
     end
 
-    it { is_expected.to uninstall_poise_languages_static('/opt/monit-5.15') }
+    it { is_expected.to uninstall_poise_languages_static('/opt/monit-5.16') }
   end # /context action :disable
 end

data/test/spec/monit_providers/dummy_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/monit_providers/system_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/recipe_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/resources/monit_config_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/resources/monit_service_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@ describe PoiseMonit::Resources::MonitService do
   let(:test_provider) { test_resource.provider_for_action(action) }
   subject { test_provider.run_action }
   before do
+    # Force the default log level because it alters the tests.
+    chefspec_options.delete(:log_level)
     # Give us some files to work with that won't hit the disk.
     allow(File).to receive(:exist?).and_call_original
     allow(File).to receive(:exist?).with('/exists').and_return(true)
@@ -34,19 +36,19 @@ describe PoiseMonit::Resources::MonitService do
     # Status for simple cases.
     stub_status(status) if status
   end
-  def stub_cmd(cmd, error: false, stdout: '', stderr: '', &block)
+  def stub_cmd(cmd, error: false, stdout: '', stderr: '', verbose: false, &block)
     fake_cmd = double("output of monit #{cmd}", error?: error, stdout: stdout, stderr: stderr)
     if error
       allow(fake_cmd).to receive(:error!).and_raise(Mixlib::ShellOut::ShellCommandFailed)
     else
       allow(fake_cmd).to receive(:error!)
     end
-    matcher = receive(:poise_shell_out).with(['/bin/monit', '-c', '/etc/monit/monitrc', cmd, 'myapp'], user: nil, group: nil).and_return(fake_cmd).ordered
+    matcher = receive(:poise_shell_out).with(['/bin/monit', (verbose ? '-v' : []), '-c', '/etc/monit/monitrc', cmd, 'myapp'].flatten, user: nil, group: nil).and_return(fake_cmd).ordered
     matcher = block.call(matcher) if block
     expect(test_provider).to matcher
   end
-  def stub_status(status)
-    stub_cmd('status', stdout: "Process 'myapp'\n  status       #{status}")
+  def stub_status(status, verbose: false)
+    stub_cmd('status', stdout: "Process 'myapp'\n  status       #{status}", verbose: verbose)
   end
 
   describe 'action :enable' do
@@ -67,6 +69,31 @@ describe PoiseMonit::Resources::MonitService do
         subject
       end
     end # /context with status Running
+
+    context 'with monit_verbose' do
+      before do
+        test_resource.monit_verbose(true)
+      end
+      it do
+        stub_status('Not monitored', verbose: true)
+        stub_cmd('monitor', verbose: true)
+        subject
+      end
+    end # /context with monit_verbose
+
+    context 'with log_level debug' do
+      before do
+        chefspec_options[:log_level] = :debug
+        # Don't actually show debug or info logs.
+        allow(Chef::Log).to receive(:info)
+        allow(Chef::Log).to receive(:debug)
+      end
+      it do
+        stub_status('Not monitored', verbose: true)
+        stub_cmd('monitor', verbose: true)
+        subject
+      end
+    end # /context with log_level debug
   end # /describe action :enable
 
   describe 'action :disable' do

data/test/spec/resources/monit_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,9 +21,14 @@ describe PoiseMonit::Resources::Monit do
   let(:monit_version) { '5.15' }
   let(:monit_version_cmd) { double('monit_version_cmd', error?: false, stdout: "This is Monit version #{monit_version}\nCopyright (C) 2001-2013 Tildeslash Ltd. All Rights Reserved.\n") }
   before do
+    # Force the default log level because it alters the tests.
+    chefspec_options.delete(:log_level)
     allow_any_instance_of(described_class::Resource).to receive(:shell_out).and_call_original
     allow_any_instance_of(described_class::Resource).to receive(:shell_out).with(%w{/bin/monit -V}).and_return(monit_version_cmd)
   end
+  def service_resource(name)
+    chef_run.monit(name).provider_for_action(:enable).send(:service_resource)
+  end
 
   context 'action :enable' do
     recipe do
@@ -33,6 +38,7 @@ describe PoiseMonit::Resources::Monit do
     it { is_expected.to render_file('/etc/monit/monitrc').with_content(<<-EOH) }
 # Generated by Chef for monit[monit]
 
+
 SET PIDFILE /var/run/monit_real.pid
 
 SET LOGFILE /var/log/monit.log
@@ -50,6 +56,7 @@ EOH
     it { is_expected.to create_directory('/etc/monit/conf.d') }
     it { is_expected.to create_directory('/var/lib/monit') }
     it { is_expected.to create_directory('/var/lib/monit/events') }
+    it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120' }
 
     context 'with a different name' do
       recipe do
@@ -59,6 +66,7 @@ EOH
       it { is_expected.to render_file('/etc/monit-other/monitrc').with_content(<<-EOH) }
 # Generated by Chef for monit[other]
 
+
 SET PIDFILE /var/run/monit-other_real.pid
 
 SET LOGFILE /var/log/monit-other.log
@@ -76,8 +84,66 @@ EOH
       it { is_expected.to create_directory('/etc/monit-other/conf.d') }
       it { is_expected.to create_directory('/var/lib/monit-other') }
       it { is_expected.to create_directory('/var/lib/monit-other/events') }
+      it { expect(service_resource('other').command).to eq '/bin/monit -c /etc/monit-other/monitrc -I -d 120' }
     end # /context with a different name
 
+    context 'with daemon_delay 0' do
+      recipe do
+        monit 'monit' do
+          daemon_delay 0
+        end
+      end
+
+      it { is_expected.to render_file('/etc/monit/monitrc').with_content(<<-EOH) }
+# Generated by Chef for monit[monit]
+
+SET DAEMON 120
+
+SET PIDFILE /var/run/monit_real.pid
+
+SET LOGFILE /var/log/monit.log
+
+SET IDFILE /var/lib/monit/id
+SET STATEFILE /var/lib/monit/state
+SET EVENTQUEUE BASEDIR /var/lib/monit/events SLOTS 100
+
+SET HTTPD UNIXSOCKET /var/run/monit.sock
+  ALLOW 0.0.0.0/0
+
+INCLUDE /etc/monit/conf.d/*
+EOH
+      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I' }
+    end # /context with daemon_delay 0
+
+    context 'with daemon_delay 5' do
+      recipe do
+        monit 'monit' do
+          daemon_delay 5
+        end
+      end
+
+      it { is_expected.to render_file('/etc/monit/monitrc').with_content(<<-EOH) }
+# Generated by Chef for monit[monit]
+
+SET DAEMON 120
+  WITH START DELAY 5
+
+SET PIDFILE /var/run/monit_real.pid
+
+SET LOGFILE /var/log/monit.log
+
+SET IDFILE /var/lib/monit/id
+SET STATEFILE /var/lib/monit/state
+SET EVENTQUEUE BASEDIR /var/lib/monit/events SLOTS 100
+
+SET HTTPD UNIXSOCKET /var/run/monit.sock
+  ALLOW 0.0.0.0/0
+
+INCLUDE /etc/monit/conf.d/*
+EOH
+      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I' }
+    end # /context with daemon_delay 5
+
     context 'with 0 events slots' do
       recipe do
         monit 'monit' do
@@ -97,5 +163,26 @@ EOH
 
       it { is_expected.to render_file('/etc/monit/monitrc').with_content("SET EVENTQUEUE BASEDIR /var/lib/monit/events\n") }
     end # /context with -1 events slots
+
+    context 'with daemon_verbose' do
+      recipe do
+        monit 'monit' do
+          daemon_verbose true
+        end
+      end
+
+      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
+    end # /context with daemon_verbose
+
+    context 'with log_level debug' do
+      before do
+        chefspec_options[:log_level] = :debug
+        # Don't actually show debug or info logs.
+        allow(Chef::Log).to receive(:info)
+        allow(Chef::Log).to receive(:debug)
+      end
+
+      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
+    end # /context with log_level debug
   end # /context action :enable
 end

data/test/spec/service_providers/monit_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015, Noah Kantrowitz
+# Copyright 2015-2016, Noah Kantrowitz
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-monit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: poise-languages
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: berkshelf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: poise-boiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 description: A Chef cookbook for managing the Monit process manager.
 email:
 - noah@coderanger.net
@@ -118,11 +132,17 @@ files:
 - lib/poise_monit/service_providers/monit.rb
 - lib/poise_monit/version.rb
 - poise-monit.gemspec
-- test/cookbooks/poise-monit_test/attributes/default.rb
-- test/cookbooks/poise-monit_test/metadata.rb
-- test/cookbooks/poise-monit_test/recipes/default.rb
+- test/cookbook/attributes/default.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/Gemfile
@@ -161,11 +181,17 @@ signing_key:
 specification_version: 4
 summary: A Chef cookbook for managing the Monit process manager.
 test_files:
-- test/cookbooks/poise-monit_test/attributes/default.rb
-- test/cookbooks/poise-monit_test/metadata.rb
-- test/cookbooks/poise-monit_test/recipes/default.rb
+- test/cookbook/attributes/default.rb
+- test/cookbook/metadata.rb
+- test/cookbook/recipes/default.rb
 - test/docker/docker.ca
 - test/docker/docker.pem
+- test/gemfiles/chef-12.1.gemfile
+- test/gemfiles/chef-12.2.gemfile
+- test/gemfiles/chef-12.3.gemfile
+- test/gemfiles/chef-12.4.gemfile
+- test/gemfiles/chef-12.5.gemfile
+- test/gemfiles/chef-12.6.gemfile
 - test/gemfiles/chef-12.gemfile
 - test/gemfiles/master.gemfile
 - test/integration/default/serverspec/Gemfile