influxdb_setup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af774bd0bda065750d0b284e4bfb5dbcba4e6e44
-  data.tar.gz: d28478b3420de3ed667969acd98f6644cd3714ed
+  metadata.gz: 292b9c53f779444476e2eadee7f3ebf6f7a211d7
+  data.tar.gz: e044cd782119b717f838ae936ac86c8784d7033d
 SHA512:
-  metadata.gz: c287d4135601d44847afd6d98617054778600097e6ee68606a44239832516986de78bb4fd077aab66236ce112add87db143ff5e6bf47c98124b2acbb2b228a26
-  data.tar.gz: d67ffd8c67f5221ccba1633370e0ec471707de5047941fa567d1e48e63227cc92bb2250108e0cd90280ea12713c5502227aa40c9682c878775e7e6a90b126ea9
+  metadata.gz: c470a19810295c2054edf8e73d1e12b57816b081612e7022903faecb387312f07470fee78ad2eded4c4188fb269aef604059079ade032831fdf1057b610e8379
+  data.tar.gz: 7f9d34ab5a87195f8f1600adb190cd4296db22c95afc067c4a1a768413600d57960a990ac7ee62807d770f588a3bd5d919b427d23bb8215b7f11814ff841c6cd

data/CHANGELOG.md

@@ -5,6 +5,12 @@ CHANGELOG inspiration from http://keepachangelog.com/.
 
 ## Unreleased
 
+## [1.0.1] - May 20, 2016
+* Fix Config.env method to be class, so that Config.config works if you don't set it first.
+
+## [1.0.0] - April 8, 2016
+* Public release
+
 ## [0.5.0] - March 17, 2016
 * Update influxdb_queries.yml and LoadQueries for InfluxDB 0.10
 
@@ -12,3 +18,12 @@ CHANGELOG inspiration from http://keepachangelog.com/.
 * Skip loading continuous queries if influxdb_queries.yml file doesn't exist.
 * Use a real logger object, this will cause timestamps to be printed, and makes
   testing easier.
+
+## [0.4.0]
+* Upgrade influxdb gem to handle InfluxDB v0.9.x and greater and remove shard space setup support
+
+## [0.3.1]
+* automatically skip influxdb setup on a rollback
+
+## [0.3.0]
+* added the ability to skip influxdb setup by setting the capistrano variable skip_influx_setup

data/README.md

@@ -7,8 +7,6 @@ For configuring the influxdb database, and continuous queries.
 Add these lines to your application's Gemfile:
 
 ```ruby
-source 'http://gems.corp.avvo.com'
-
 gem 'influxdb_setup'
 ```
 
@@ -90,6 +88,17 @@ Make sure your queries match what the server coerces them into (no spaces
 after commas) by running the `rake influxdb:load_queries` task multiple times.
 If there's queries to update the task will not do anything.
 
+### ERB enabled continuous queries
+
+The `db/influxdb_queries.yml` file is ERB-enabled, so you can de-duplicate some
+metrics:
+
+```yaml
+---
+prod_perc_95:
+  SELECT count(value) as count, percentile("value", 95) AS overall, <%= %w[cache db].map {|name| "percentile(\"#{name}\", 95) AS #{name}" } %> INTO prod_perc_95 FROM "response_times" WHERE "rails_env"='production' GROUP BY time(30m)
+```
+
 ## Rake tasks
 
 `rake influxdb:create_db`
@@ -117,30 +126,21 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 `rake spec` to run the tests. You can also run `bin/console` for an interactive
 prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
-
-To cut a gem:
-
-1. Bump the version in `lib/influxdb_setup/version.rb`
-2. Build the gem `gem_push=no rake release`
-3. Push to geminabox `gem inabox pkg/influxdb_setup-0.1.0.gem` (or whatever
-version you just cut.)
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitLab at
-https://github.com/avvo/influxdb_setup.
-
-## Changelog
+Bug reports and pull requests are welcome on GitHub at
+https://github.com/avvo/influxdb_setup. Please update the CHANGELOG
+**unreleased** section with your changes. Please do not update version file in
+pull request.
 
-v0.4.0 - Upgrade influxdb gem to handle InfluxDB v0.9.x and greater and remove shard space setup support
-v0.3.1 - automatically skip influxdb setup on a rollback
-v0.3.0 - added the ability to skip influxdb setup by setting the capistrano variable skip_influx_setup
+## Release Process
 
+1. The version.rb file should only ever be updated in master, don't update it in your branch.
+2. Once changes have been merged to master:
+3. Update CHANGELOG.md and version.rb file with new version. Commit as "Bump version".
+4. Run `rake release`, which will create a git tag for the version, push git commits and tags.
 
 ## License
 

data/lib/influxdb_setup/config.rb

@@ -12,6 +12,10 @@ module InfluxdbSetup
       @config ||= YAML.load(ERB.new(File.read("config/influxdb.yml")).result)[env]
     end
 
+    def self.env
+      defined?(Rails) ? Rails.env : ENV.fetch('RAILS_ENV', 'development')
+    end
+
     attr_accessor :logger
 
     def initialize(config: self.class.config, logger: Logger.new(STDOUT))
@@ -19,10 +23,6 @@ module InfluxdbSetup
       @logger = logger
     end
 
-    def env
-      defined?(Rails) ? Rails.env : ENV.fetch('RAILS_ENV', 'development')
-    end
-
     def db_name
       @config['db_name']
     end

data/lib/influxdb_setup/mark_deploy.rb

@@ -5,11 +5,11 @@ module InfluxdbSetup
       root = @config.build_client(db)
 
       root.write_point("deploys", values: {
-        rails_env: config.env,
+        rails_env: Config.env,
         commit: commit
       })
 
-      log("Marked deploy: #{config.env} at sha #{commit}")
+      log("Marked deploy: #{Config.env} at sha #{commit}")
     end
   end
 end

data/lib/influxdb_setup/version.rb

@@ -1,3 +1,3 @@
 module InfluxdbSetup
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb_setup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Donald Plummer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb