influxdb_setup 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292b9c53f779444476e2eadee7f3ebf6f7a211d7
-  data.tar.gz: e044cd782119b717f838ae936ac86c8784d7033d
+  metadata.gz: 3f8f561855ababe643437b7264f70405452ada8f
+  data.tar.gz: 0f678a8b91a45b3417eb5da6fb6ca9847c995002
 SHA512:
-  metadata.gz: c470a19810295c2054edf8e73d1e12b57816b081612e7022903faecb387312f07470fee78ad2eded4c4188fb269aef604059079ade032831fdf1057b610e8379
-  data.tar.gz: 7f9d34ab5a87195f8f1600adb190cd4296db22c95afc067c4a1a768413600d57960a990ac7ee62807d770f588a3bd5d919b427d23bb8215b7f11814ff841c6cd
+  metadata.gz: e0cc6b05a40dc0970d44af0b4cf158f20f8651874fe421f4599027d54005a98a2a88a43d3ddea560b3343e7c978e1b9a448ee016495824fc07b702417b429a64
+  data.tar.gz: 820639ba9e660591ae6f069e34b33bde93575e6dafd5200b19e9d449db8d284e762af3dbbeb9f7a75b52f82a2defb56f4c6133f6d79a3fb791c2049dc3100669

data/CHANGELOG.md

@@ -5,6 +5,11 @@ CHANGELOG inspiration from http://keepachangelog.com/.
 
 ## Unreleased
 
+## [1.1.0] - August 8, 2016
+* Support configuration of retention policies
+* Support specifying config file instead of using the default one
+* Fix crash in create_user task when not specifing user in config
+
 ## [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.
 

data/README.md

@@ -26,7 +26,9 @@ your influxdb. See the example `influxdb_queries.yml` for the archive queries.
 ## Usage
 
 This library expects your influxdb config to be located in the
-`config/influxdb.yml` file. For example (change *myapp* to your application
+`config/influxdb.yml` file. You can also specify a config file
+by using the INFLUXDB_CONFIG_FILE environment variable. For example (change
+*myapp* to your application
 name):
 
 ```yaml
@@ -40,7 +42,13 @@ default: &default
   retry: <%= ENV.fetch('INFLUXDB_RETRY', 'true') == "true" %>       # default true
   use_ssl: <%= ENV.fetch('INFLUXDB_USE_SSL', 'false') == "true" %>  # default false
   enabled: <%= ENV.fetch('INFLUXDB_ENABLED', 'false') == "true" %>  # default false
-
+  retention_policies:
+    - name: 'default'
+      duration: '4w'
+      replication: 1
+    - name: 'archive'
+      duration: 'INF'
+      replication: 1
 
 development:
   <<: *default
@@ -48,6 +56,13 @@ development:
   async: false
   enabled: true
   retry: false
+  retention_policies:
+   - name: 'default'
+     duration: '4w'
+     replication: 1
+   - name: 'archive'
+     duration: 'INF'
+     replication: 1
 
 ec2:
   <<: *default
@@ -57,12 +72,12 @@ test:
 
 stag:
   <<: *default
-  hosts: ["fs2wad.prod.avvo.com"]
+  hosts: ["your-local-influx-host"]
   enabled: true
 
 production:
   <<: *default
-  hosts: ["fs2wad.prod.avvo.com"]
+  hosts: ["your-local-influx-host"]
   enabled: true
 
 docker:
@@ -107,6 +122,9 @@ Creates the database for the service if it doesn't already exist.
 `rake influxdb:create_user`
 Creates the user for the service if it doesn't already exist.
 
+`rake influxdb:create_retention_policy`
+Creates retention policies if they don't exist and alters retention policies if they already exist.
+
 `rake influxdb:load_queries`
 Creates any continuous queries that are missing. Removes queries that are not
 in the `db/influxdb_queries.yml` file.
@@ -114,6 +132,9 @@ in the `db/influxdb_queries.yml` file.
 `rake influxdb:setup`
 Runs all the above rake tasks.
 
+`INFLUXDB_CONFIG_FILE=/your/config/file/path rake influxdb:setup`
+Use specified config file. Here ```setup``` could be any other tasks supported.
+
 ## Tests
 
 To run the tests, you need an influxdb host setup. If you're not running it on

data/lib/influxdb_setup/commands.rb

@@ -9,6 +9,7 @@ module InfluxdbSetup
     {
       create_db: CreateDb,
       create_user: CreateUser,
+      create_retention_policy: CreateRetentionPolicy,
       load_queries: LoadQueries,
       mark_deploy: MarkDeploy,
     }.each do |cmd, klass|

data/lib/influxdb_setup/config.rb

@@ -9,7 +9,8 @@ module InfluxdbSetup
     end
 
     def self.config
-      @config ||= YAML.load(ERB.new(File.read("config/influxdb.yml")).result)[env]
+      config_file = ENV.fetch('INFLUXDB_CONFIG_FILE', 'config/influxdb.yml')
+      @config ||= YAML.load(ERB.new(File.read(config_file)).result)[env]
     end
 
     def self.env
@@ -39,15 +40,19 @@ module InfluxdbSetup
       @config['password']
     end
 
+    def retention_policies
+      @config['retention_policies']
+    end
+
     def build_client(database = "", options = {})
       InfluxDB::Client.new(database,
                           {
-                            username: "root",
-                            password: "root",
-                            hosts:    @config["hosts"],
-                            port:     @config.fetch("port", 8086),
-                            async:    false,
-                            use_ssl:  @config.fetch("use_ssl", false),
+                            username: @config.fetch('username', 'root'),
+                            password: @config.fetch('password', 'root'),
+                            hosts:    @config['hosts'],
+                            port:     @config.fetch('port', 8086),
+                            async:    @config.fetch('async', false),
+                            use_ssl:  @config.fetch('use_ssl', false),
                             retry:    false,
                           }.merge(options))
     end

data/lib/influxdb_setup/create_retention_policy.rb

@@ -0,0 +1,19 @@
+module InfluxdbSetup
+  class CreateRetentionPolicy < Command
+    def call
+      db = @config.db_name
+      retention_policies = @config.retention_policies
+
+      root = @config.build_client
+      rcs = root.list_retention_policies(db).map { |row| row["name"] }
+
+      retention_policies.each do |rc|
+        if rcs.include? rc['name']
+          root.alter_retention_policy(rc['name'], db, rc['duration'], rc['replication'])
+        else
+          root.create_retention_policy(rc['name'], db, rc['duration'], rc['replication'])
+        end
+      end
+    end
+  end
+end

data/lib/influxdb_setup/create_user.rb

@@ -8,10 +8,12 @@ module InfluxdbSetup
       root = @config.build_client
       users = root.list_users.map{|user_hash| user_hash["username"]}
 
-      unless users.include?(user)
-        root.create_database_user(db, user, pass)
-      else
+      if user.nil?
+        log "Influxdb user not specified, using the default one..."
+      elsif users.include?(user)
         log "Influxdb user '#{user}'@'#{db}' already exists"
+      else
+        root.create_database_user(db, user, pass)
       end
     end
   end

data/lib/influxdb_setup/version.rb

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

data/lib/influxdb_setup.rb

@@ -6,6 +6,7 @@ module InfluxdbSetup
   autoload :Config, "influxdb_setup/config"
   autoload :CreateDb, "influxdb_setup/create_db"
   autoload :CreateUser, "influxdb_setup/create_user"
+  autoload :CreateRetentionPolicy, "influxdb_setup/create_retention_policy"
   autoload :LoadQueries, "influxdb_setup/load_queries"
   autoload :MarkDeploy, "influxdb_setup/mark_deploy"
 

data/lib/tasks/influxdb_setup.rake

@@ -13,6 +13,11 @@ namespace :influxdb do
     @influxdb_setup.create_user
   end
 
+  desc "Create the retention policies"
+  task :create_retention_policy => [:config] do
+    @influxdb_setup.create_retention_policy
+  end
+
   desc "Loads the continuous queries from db/influxdb_queries.yml"
   task :load_queries => [:config] do
     @influxdb_setup.load_queries
@@ -26,5 +31,6 @@ namespace :influxdb do
   desc "Run all the tasks to setup influxdb for the service"
   task :setup => [:create_db,
                   :create_user,
+                  :create_retention_policy,
                   :load_queries]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb_setup
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Donald Plummer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -104,6 +104,7 @@ files:
 - lib/influxdb_setup/commands.rb
 - lib/influxdb_setup/config.rb
 - lib/influxdb_setup/create_db.rb
+- lib/influxdb_setup/create_retention_policy.rb
 - lib/influxdb_setup/create_user.rb
 - lib/influxdb_setup/load_queries.rb
 - lib/influxdb_setup/mark_deploy.rb
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rake task for setting up an influxdb database and queries