subspace 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec1fed10091007f72b23e57d0493ff65646a9bc4cf530de36adbb9fdeb8e00f
-  data.tar.gz: fcaaff33ec9cb84b996258e74d3fc525f6fd727d0ef24b27e5bc71883fe4f95b
+  metadata.gz: 2900b56b3f754ef7860f84bed2a542f1613d670d42de47deeb469ccae80f48ad
+  data.tar.gz: 13f7d5fc40033f6da6b639f4198072632adbcffb4f0c6a0646ea992641a6cbde
 SHA512:
-  metadata.gz: 6429f545796109a5974e7183b8de7f992caf9d47742d08e2a9676053e6b5d634ee38b0f833cdc1e875fe03a64801841eec94517bccbe3d39adb5e7340d683fc2
-  data.tar.gz: 4afb2d4d2a0f772ec67bd923da0469c57ff65c51d65e656d7db89ef90c546cd6371c04593869ca36558c546e36e5e45788be550d2c601c17f38daa7e9c69dae9
+  metadata.gz: e138515cdf107fa30c7668711ea40d26cc316b1ca23366eb63497d92ce96a178d543070c81d8d0617045699bed4250415b429ff709b8e1c2a5caf554f9b95152
+  data.tar.gz: e4420f8d057f1c8ee0376ba9a693a5170e81ab081651657eb9ac45b9bca6662430540d3701ff8ad83bdb6132126c0f3f1f611e276fa17eb5fe24c747ce22d6a2

data/CHANGELOG.md

@@ -10,6 +10,10 @@ This project attempts to follow [semantic versioning](https://semver.org/)
   * Not working on OSX - macs don't read from /etc/profile.d/
   * Stops showing color if you `sudo su`
 
+## 2.5.3
+  * Add a friendly error message if ansible is not installed
+  * Add new role to support New Relic One's infrastructure agent
+
 ## 2.5.2
   * Always specify the letsencrypt cert_name so they are consistent
 

data/README.md

@@ -282,6 +282,21 @@ Installs logrotate and lets you configure logs for automatic rotation.  Example
 
 ## newrelic
 
+## newrelic-infra
+This role will install the next-gen "Newrelic One" infrastructure agent which can perform a few different functions for newrelic.  The previous "newrelic" role is deprecated. 
+
+Variables: 
+    # Required, the newrelic license key you get after signing up. 
+    newrelic_license: "longhashthingyougetfromnewrelichere" 
+    # Optional - send logs to newrelic one's log aggregator.
+    newrelic_logs:
+      - name: rails-production
+        path: /u/apps/blah/shared/log/production.log
+      - name: nginx-error
+        path: /var/log/nginx/error.log
+
+
+
 ## nginx-rails
 
 Configures nginx to look at localhost:9292 for the socket/backend connection.  If you need to do fancy stuff you should simply override this role

data/ansible/roles/newrelic-infra/defaults/main.yml

@@ -0,0 +1,2 @@
+newrelic_license: ""
+newrelic_logs: []

data/ansible/roles/newrelic-infra/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+  - name: Restart newrelic-infra
+    service:
+      name: newrelic-infra
+      state: restarted

data/ansible/roles/newrelic-infra/tasks/main.yml

@@ -0,0 +1,33 @@
+---
+  - name: Add New Relic apt key
+    apt_key:
+      url: https://download.newrelic.com/infrastructure_agent/gpg/newrelic-infra.gpg 
+      state: present
+    become: true
+
+  - name: create license key
+    copy: 
+      dest: "/etc/newrelic-infra.yml"
+      content: |
+        license_key: {{newrelic_license}}
+
+  - name: Add New Relic apt repo
+    apt_repository:
+      repo: deb [arch=amd64] https://download.newrelic.com/infrastructure_agent/linux/apt focal main
+      state: present
+    become: true
+
+  - name: Install New Relic server agent
+    apt:
+      pkg: newrelic-infra
+      state: present
+      update_cache: true
+    become: true
+
+  - name: Configure application log forwarding if enabled
+    when: "{{ newrelic_logs|length }}"
+    become: true
+    template: 
+      dest: "/etc/newrelic-infra/logging.d/subspace.yml"
+      src: logs.yml.j2
+    notify: Restart newrelic-infra

data/ansible/roles/newrelic-infra/templates/logs.yml.j2

@@ -0,0 +1,5 @@
+logs:
+{% for log in newrelic_logs %}
+  - name: {{log.name}}
+    file: {{log.path}}
+{% endfor %}

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

@@ -1,4 +1,8 @@
 ---
+  - name: "Deprecation notice"
+    ansible.builtin.debug:
+      msg: The 'newrelic' role in subspace is deprecated. Please migration to Newrelic One and the 'newrelic-infra' role
+
   - name: Add New Relic apt repo
     apt_repository:
       repo: deb http://apt.newrelic.com/debian/ newrelic non-free

data/lib/subspace/cli.rb

@@ -24,6 +24,11 @@ class Subspace::Cli
     program :version, Subspace::VERSION
     program :description, 'Ansible-backed server provisioning tool for rails'
 
+    unless system("which ansible > /dev/null")
+      puts "*** Subspace depends on ansible being on your PATH. Please install it: https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html"
+      exit 1
+    end
+
     command :init do |c|
       c.syntax = 'subspace init [vars]'
       c.summary = 'Run without options to initialize subspace.'

data/lib/subspace/version.rb

@@ -1,3 +1,3 @@
 module Subspace
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subspace
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,10 @@ files:
 - ansible/roles/mysql/templates/mysql_database.yml
 - ansible/roles/mysql2_gem/meta/main.yml
 - ansible/roles/mysql2_gem/tasks/main.yml
+- ansible/roles/newrelic-infra/defaults/main.yml
+- ansible/roles/newrelic-infra/handlers/main.yml
+- ansible/roles/newrelic-infra/tasks/main.yml
+- ansible/roles/newrelic-infra/templates/logs.yml.j2
 - ansible/roles/newrelic/handlers/main.yml
 - ansible/roles/newrelic/tasks/main.yml
 - ansible/roles/nginx-maintenance/tasks/main.yml