subspace 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b6493c3b49faa6b3e825ba91b38ace22640fd8
-  data.tar.gz: 37109dca55e73f582340a0d8136eb7e65ed97a22
+  metadata.gz: d5df2a1343e51341e96380ee4011b182a8970ef6
+  data.tar.gz: bcb4a135d9c459ab06eec7b892c6d695ab5fc36b
 SHA512:
-  metadata.gz: 76fe3df3726d34278aea605e2932a35379f38eb78f9d91ba0121ad64dd4ba4ccceaa81cedce03f58d52ea9f0e1ba22b42504a48b28fa32051c222db6d33a4011
-  data.tar.gz: 5295d6be99a5323d9d11bf98def621fcd583cb1be33b884b6082049b7a22f56b9527672328d77f793e3b9953b4071e8a137df9fdde3f677e2d7643a10a0b5b6d
+  metadata.gz: 92cdf7edb1a970a973a3134fed38d2405307e59dae8713408a33e2514d573633c4c625a5bbb6e7c5bd2e0541bb3172c847b77cdfe9dc7f2c4b693ee95ffe6799
+  data.tar.gz: 3aff151c039fb156a764d34d153e12e4a43ecf2fbc48406db5298b0495e112532c3b43d6031262cb85cb81742c473d768dd5fe82671a361c72fb3be32bff029c

data/README.md

@@ -109,6 +109,21 @@ Apache also support canonicalizing the domain now, so if you alwyas want to redi
 
 ## collectd
 
+Collectd is a super useful daemon that grabs and reports statistics about a server's health.  Adding this role will make your server start reporting to a [graphite](https://graphiteapp.org/) server that you specify, and you can make cool graphs and data feeds after that using something like [Grafana](https://grafana.com/)
+
+    graphite_host: graphite.example.com
+    graphite_port: "2003"
+
+Aside from basic statistics like free memory, disk, load averages, etc, we have some custom things:
+
+1. If Postgres and delayed job are installed, it will collect stats on number of outstanding delayed jobs.
+2. If apache is installed, it will collect stats from the /server-status page
+3. (TODO) add something for nginx
+4. (TODO) add something for pumas
+5. (TODO) add something for sidekiq
+6. (TODO) add something for memcache
+
+
 ## common
 
 ## delayed_job
@@ -172,7 +187,15 @@ Installs logrotate and lets you configure logs for automatic rotation.  Example
 
 ## newrelic
 
-## nginx
+## nginx-rails
+
+Configurs nginx to look at localhost:9292 for the socket/backend connection.  If you need to do fancy stuff you should simply override this role
+
+    subspace override nginx-rails
+
+defaults are here, we'll probably add more:
+
+    client_max_body_size: 4G
 
 ## papertrail
 
@@ -189,6 +212,10 @@ Installs logrotate and lets you configure logs for automatic rotation.  Example
 
 ## puma
 
+add puma gem to gemfile
+add config/puma to symlinks in deploy.rb
+
+
 ## rails
 
 Provisions for a rails app.  This one is probably pretty important.

data/ansible/roles/collectd/handlers/main.yml

@@ -1,3 +1,3 @@
   - name: restart collectd
     command: service collectd restart
-    sudo: true
+    become: true

data/ansible/roles/collectd/tasks/main.yml

@@ -39,7 +39,7 @@
       dest: /etc/collectd/collectd.conf.d/delayed_job_postgres.conf
     become: true
     notify: restart collectd
-    when: postgresql_installed is defined and delayed_job_installed is defined
+    when: (collectd_pgdj is defined) or (postgresql_installed is defined and delayed_job_installed is defined)
 
   - name: create apache2 config
     template:
@@ -49,3 +49,19 @@
     notify: restart collectd
     when: apache2_installed is defined
 
+  - name: create puma config
+    template:
+      src: puma-process.conf
+      dest: /etc/collectd/collectd.conf.d/puma-process.conf
+    sudo: true
+    notify: restart collectd
+    when: puma_installed is defined
+
+  - name: create nginx config
+    template:
+      src: nginx.conf
+      dest: /etc/collectd/collectd.conf.d/nginx.conf
+    sudo: true
+    notify: restart collectd
+    when: nginx_installed is defined
+

data/ansible/roles/collectd/templates/nginx.conf

@@ -0,0 +1,4 @@
+LoadPlugin "nginx"
+<Plugin "nginx">
+  URL "http://localhost:{{status_port}}"
+</Plugin>

data/ansible/roles/collectd/templates/puma-process.conf

@@ -0,0 +1,3 @@
+<Plugin processes>
+    ProcessMatch puma "puma: cluster"
+</Plugin>

data/ansible/roles/collectd/templates/rails_lograge.conf

@@ -0,0 +1 @@
+rails_lograge.conf

data/ansible/roles/delayed_job/tasks/main.yml

@@ -6,7 +6,7 @@
       src: delayed-job-monit-rc
       dest: /etc/monit/conf.d/delayed_job_{{project_name}}_{{rails_env}}
     sudo: true
-    notify: monit
+    notify: reload_monit
 
   - name: Remove old upstart files
     file:

data/ansible/roles/nginx-rails/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+  client_max_body_size: 4G

data/ansible/roles/nginx-rails/templates/_rails.conf

@@ -19,5 +19,5 @@ location /cable {
 }
 
 error_page 500 502 503 504 /500.html;
-client_max_body_size 4G;
+client_max_body_size {{client_max_body_size}};
 keepalive_timeout 10;

data/ansible/roles/nginx/defaults/main.yml

@@ -2,3 +2,4 @@
   server_aliases: []
   ssl_enabled: false
   nginx_ssl_config: ""
+  status_port: 8081

data/ansible/roles/nginx/tasks/main.yml

@@ -13,6 +13,19 @@
   include_role:
     name: nginx-rails
 
+- name: create nginx status config
+  template:
+    src: status
+    dest: /etc/nginx/sites-available/status
+  become: true
+
+- name: enable nginx status
+  file:
+    src: /etc/nginx/sites-available/status
+    dest: /etc/nginx/sites-enabled/status
+    state: link
+  become: true
+
 - name: Restart nginx
   action: service name=nginx state=restarted
   become: true

data/ansible/roles/nginx/templates/status

@@ -0,0 +1,10 @@
+server {
+  listen {{status_port}};
+  server_name localhost;
+  location / {
+    stub_status on;
+    access_log off;
+    allow 127.0.0.1;
+    deny all;
+  }
+}

data/ansible/roles/passenger/files/sudoers-passenger

@@ -0,0 +1 @@
+deploy ALL=(root) NOPASSWD: /usr/sbin/passenger-status

data/ansible/roles/passenger/tasks/main.yml

@@ -0,0 +1,5 @@
+  - name: Add sudoers.d file so that deploy can run passenger-status without entering password.
+    copy:
+      src: sudoers-passenger
+      dest: /etc/sudoers.d/passenger
+    become: true

data/ansible/roles/puma/defaults/main.yml

@@ -0,0 +1,5 @@
+---
+  puma_workers: 1
+  puma_min_threads: 4
+  puma_max_threads: 16
+

data/ansible/roles/puma/tasks/main.yml

@@ -1,3 +1,6 @@
+- set_fact:
+    puma_installed: true
+
 - name: Create shared/config/puma
   file: path=/u/apps/{{project_name}}/shared/config/puma group=deploy owner=deploy state=directory
   tags: puma

data/ansible/roles/puma/templates/puma.rb

@@ -1,9 +1,7 @@
 # Change to match your CPU core count
-workers Integer(ENV['WEB_CONCURRENCY'] || 4)
-
-threads_count = Integer(ENV['MAX_THREADS'] || 5)
+workers {{puma_workers}}
 # Min and Max threads per worker
-threads 0, threads_count
+threads {{puma_min_threads}}, {{puma_max_threads}}
 
 app_dir = "/u/apps/{{project_name}}/current"
 directory app_dir

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,9 @@ files:
 - ansible/roles/collectd/templates/df.conf
 - ansible/roles/collectd/templates/graphite.conf
 - ansible/roles/collectd/templates/hostname.conf
+- ansible/roles/collectd/templates/nginx.conf
+- ansible/roles/collectd/templates/puma-process.conf
+- ansible/roles/collectd/templates/rails_lograge.conf
 - ansible/roles/common/defaults/main.yml
 - ansible/roles/common/files/sudoers-service
 - ansible/roles/common/handlers/main.yml
@@ -163,6 +166,7 @@ files:
 - ansible/roles/mysql2_gem/tasks/main.yml
 - ansible/roles/newrelic/handlers/main.yml
 - ansible/roles/newrelic/tasks/main.yml
+- ansible/roles/nginx-rails/defaults/main.yml
 - ansible/roles/nginx-rails/tasks/main.yml
 - ansible/roles/nginx-rails/templates/_rails.conf
 - ansible/roles/nginx-rails/templates/_upstream.conf
@@ -171,9 +175,12 @@ files:
 - ansible/roles/nginx/defaults/main.yml
 - ansible/roles/nginx/handlers/main.yml
 - ansible/roles/nginx/tasks/main.yml
+- ansible/roles/nginx/templates/status
 - ansible/roles/papertrail/tasks/main.yml
 - ansible/roles/papertrail/templates/log_files.yml
+- ansible/roles/passenger/files/sudoers-passenger
 - ansible/roles/passenger/meta/main.yml
+- ansible/roles/passenger/tasks/main.yml
 - ansible/roles/postgis/.gitignore
 - ansible/roles/postgis/CHANGELOG.md
 - ansible/roles/postgis/LICENSE
@@ -189,6 +196,7 @@ files:
 - ansible/roles/postgresql/tasks/backups.yml
 - ansible/roles/postgresql/tasks/main.yml
 - ansible/roles/postgresql/templates/backup.sh
+- ansible/roles/puma/defaults/main.yml
 - ansible/roles/puma/meta/main.yml
 - ansible/roles/puma/tasks/main.yml
 - ansible/roles/puma/templates/etc-puma.conf