subspace 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca511a2d66e4f9af50e1e8893eb20fabbad6cbd2
-  data.tar.gz: d59c53e9678ac83bebec8e82fefece0f4ca7098c
+  metadata.gz: a9292a51100ec75aaa115290b5220c7dc9dc6bb7
+  data.tar.gz: 791331cd64e3dcc1b450c8a1d4ba5839cdca0d49
 SHA512:
-  metadata.gz: 83bcf5cce0af7d0ed0326158cffd593b8a97dedf2d33435de829de8e98d4ad2e7ed2e3e17577fa7030c2dbd5e446b531de072b03c613efa2889159b8d5313379
-  data.tar.gz: 22b14772ebce5a982cebaca776f9ff81fe3ceb8988a5adaf47847f0e5202e79f57c4693a4502b1d08fc803079a40879b186bbf8a5b2319b7ee93821319a6c9c7
+  metadata.gz: 65cae20f78b81ada19a5ef63a0f61fc131059276a7b6fc892105b08eaef71d7596ba2add94dd3aa0803b522034652e1bb44287d24c2501f8ecf3ed55c9e05a51
+  data.tar.gz: 471bca6a702f80484fd7c7d92001103da6e6b712f5ef991434f6dde0fdcd67e8e039238ef8ce0f2b9db5ab8405d6261969318a8204a6e16d668d29d3ffcab6d6

data/README.md

@@ -117,11 +117,18 @@ Collectd is a super useful daemon that grabs and reports statistics about a serv
 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.
+  a. If you have pg on a different server or in RDS, you can set this manually:
+
+    collectd_pgdj: true
+
 2. If apache is installed, it will collect stats from the /server-status page
-3. (TODO) add something for nginx
+3. If nginx is installed, it will collect stats from the "status port"
 4. (TODO) add something for pumas
 5. (TODO) add something for sidekiq
 6. (TODO) add something for memcache
+7. If you're using our standard lograge format, you can enable lograge collection which will provide stats on request count and timers (db/view/total)
+
+    rails_lograge: true
 
 
 ## common

data/ansible/roles/apache-rails/templates/project.conf

@@ -1,4 +1,5 @@
 <VirtualHost *:80>
     {% include "_rails.conf" %}
     {% include "_canonical_domain.conf" %}
+
 </VirtualHost>

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

@@ -65,3 +65,11 @@
     notify: restart collectd
     when: nginx_installed is defined
 
+  - name: create rails_lograge config
+    template:
+      src: rails_lograge.conf
+      dest: /etc/collectd/collectd.conf.d/rails_lograge.conf
+    sudo: true
+    notify: restart collectd
+    when: rails_lograge is defined
+

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

@@ -1 +1,31 @@
-rails_lograge.conf
+LoadPlugin "tail"
+<Plugin "tail">
+ <File "/u/apps/{{project_name}}/shared/log/{{rails_env}}.log">
+  Instance "rails_lograge"
+  # controller=Api::V1::HabitQuestionsController action=answer status=200 duration=101.88 view=0.74 db=65.12
+  <Match>
+    Regex "duration="
+    DSType "CounterInc"
+    type "counter"
+    Instance "request"
+  </Match>
+  <Match>
+    Regex "duration=([\d.]+)"
+    DSType "GaugeAverage"
+    Type "response"
+    Instance "duration"
+  </Match>
+  <Match>
+    Regex "view=([\d.]+)"
+    DSType "GaugeAverage"
+    Type "response"
+    Instance "view"
+  </Match>
+  <Match>
+    Regex "db=([\d.]+)"
+    DSType "GaugeAverage"
+    Type "response"
+    Instance "db"
+  </Match>
+ </File>
+</Plugin>

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

@@ -6,7 +6,7 @@
   tags: puma
 
 - name: Add puma shared/config
-  template: src=puma.rb dest=/u/apps/{{project_name}}/shared/config/puma/{{rails_env}}.rb force=yes mode=755
+  template: src=puma.rb dest=/u/apps/{{project_name}}/shared/config/puma/{{rails_env}}.rb group=deploy owner=deploy force=yes mode=755
   tags: puma
 
 - name: Make shared/tmp/sockets
@@ -18,5 +18,5 @@
     src: puma-monit-rc
     dest: /etc/monit/conf.d/puma_{{project_name}}_{{rails_env}}
   sudo: true
-  notify: validate_monit
+  notify: restart_monit
 

data/lib/subspace/cli.rb

@@ -54,6 +54,7 @@ class Subspace::Cli
       c.syntax = 'subspace ssh [options]'
       c.summary = 'ssh to the remote server as the administrative user'
       c.description = ''
+      c.option '--user USER', "Use a different user (eg deploy).  Default is the ansible_ssh_user"
       c.when_called Subspace::Commands::Ssh
     end
 

data/lib/subspace/commands/ssh.rb

@@ -2,12 +2,20 @@ require 'yaml'
 class Subspace::Commands::Ssh < Subspace::Commands::Base
   def initialize(args, options)
     @host = args.first
+    @user = options.user
     run
   end
 
   def run
+    if !File.exists? "config/provision/host_vars/#{@host}"
+      say "No host '#{@host}' found. "
+      all_hosts = Dir["config/provision/host_vars/*"].collect {|f| File.basename(f) }
+      say (["Available hosts:"] + all_hosts).join("\n\t")
+      return
+    end
     host_vars = YAML.load_file("config/provision/host_vars/#{@host}")
-    cmd = "ssh #{host_vars["ansible_ssh_user"]}@#{host_vars["ansible_ssh_host"]}"
+    user = @user || host_vars["ansible_ssh_user"]
+    cmd = "ssh #{user}@#{host_vars["ansible_ssh_host"]}"
     say cmd
     exec cmd
   end

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler