magic_recipes_two 0.0.94 → 0.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b50067781cfa8d65ac3c4ae487d5fa03dbe28ef2d26e7941219df9cee775a0cf
-  data.tar.gz: a9c3c528b5786f54ce9c239f74eb4f1a067fb5706b788bfc593b44d96ca65054
+  metadata.gz: c6cc995232184811a31e0138cb4fe99cd50099db4af9f88e8788f9cb60c009a0
+  data.tar.gz: c4b44eedfced7af031ddc139b02c542fce6d883ca2c20d6de90b94f66fe28db3
 SHA512:
-  metadata.gz: b1009790183b10583e375dfaed183b921d422ae90118bc6b6b06b2b423696b1dbacc080c00476652cb44fbc4065085578c34a2f2cc935477dbe281307e8203bc
-  data.tar.gz: d8c692af47aa1e66249a1ebd6d0d453ac61d509cb37a2e708aee2f2682bb71757d500d2daa0ddb6effe0755c666e69215e60e7c1447b89b73b515ce185482f98
+  metadata.gz: daeb145647e4c9ff534d4d034eea9eab3bd58bc1fa148adc74b3ff0a9a7a495bff25d487838b584413dc62bb0a917082cb6f80f09bc5761808fa5a56120507fb
+  data.tar.gz: 84f68613626eacb0109566a8e05e3283ee52ec9495dc1d37d76280a86bf0b2c7e14906b81d72c6b18b8b37fd4b0af59428a3997015ca832c9cb94c63c033ab3e

data/lib/capistrano/magic_recipes/sidekiq_helpers.rb

@@ -0,0 +1,66 @@
+module Capistrano
+  module MagicRecipes
+    module SidekiqHelpers
+      
+      
+      def for_each_process(reverse = false, &block)
+        pids = processes_deamones
+        pids.reverse! if reverse
+        pids.each_with_index do |service_file, idx|
+          within fetch(:sidekiq_six_deamon_path) do
+            yield(service_file, idx)
+          end
+        end
+      end
+  
+      def processes_deamones
+        deamons = []
+        if fetch(:sidekiq_six_special_queues)
+          fetch(:sidekiq_six_queued_processes, []).each do |qp|
+            counter = (qp[:processes] && qp[:processes].to_i > 0 ? qp[:processes].to_i : 1)
+            if counter > 1
+              counter.times do |idx|
+                deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }-#{ idx }"
+              end
+            else
+              deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }"
+            end
+          end
+        else
+          counter = fetch(:sidekiq_six_processes).to_i 
+          if counter > 1
+            counter.times do |idx|
+              deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ idx }"
+            end
+          else
+            deamons.push "#{ fetch(:sidekiq_six_deamon_file) }"
+          end
+        end
+        deamons
+      end
+  
+      def sidekiq_special_config(idx)
+        if fetch(:sidekiq_six_special_queues)
+          settingz = []
+          fetch(:sidekiq_six_queued_processes).each do |that|
+            (that[:processes] && that[:processes].to_i > 0 ? that[:processes].to_i : 1 ).to_i.times do
+              sttng_hash = {}
+              sttng_hash[:queue] = that[:queue] ? that[:queue] : "default"
+              sttng_hash[:concurrency] = that[:worker] && that[:worker].to_i > 0 ? that[:worker].to_i : 7
+              settingz.push( sttng_hash )
+            end
+          end
+          settingz[ idx.to_i ]
+        else
+          {}
+        end
+      end
+      
+      
+    end
+  end
+end
+
+
+
+

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.94"
+    VERSION = "0.0.95"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -1,4 +1,6 @@
 require 'capistrano/magic_recipes/base_helpers'
+require 'capistrano/magic_recipes/sidekiq_helpers'
+include Capistrano::MagicRecipes::SidekiqHelpers
 include Capistrano::MagicRecipes::BaseHelpers
 
 namespace :load do
@@ -10,11 +12,10 @@ namespace :load do
     set :monit_logfile,               -> { "#{shared_path}/log/monit.log" }
     set :monit_idfile,                -> { '/var/lib/monit/id' }
     set :monit_statefile,             -> { '/var/lib/monit/state' }
-    set :monit_downgrade_on_deploy,   -> { false }
     ## Status
     set :monit_active,                -> { true }
     set :monit_main_rc,               -> { true }
-    # set :monit_processes,             -> { %w[nginx pm2 postgresql pwa redis sidekiq thin website website2 website3] }
+    # set :monit_processes,             -> { %w[nginx pm2 postgresql pwa redis sidekiq thin website website_checks file_checks] }
     set :monit_processes,             -> { %w[nginx postgresql thin website] }
     set :monit_name,                  -> { "#{ fetch(:application) }_#{ fetch(:stage) }" }
     ## Mailer
@@ -28,24 +29,22 @@ namespace :load do
     set :monit_mail_reply_to,         -> { "support@foo.bar" }
     set :monit_ignore,                -> { [] }  # %w[action pid]
     ## Additional stuff for postrgres
-    set :postgresql_roles,            -> { :db }
-    set :postgresql_pid,              -> { "/var/run/postgresql/9.1-main.pid" }
+    set :monit_pg_pid,                -> { "/var/run/postgresql/12-main.pid" }
     ## Additional stuff for thin (need secrets_key_base to be set)
     set :monit_thin_totalmem_mb,      -> { 300 }
+    set :monit_thin_pid_path,         -> { fetch(:thin_pid_path, "/home/#{fetch(:user)}/run") }
+    set :thin_sysd_roles,             -> { fetch(:thin_roles) }
     ## Additional stuff for sidekiq (need secrets_key_base to be set)
     set :monit_sidekiq_totalmem_mb,   -> { 300 }
     set :monit_sidekiq_timeout_sec,   -> { 90 }
+    set :monit_sidekiq_pid_path,      -> { fetch(:sidekiq_six_pid_path, "/home/#{fetch(:user)}/run") }
     ## Additional App helpers
     set :monit_app_worker_command,    -> { "cd #{ current_path } ; #{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do bundle exec MONIT_CMD" }
     set :monit_app_worker_role,       -> { :user }  # user / bash / shell
     set :monit_app_worker_prefix,     -> { :rvm }   # rvm / rvm1capistrano3 / env
     ## WebClient
     set :monit_http_client,           -> { true }
-    set :monit_http_domain,           -> { false }
     set :monit_http_port,             -> { 2812 }
-    set :monit_http_use_ssl,          -> { false }
-    set :monit_http_allow_self_certification, -> { false }
-    set :monit_http_pemfile,          -> { "/etc/monit/monit.pem" }
     set :monit_http_username,         -> { "admin" }
     set :monit_http_password,         -> { "monitor" }
     # use a subdomain for monit?
@@ -56,23 +55,16 @@ namespace :load do
     set :monit_webclient_ssl_key,     -> { false }
     set :monit_nginx_template,        -> { :default }
     ## Website
+    set :monit_website_check_name,    -> { "#{fetch(:application)}-#{fetch(:stage)}" }
     set :monit_website_check_timeout, -> { 10 }
     set :monit_website_check_cycles,  -> { 3 }
     set :monit_website_check_content, -> { false }
     set :monit_website_check_path,    -> { "/" }
     set :monit_website_check_text,    -> { "<!DOCTYPE html>" }
-    ## Website2
-    set :monit_website2_check_domains, -> { [] }
-    set :monit_website2_check_ssl,     -> { false }
-    set :monit_website2_check_content, -> { false }
-    set :monit_website2_check_path,    -> { "/" }
-    set :monit_website2_check_text,    -> { "<!DOCTYPE html>" }
-    ## Website3
-    set :monit_website3_check_domains, -> { [] }
-    set :monit_website3_check_ssl,     -> { false }
-    set :monit_website3_check_content, -> { false }
-    set :monit_website3_check_path,    -> { "/" }
-    set :monit_website3_check_text,    -> { "<!DOCTYPE html>" }
+    ## check other Sites:
+    set :monit_websites_to_check,     -> { [] }
+    # Website: { name: String, domain: String, ssl: Boolean, check_content: Boolean, path: String, content: String }
+    
     ## M/Monit
     set :monit_mmonit_url,            -> { false }
     
@@ -83,12 +75,23 @@ namespace :load do
     set :monit_pm2_pid_path,          -> { "/home/#{fetch(:user)}/.pm2/pids" }
     set :monit_pm2_start_script,      -> { "ecosystem.config.js" }
     set :monit_pm2_stage,             -> { "production" }
-    set :monit_pm2_website,           -> { "example.com" }
-    set :monit_pm2_website_ssl,       -> { false }
     set :pm2_roles,                   -> { :web }
     set :monit_pm2_worker_role,       -> { :user }
     set :monit_pm2_worker_prefix,     -> { "" }
+    set :monit_pm2_check_website,     -> { false }
+    set :monit_pm2_website_name,      -> { "PM2 #{fetch(:application)} #{fetch(:stage)}" }
+    set :monit_pm2_website_url,       -> { "example.com" }
+    set :monit_pm2_website_ssl,       -> { false }
+    
     
+    ## Check files
+    set :monit_files_to_check,        -> { [] }
+    ## FILE: { name: String, path: String, max_size: Integer, clear: Boolean }
+    
+    ## Slack Alerts
+    set :monit_use_slack,             -> { false }
+    set :monit_slack_webhook,         -> { "" } # your Slack webhook URL
+    set :monit_slack_bin_path,        -> { "/etc/monit/alert_slack.sh" }
     
   end
 end
@@ -115,8 +118,8 @@ namespace :monit do
       # invoke "monit:redis"
       # invoke "monit:thin"
       # invoke "monit:configure_website"
-      %w[nginx pm2 postgresql pwa redis sidekiq thin website website2 website3].each do |command|
-        invoke "monit:configure_#{command}" if Array(fetch(:monit_processes)).include?(command)
+      %w[nginx pm2 postgresql pwa redis sidekiq sidekiq_six thin thin_sysd website website_checks file_checks].each do |command|
+        invoke "monit:#{command}:configure" if Array(fetch(:monit_processes)).include?(command)
       end
       if fetch(:monit_webclient, false) && fetch(:monit_webclient_domain, false)
         invoke "nginx:monit:add"
@@ -135,7 +138,7 @@ namespace :monit do
     end
   end
   
-  %w[nginx pm2 postgresql redis sidekiq thin].each do |process|
+  %w[nginx pm2 postgresql redis sidekiq sidekiq_six thin thin_sysd].each do |process|
     namespace process.to_sym do
       
       %w[monitor unmonitor start stop restart].each do |command|
@@ -174,10 +177,12 @@ namespace :monit do
             end
           end
         end
-      elsif %w[pm2 pwa sidekiq thin].include?(process)
+      elsif %w[pm2 pwa sidekiq thin sidekiq_six thin_sysd].include?(process)
         ## App specific tasks (unique for app and environment)
         desc "Upload Monit #{process} config file (app specific)"
         task "configure" do
+          puts "configure: #{process}"
+          puts ":monit_processes: #{ Array(fetch(:monit_processes)) }"
           if Array(fetch(:monit_processes)).include?(process)
             on release_roles fetch("#{process}_roles".to_sym) do |role|
               monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
@@ -189,14 +194,13 @@ namespace :monit do
     end
   end
   
-  %w[pwa website website2 website3].each do |process|
+  %w[pwa website website_checks file_checks].each do |process|
     namespace process.to_sym do
       
       desc "Upload Monit #{process} config file (app specific)"
-      task "configure_#{process}" do
+      task "configure" do
         if Array(fetch(:monit_processes)).include?(process)
-          on release_roles fetch("#{process =~ /website/ ? 'nginx' : process}_roles".to_sym, :web) do |role|
-            process_file = process =~ /^website\d{1}$/ ? 'websiteX' : process
+          on release_roles fetch("#{process =~ /^website|file/ ? 'nginx' : process}_roles".to_sym, :web) do |role|
             monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
           end
         end
@@ -206,6 +210,19 @@ namespace :monit do
   end
   
   
+  namespace :slack do
+    desc 'Downgrade MONIT to 5.16 (fix action problem)'
+    task :configure do
+      on roles :db do
+        on release_roles fetch(:monit_roles) do |role|
+          monit_config 'alert_slack', "#{ fetch(:monit_slack_bin_path) }", role
+          execute :sudo, "chmod +x  #{ fetch(:monit_slack_bin_path) }"
+        end
+      end
+    end
+  end
+  
+  
   
 
   %w[start stop restart syntax reload].each do |command|
@@ -221,6 +238,10 @@ namespace :monit do
     fetch(:sidekiq_service_name, "#{fetch(:application)}_#{fetch(:stage)}_sidekiq_") + index.to_s
   end
   
+  def sidekiq_six_service_name(service_file)
+    "#{fetch(:application)}_#{fetch(:stage)}_sidekiq_#{ service_file.split('-').last }"
+  end
+  
 end
 
 def monit_config( name, destination = nil, role = nil )
@@ -268,6 +289,44 @@ end
 
 
 
+
+def init_site_check_item( domain )
+  ## defaults
+  that = { ssl: false, check_content: false, path: '/', content: '<!DOCTYPE html>', timeout: 30, cycles: 3 }
+  that.merge! domain
+  that[:name] = that[:domain]   if [nil, '', ' '].include?( that[:name] )
+  that
+end
+
+def init_file_check_item( file )
+  ## defaults
+  that = { name: '', path: '', max_size: 12, clear: false }
+  that.merge! file
+  that[:name] = that[:path].to_s.split('/').last   if [nil, '', ' '].include?( that[:name] )
+  that
+end
+
+def monit_website_list
+  Array( fetch(:monit_websites_to_check) ).map{ |x| init_site_check_item(x) }
+end
+
+def monit_files_list
+  Array( fetch(:monit_files_to_check) ).map{ |x| init_file_check_item(x) }
+end
+
+
+
+def monit_alert
+  if fetch(:monit_use_slack, false)
+    "exec #{fetch(:monit_slack_bin_path)} and repeat every 3 cycles"
+  else
+    "alert"
+  end
+end
+
+
+
+
 namespace :nginx do
   namespace :monit do
     
@@ -316,7 +375,11 @@ namespace :lets_encrypt do
   desc "Generate MONIT-WebClient LetsEncrypt certificate"
   task :monit_certonly do
     on release_roles fetch(:lets_encrypt_roles) do
-      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public -d #{ fetch(:monit_webclient_domain).gsub(/^\*?\./, '') }"
+      if fetch(:lets_encrypt_client) == "certbot-auto"
+        execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public -d #{ fetch(:monit_webclient_domain).gsub(/^\*?\./, '') }"
+      else
+        execute :sudo, "certbot --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public -d #{ fetch(:monit_webclient_domain).gsub(/^\*?\./, '') }"
+      end
     end
   end
   

data/lib/capistrano/tasks/sidekiq_six.rake

@@ -1,3 +1,6 @@
+require 'capistrano/magic_recipes/sidekiq_helpers'
+include Capistrano::MagicRecipes::SidekiqHelpers
+
 ##
 ## NEW!   for sidekiqs new deamonized style
 ##
@@ -22,6 +25,7 @@ namespace :load do
     ## => [ { queue: "queue_name", processes: "count", worker: "count" }]
     
     set :sidekiq_six_deamon_path,       -> { "/lib/systemd/system" }
+    set :sidekiq_six_pid_path,          -> { "/home/#{fetch(:user)}/run" }
     set :sidekiq_six_deamon_template,   -> { :default }
     
     set :sidekiq_six_ruby_vm,           -> { :system }   # ( :rvm | :rbenv | :system )
@@ -35,58 +39,7 @@ end
 
 namespace :sidekiq_six do
   
-  def for_each_process(reverse = false, &block)
-    pids = processes_deamones
-    pids.reverse! if reverse
-    pids.each_with_index do |service_file, idx|
-      within fetch(:sidekiq_six_deamon_path) do
-        yield(service_file, idx)
-      end
-    end
-  end
   
-  def processes_deamones
-    deamons = []
-    if fetch(:sidekiq_six_special_queues)
-      fetch(:sidekiq_six_queued_processes, []).each do |qp|
-        counter = (qp[:processes] && qp[:processes].to_i > 0 ? qp[:processes].to_i : 1)
-        if counter > 1
-          counter.times do |idx|
-            deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }-#{ idx }"
-          end
-        else
-          deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }"
-        end
-      end
-    else
-      counter = fetch(:sidekiq_six_processes).to_i 
-      if counter > 1
-        counter.times do |idx|
-          deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ idx }"
-        end
-      else
-        deamons.push "#{ fetch(:sidekiq_six_deamon_file) }"
-      end
-    end
-    deamons
-  end
-  
-  def sidekiq_special_config(idx)
-    if fetch(:sidekiq_six_special_queues)
-      settingz = []
-      fetch(:sidekiq_six_queued_processes).each do |that|
-        (that[:processes] && that[:processes].to_i > 0 ? that[:processes].to_i : 1 ).to_i.times do
-          sttng_hash = {}
-          sttng_hash[:queue] = that[:queue] ? that[:queue] : "default"
-          sttng_hash[:concurrency] = that[:worker] && that[:worker].to_i > 0 ? that[:worker].to_i : 7
-          settingz.push( sttng_hash )
-        end
-      end
-      settingz[ idx.to_i ]
-    else
-      {}
-    end
-  end
   
   def upload_deamon(service_file, idx = 0)
     args = []

data/lib/capistrano/tasks/thin_sysd.rake

@@ -21,6 +21,7 @@ namespace :load do
     set :thin_daemon_ruby_vm,         -> { :system }   # ( :rvm | :rbenv | :system )
     set :thin_daemon_file,            -> { "thin_#{fetch(:application)}_#{fetch(:stage)}" }
     set :thin_daemon_path,            -> { "/lib/systemd/system" }
+    set :thin_pid_path,               -> { "/home/#{fetch(:user)}/run" }
     set :thin_daemon_template,        -> { :default }
     set :thin_daemon_log_lines,       -> { 100 }
     set :thin_daemon_user,            -> { fetch(:user, 'deploy') }  # role-user

data/lib/generators/capistrano/magic_recipes/templates/monit/alert_slack.erb

@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"*$MONIT_SERVICE* - \`${MONIT_DESCRIPTION}\`\n> $MONIT_HOST\"}" <%= fetch(:monit_slack_webhook) %>

data/lib/generators/capistrano/magic_recipes/templates/monit/file_checks.erb

@@ -0,0 +1,12 @@
+# Check files for <%= fetch(:application) %> [<%= fetch(:stage) %>]
+<% monit_files_list.each do |that| %>
+check file "<%= that[:name] %>" with path <%= that[:path] %>
+	if size > <%= that[:max_size].to_i %> GB then <%= monit_alert %>
+	<% if that[:clear] %>
+	if size > <%= that[:max_size].to_i %> GB
+		for 3 cycles
+		then exec '/bin/echo "cleared by MONIT - $( date +"%F - %R" ):" > <%= that[:path] %>'
+		repeat every 20 cycles
+	<% end %>
+
+<% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/monitrc.erb

@@ -28,11 +28,9 @@ set mail-format {
     Your faithful employee,
     M O N I T
     
-    <% if fetch(:monit_http_client) %><% if fetch(:monit_http_domain) %>
-    Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_http_domain) %>:<%= fetch(:monit_http_port) %>/
-    <% else %>
-    Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:app_server_ip) %>:<%= fetch(:monit_http_port) %>/
-    <% end %><% end %>
+    <% if fetch(:monit_webclient) %>
+    Web:      <%= fetch(:monit_webclient_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_webclient_domain) %>
+    <% end %>
 }
 
 set mailserver <%= fetch(:monit_mail_server) %> port <%= fetch(:monit_mail_port) %>
@@ -44,29 +42,21 @@ set mailserver <%= fetch(:monit_mail_server) %> port <%= fetch(:monit_mail_port)
 
 set alert <%= fetch(:monit_mail_to) %><%= Array( fetch(:monit_ignore, nil) ).count > 0 ? " but not on { #{ Array( fetch(:monit_ignore, nil) ).join(", ") } }" : "" %>
 
-<% if fetch(:monit_http_client) %>
+<% if fetch(:monit_webclient) %>
 set httpd port <%= fetch(:monit_http_port) %>
-    <% if fetch(:monit_http_domain) %>
-    use address <%= fetch(:monit_http_domain) %>
-    <% end %>
-    # allow 127.0.0.1
-    <% if fetch(:monit_http_use_ssl) %>
-    ssl enable
-    pemfile <%= fetch(:monit_http_pemfile) %>
-    <% if fetch(:monit_http_allow_self_certification) %>
-    ALLOWSELFCERTIFICATION
-    <% end %>
-    <% end %>
+		<% if fetch(:monit_webclient_use_ssl, false) %>
+    allow 127.0.0.1
+		<% end %>
     allow <%= fetch(:monit_http_username) %>:<%= fetch(:monit_http_password) %>
 <% end %>
 
 check system <%= fetch(:monit_name, "#{ fetch(:application) }_server") %>
-    if loadavg(5min) > 2 for 2 cycles then alert
-    if memory > 75% for 2 cycles then alert
-    if cpu(user) > 75% for 2 cycles then alert
+    if loadavg(5min) > 2 for 2 cycles then <%= monit_alert %>
+    if memory > 75% for 2 cycles then <%= monit_alert %>
+    if cpu(user) > 75% for 2 cycles then <%= monit_alert %>
 
 check device HardDrive with path /
-    if SPACE usage > 75% then alert
+    if SPACE usage > 75% then <%= monit_alert %>
 
 
 <% if fetch(:monit_mmonit_url, false) %>

data/lib/generators/capistrano/magic_recipes/templates/monit/nginx.erb

@@ -3,10 +3,10 @@ check process nginx with pidfile /var/run/nginx.pid
   start program = "/etc/init.d/nginx start"
   stop program = "/etc/init.d/nginx stop"
   # if does not exist then start # (default)
-  # if does not exist for 3 cycles then alert
-  if 3 restarts within 5 cycles then alert
+  # if does not exist for 3 cycles then <%= monit_alert %>
+  if 3 restarts within 5 cycles then <%= monit_alert %>
   if children > 250 then restart
   if failed host 127.0.0.1 port 80 then restart
-  if cpu is greater than 40% for 2 cycles then alert
+  if cpu is greater than 40% for 2 cycles then <%= monit_alert %>
   if cpu > 60% for 5 cycles then restart 
   if 10 restarts within 10 cycles then timeout

data/lib/generators/capistrano/magic_recipes/templates/monit/pm2.erb

@@ -5,19 +5,20 @@
     start program = "<%= monit_pm2_prefixed("pm2 restart #{fetch(:monit_pm2_start_script)} --env #{fetch(:monit_pm2_stage)}") %>"
     stop program = "<%= monit_pm2_prefixed("pm2 stop #{fetch(:monit_pm2_start_script)} --env #{fetch(:monit_pm2_stage)}") %>"
     # if does not exist then start # (default)
-    if does not exist for 3 cycles then alert
-    # if 3 restarts within 10 cycles then alert
-    # if cpu > 50% then alert
+    if does not exist for 3 cycles then <%= monit_alert %>
+    # if 3 restarts within 10 cycles then <%= monit_alert %>
+    # if cpu > 50% then <%= monit_alert %>
     # if cpu > 50% for 3 cycles then restart
     # if 5 restarts within 15 cycles then timeout
     # alert <%= fetch(:monit_mail_to) %> only on { pid }
-    if changed pid 3 times within 10 cycles then alert
+    if changed pid 3 times within 10 cycles then <%= monit_alert %>
 <% end %>
 
 
-
+<% if fetch(:monit_pm2_check_website, false) %>
 # Check website for pm2: <%= fetch(:application) %> [<%= fetch(:stage) %>]
-check host <%= fetch(:monit_pm2_website) %> with address <%= fetch(:monit_pm2_website) %>
+check host "<%= fetch(:monit_pm2_website_name).gsub(/\s+/,'-').gsub(/_/,'-').gsub(/:/,'-').gsub(/--+/,'-') %>" with address <%= fetch(:monit_pm2_website_url) %>
+  <% if fetch(:monit_pm2_website_ssl) %>if failed port 443 protocol https and certificate valid > 2 days then <%= monit_alert %><% end %>
   if failed 
   <% if fetch(:monit_pm2_website_ssl) %>
     port 443
@@ -27,6 +28,8 @@ check host <%= fetch(:monit_pm2_website) %> with address <%= fetch(:monit_pm2_we
     port 80
     protocol http
   <% end %>
-    # status = 200
+    status = 200
     with timeout 13 seconds for 5 cycles 
-  then alert
+  then <%= monit_alert %>
+
+<% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/postgresql.erb

@@ -1,9 +1,9 @@
 # Monit configuration for POSTGRESQL :  <%= fetch(:application) %>
-check process postgresql with pidfile <%= fetch(:postgresql_pid) %>
+check process postgresql with pidfile <%= fetch(:monit_pg_pid) %>
   start program = "/etc/init.d/postgresql start"
   stop program = "/etc/init.d/postgresql stop"
   # if does not exist then start # (default)
-  # if does not exist for 3 cycles then alert
-  if 3 restarts within 5 cycles then alert
+  # if does not exist for 3 cycles then <%= monit_alert %>
+  if 3 restarts within 5 cycles then <%= monit_alert %>
   if failed host localhost port 5432 protocol pgsql then restart
   if 5 restarts within 5 cycles then timeout

data/lib/generators/capistrano/magic_recipes/templates/monit/pwa.erb

@@ -19,5 +19,5 @@ check host <%= domain %> with address <%= domain %>
     protocol http
   <% end %>
     with timeout 13 seconds for 5 cycles 
-  then alert
+  then <%= monit_alert %>
 <% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/redis.erb

@@ -3,9 +3,9 @@ check process redis with pidfile <%= fetch(:redis_pid) %>
     start program = "/etc/init.d/redis-server start"
     stop program = "/etc/init.d/redis-server stop"
     # if does not exist then start # (default)
-    # if does not exist for 3 cycles then alert
-    if 3 restarts within 5 cycles then alert
-    if totalmem > 100 Mb then alert
+    # if does not exist for 3 cycles then <%= monit_alert %>
+    if 3 restarts within 5 cycles then <%= monit_alert %>
+    if totalmem > 100 Mb then <%= monit_alert %>
     if children > 255 for 5 cycles then stop
     if cpu usage > 95% for 3 cycles then restart
     if failed host 127.0.0.1 port 6379 then restart

data/lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb

@@ -31,12 +31,12 @@ check process <%= sidekiq_service_name(idx) %>
   stop program = "<%=    monit_app_prefixed("sidekiqctl stop #{ pid_file }")   %>" with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
   group sidekiq-<%= fetch(:sidekiq_monit_group, fetch(:application)) %>-<%= fetch(:stage) %>
   # if does not exist then start # (default)
-  if totalmem > <%= ( fetch( :monit_sidekiq_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then alert
+  if totalmem > <%= ( fetch( :monit_sidekiq_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then <%= monit_alert %>
   if totalmem > <%= fetch( :monit_sidekiq_totalmem_mb, 300 ) %> MB for 2 cycles then restart
-  # if does not exist for 3 cycles then alert
+  # if does not exist for 3 cycles then <%= monit_alert %>
   # alert <%= fetch(:monit_mail_to) %> only on { pid }
-  if 3 restarts within 5 cycles then alert
+  if 3 restarts within 5 cycles then <%= monit_alert %>
   if 3 restarts within 5 cycles then timeout
-  if 2 restarts within 3 cycles then alert
-  if changed pid 2 times within 10 cycles then alert
+  if 2 restarts within 3 cycles then <%= monit_alert %>
+  if changed pid 2 times within 10 cycles then <%= monit_alert %>
 <% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/sidekiq_six.erb

@@ -0,0 +1,19 @@
+# Monit configuration for SIDEKIQ-six :  <%= fetch(:application) %>  (<%= fetch(:stage) %>)
+<% for_each_process do |service_file, idx| %>
+
+CHECK process <%= sidekiq_six_service_name(service_file) %> with pidfile <%= fetch(:monit_sidekiq_pid_path) %>/<%= service_file %>.pid
+  start program = "/bin/systemctl start <%= service_file %>" with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
+  stop program = "/bin/systemctl stop <%= service_file %>" with timeout <%= fetch(:monit_sidekiq_timeout_sec, 90) %> seconds
+  GROUP sidekiq-<%= fetch(:sidekiq_monit_group, fetch(:application)) %>-<%= fetch(:stage) %>
+	GROUP sidekiq
+  # if does not exist then start # (default)
+  if totalmem > <%= ( fetch( :monit_sidekiq_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then <%= monit_alert %>
+  if totalmem > <%= fetch( :monit_sidekiq_totalmem_mb, 300 ) %> MB for 2 cycles then restart
+  # if does not exist for 3 cycles then <%= monit_alert %>
+  # alert <%= fetch(:monit_mail_to) %> only on { pid }
+  if 3 restarts within 5 cycles then <%= monit_alert %>
+  if 3 restarts within 5 cycles then timeout
+  if 2 restarts within 3 cycles then <%= monit_alert %>
+  if changed pid 2 times within 10 cycles then <%= monit_alert %>
+
+<% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/thin.erb

@@ -5,13 +5,13 @@
     start program = "<%=   monit_app_prefixed("thin start -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")    %>"
     stop program = "<%=    monit_app_prefixed("thin stop -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")     %>"
     # if does not exist then start # (default)
-    # if does not exist for 3 cycles then alert
-    if 3 restarts within 5 cycles then alert
-    if mem > <%= ( fetch( :monit_thin_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then alert
+    # if does not exist for 3 cycles then <%= monit_alert %>
+    if 3 restarts within 5 cycles then <%= monit_alert %>
+    if mem > <%= ( fetch( :monit_thin_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then <%= monit_alert %>
     if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ) %> MB for 2 cycles then restart
-    if cpu > 50% then alert
+    if cpu > 50% then <%= monit_alert %>
     if cpu > 50% for 3 cycles then restart
     if 5 restarts within 5 cycles then timeout
     # alert <%= fetch(:monit_mail_to) %> only on { pid }
-    if changed pid 2 times within 20 cycles then alert
+    if changed pid 2 times within 20 cycles then <%= monit_alert %>
 <% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/thin_sysd.erb

@@ -0,0 +1,17 @@
+# Monit configuration for THIN :  <%= fetch(:application) %>  (<%= fetch(:stage) %>)
+<%  fetch(:app_instances, 1).times do |n| %>
+  check process <%= fetch(:application) %>_<%= fetch(:stage) %>_thin_<%= n %> with pidfile <%= deploy_to %>/shared/pids/thin_<%= fetch(:application) %>_<%= fetch(:stage) %>.<%= n %>.pid
+    group thin-<%= fetch(:application) %>-<%= fetch(:stage) %>
+    start program = "<%=   monit_app_prefixed("thin start -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")    %>"
+    stop program = "<%=    monit_app_prefixed("thin stop -C config/thin_app_#{ fetch(:stage) }.yml -o #{ n }")     %>"
+    if does not exist for 3 cycles then start # (default)
+    if does not exist for 3 cycles then <%= monit_alert %>
+    if 3 restarts within 5 cycles then <%= monit_alert %>
+    if mem > <%= ( fetch( :monit_thin_totalmem_mb, 300 ).to_i * 0.75 ).to_i %> MB then <%= monit_alert %>
+    if mem > <%= fetch( :monit_thin_totalmem_mb, 300 ) %> MB for 2 cycles then restart
+    if cpu > 50% then <%= monit_alert %>
+    if cpu > 50% for 3 cycles then restart
+    if 5 restarts within 5 cycles then timeout
+    # alert <%= fetch(:monit_mail_to) %> only on { pid }
+    if changed pid 2 times within 20 cycles then <%= monit_alert %>
+<% end %>

data/lib/generators/capistrano/magic_recipes/templates/monit/website.erb

@@ -8,11 +8,11 @@
 <% end %>
 # Check domains on port 80 <%= "(and 443 if ssl is on)" if fetch(:nginx_use_ssl) %> for <%= fetch(:application) %> [<%= fetch(:stage) %>]
 <% domain_list.uniq.each do |domain| %>
-check host <%= domain %> with address <%= domain %>
+check host "<%= fetch(:monit_website_check_name, domain) %>" with address <%= domain %>
+  <% if fetch(:nginx_use_ssl) %>if failed port 443 protocol https and certificate valid > 2 days then <%= monit_alert %><% end %>
   if failed 
   <% if fetch(:nginx_use_ssl) %>
-    port 443
-    type TCPSSL
+		port 443
     protocol https
   <% else %>
     port 80
@@ -25,6 +25,6 @@ check host <%= domain %> with address <%= domain %>
     # status = 200
     with timeout <%= fetch(:monit_website_check_timeout, 10) %> seconds
     for <%= fetch(:monit_website_check_cycles, 3) %> cycles 
-  then alert
+	then <%= monit_alert %>
 <% end %>
 

data/lib/generators/capistrano/magic_recipes/templates/monit/website_checks.erb

@@ -0,0 +1,25 @@
+# Check additional domains for <%= fetch(:application) %> [<%= fetch(:stage) %>]
+<% monit_website_list.each do |that| %>
+check host "<%= that[:name] %>" with address <%= that[:domain] %>
+  <% if that[:ssl] %>if failed port 443 protocol https and certificate valid > 2 days then <%= monit_alert %><% end %>
+  if failed 
+  <% if that[:ssl] %>
+    port 443
+    type TCPSSL
+    protocol https
+  <% else %>
+    port 80
+    protocol http
+  <% end %>
+  <% if that[:check_content] %>
+    request "<%= that[:path] || '/' %>"
+    content = "<%= that[:content] %>"
+  <% else %>
+    status = 200
+  <% end %>
+    with timeout <%= that[:timeout] %> seconds
+    for <%= that[:cycles] %> cycles 
+  then <%= monit_alert %>
+
+<% end %>
+

data/lib/generators/capistrano/magic_recipes/templates/nginx_monit.conf.erb

@@ -7,8 +7,6 @@ server {
 }
 <% end %>
 
-
-
 server {
 <% if fetch(:monit_webclient_use_ssl) %>
   listen                443 ssl http2;

data/lib/generators/capistrano/magic_recipes/templates/sidekiq.docu-service.erb

@@ -53,6 +53,12 @@ ExecStart=/usr/local/bin/bundle exec sidekiq <%= @side_kiq_args %>
 <% end %>
 
 
+## build PID-File .. only working method :( .. (needed for monit)
+ExecStartPost=/bin/bash -c '/bin/echo $MAINPID > <%= fetch(:sidekiq_six_pid_path) %>/<%= @service_file %>.pid'
+ExecStopPost=/bin/bash -c 'rm <%= fetch(:sidekiq_six_pid_path) %>/<%= @service_file %>.pid'
+
+
+
 # Use `systemctl kill -s TSTP <%= @service_file %>` to quiet the Sidekiq process
 
 # !!! Change this to your deploy user account !!!

data/lib/generators/capistrano/magic_recipes/templates/sidekiq.service.erb

@@ -15,6 +15,12 @@ ExecStart=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bun
 ExecStart=/usr/local/bin/bundle exec sidekiq <%= @side_kiq_args %>
 <% end %>
 
+
+## build PID-File .. only working method :( .. (needed for monit)
+ExecStartPost=/bin/bash -c '/bin/echo $MAINPID > <%= fetch(:sidekiq_six_pid_path) %>/<%= @service_file %>.pid'
+ExecStopPost=/bin/bash -c 'rm <%= fetch(:sidekiq_six_pid_path) %>/<%= @service_file %>.pid'
+
+
 User=<%= fetch(:sidekiq_six_user) %>
 Group=<%= fetch(:sidekiq_six_user) %>
 UMask=0002

data/lib/generators/capistrano/magic_recipes/templates/thin.service.erb

@@ -24,6 +24,12 @@ ExecStop=/usr/local/bin/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>
 ExecReload=/usr/local/bin/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml restart
 <% end %>
 
+
+## build PID-File .. only working method :(
+ExecStartPost=/bin/bash -c '/bin/echo $MAINPID > <%= fetch(:thin_pid_path) %>/thin_<%= fetch(:application) %>_<%= fetch(:stage) %>.pid'
+ExecStopPost=/bin/bash -c 'rm <%= fetch(:thin_pid_path) %>/thin_<%= fetch(:application) %>_<%= fetch(:stage) %>.pid'
+
+
 TimeoutSec=<%= fetch(:thin_wait) %>
 Restart=always
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.94
+  version: 0.0.95
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,6 +161,7 @@ files:
 - lib/capistrano/magic_recipes/redis.rb
 - lib/capistrano/magic_recipes/secrets.rb
 - lib/capistrano/magic_recipes/sidekiq.rb
+- lib/capistrano/magic_recipes/sidekiq_helpers.rb
 - lib/capistrano/magic_recipes/sidekiq_six.rb
 - lib/capistrano/magic_recipes/thin.rb
 - lib/capistrano/magic_recipes/thin_sysd.rb
@@ -173,7 +174,6 @@ files:
 - lib/capistrano/tasks/lets_encrypt.rake
 - lib/capistrano/tasks/logs.rake
 - lib/capistrano/tasks/monit.rake
-- lib/capistrano/tasks/monit_sidekiq.rake
 - lib/capistrano/tasks/nginx.rake
 - lib/capistrano/tasks/pwa.rake
 - lib/capistrano/tasks/redirect_page.rake
@@ -184,17 +184,20 @@ files:
 - lib/capistrano/tasks/thin.rake
 - lib/capistrano/tasks/thin_sysd.rake
 - lib/generators/capistrano/magic_recipes/templates/capistrano3_nginx_conf.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/alert_slack.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/file_checks.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/monitrc.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/nginx.erb
-- lib/generators/capistrano/magic_recipes/templates/monit/nginx_conf.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/pm2.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/postgresql.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/pwa.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/redis.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/sidekiq_six.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/thin.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/thin_sysd.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/website.erb
-- lib/generators/capistrano/magic_recipes/templates/monit/websiteX.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/website_checks.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx.conf.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/diffie_hellman.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/media_cache_path.erb

data/lib/capistrano/tasks/monit_sidekiq.rake

@@ -1,44 +0,0 @@
-# https://github.com/seuros/capistrano-sidekiq
-
-require 'capistrano/magic_recipes/base_helpers'
-include Capistrano::MagicRecipes::BaseHelpers
-
-namespace :load do
-  task :defaults do
-    set :sidekiq_monit_conf_dir, -> { '/etc/monit/conf.d' }
-    set :monit_bin, -> { '/usr/bin/monit' }
-  end
-end
-
-
-namespace :sidekiq do
-  namespace :monit do
-    desc 'Config Sidekiq monit-service'
-    task :config do
-      on roles(fetch(:sidekiq_roles)) do |role|
-        @role = role
-        template_with_role 'sidekiq', "#{fetch(:tmp_dir)}/monit.conf", @role
-        sudo "mv #{fetch(:tmp_dir)}/monit.conf #{fetch(:sidekiq_monit_conf_dir)}/#{sidekiq_service_name}.conf"
-      end
-    end
-
-
-    ## Server specific tasks (gets overwritten by other environments!)
-    %w[monitor unmonitor start stop restart].each do |command|
-      desc "#{command} Sidekiq monit-service"
-      task command do
-        on roles(fetch(:sidekiq_roles)) do
-          fetch(:sidekiq_processes).times do |idx|
-            sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
-          end
-        end
-      end
-    end
-
-
-    def sidekiq_service_name(index=nil)
-      fetch(:sidekiq_service_name, "#{fetch(:application)}_#{fetch(:stage)}_sidekiq_") + index.to_s
-    end
-
-  end
-end

data/lib/generators/capistrano/magic_recipes/templates/monit/nginx_conf.erb

@@ -1,14 +0,0 @@
-server {
-    listen 80;
-    server_name <%= fetch(:monit_web_domain) %>;
-    
-    location ^~ /.well-known/ {
-      allow         all;
-      root          <%= fetch(:monit_well_known_path, "/tmp/monit/well_known") %>;
-    }
-    location / {
-        proxy_set_header   X-Real-IP $remote_addr;
-        proxy_set_header   Host      $http_host;
-        proxy_pass         http://127.0.0.1:<%= fetch(:monit_http_port) %>;
-    }
-}

data/lib/generators/capistrano/magic_recipes/templates/monit/websiteX.erb

@@ -1,23 +0,0 @@
-# Check domains on <%= fetch(:nginx_use_ssl) ? 'https' : 'http' %> for <%= fetch(:application) %> [<%= fetch(:stage) %>]
-<% domain_list.uniq.each do |domain| %>
-check host <%= domain %> with address <%= domain %>
-  if failed 
-  <% if fetch(:nginx_use_ssl) %>
-    port 443
-    type TCPSSL
-    protocol https
-  <% else %>
-    port 80
-    protocol http
-  <% end %>
-  <% if fetch(:monit_website_check_content, false) %>
-    request "<%= fetch(:monit_website_check_path, '/') %>"
-    content = "<%= fetch(:monit_website_check_text, '<!DOCTYPE html>') %>"
-  <% else %>
-    # status = 200
-  <% end %>
-    with timeout <%= fetch(:monit_website_check_timeout, 10) %> seconds
-    for <%= fetch(:monit_website_check_cycles, 3) %> cycles 
-  then alert
-<% end %>
-