puppetdb_query 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c33cfa1bbb82f1324f6716de9d17ed70308b35d2
-  data.tar.gz: 51b845298b9ded7a278ccf96481c96f2b287c936
+  metadata.gz: fc5ffd8e14e1d52cd2ba1709657cacfc0e4f4587
+  data.tar.gz: 971dc5b43bd77ddf56aa29147e9a1c39d9fae961
 SHA512:
-  metadata.gz: 5f6c17658656b5452215c8f297bcd76ab4a48c1305e04b23e36e4fb9f1a504c5d0a9abe8256767b8295e8fb211a7d71c4ac5ccd35c8ae1b9acadb93c3f44cb35
-  data.tar.gz: 3eaeae64fda4338cf502e9bd2b4a304d24e6f975ff9c5310e74c0b91d6cc989d4fd5fee062f9a4df4ea6aa34a6bc2457a4b01b4c7a449121e8ba271d7eac2c3a
+  metadata.gz: e44f81a09dbccdcc4d52df43410b7eba1417462bc677fb2e0c4710f504556acbcd215f4d4c9aac5d3f89ef81966c0d2b00ba5a270e17fce2e0b8acc5997ee481
+  data.tar.gz: 4c9435bb7fd94357c68ab8d1b7728a1e8a32da7f09f8dc8b3733b2450a391464aac53574514afef0a34cd25dfb22d2e888d9cc7c0987b08515d532a485cdb3fe

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 # only for local testing but not needed for spec tests
 group :test do
+  gem 'mongo',         '>=2.2.0' # if you want to work with a mongodb
   gem 'ruby-puppetdb', '=1.5.3'  if RUBY_VERSION !~ /^1\./
   gem 'puppet',        '=3.8.7'  if RUBY_VERSION !~ /^1\./
   gem "rubocop",       '=0.39.0' if RUBY_VERSION =~ /^1\./

data/README.md

@@ -13,29 +13,62 @@ You must simply establish a sync job to read the data from your puppetdb and wri
 Currently the implementation supports only puppetdb api V 4.
 
 ## Installation
+The example implementation uses a mongodb (version >= 3.2).
 
 Add this line to your application's Gemfile:
 
 ```ruby
 gem 'puppetdb_query'
+gem 'mongo', '>=2.2.0'
 ```
 
-And then execute:
+and then execute:
 
     $ bundle
 
 Or install it yourself as:
 
-    $ gem install puppetdb_query 
+    $ gem install puppetdb_query
+    $ gem install mongo 
 
-## Usage within program
+## Usage
+
+First you have to sync your puppetdb data with your mongodb.
+You can accomplish this by calling the following code every 5 minutes.
+
+```ruby
+#!/bin/ruby
+
+require 'mongo'
+require 'puppetdb_query'
+
+include PuppetDBQuery::Logging
+logger.level = Logger::INFO
+::Mongo::Logger.logger = logger
+
+begin
+  MONGO_HOSTS = ['puppetdb-mongo.example.com:27017']
+  MONGO_OPTIONS = { database: 'puppetdb', user: 'ops', password: 'very secret' }
+  connection = ::Mongo::Client.new(MONGO_HOSTS, MONGO_OPTIONS)
+  mongodb = PuppetDBQuery::MongoDB.new(connection)
+  puppetdb = PuppetDBQuery::PuppetDB.new('puppetdb-querynodes.example.com')
+
+  sync = PuppetDBQuery::Sync.new(puppetdb, mongodb)
+  sync.sync(5, 10)
+rescue
+  logger.error $!
+end
+```
+
+
+Now you can query nodes and facts like this:
 
 ```ruby
 require "mongo"
 require "puppetdb_query"
 require "pp"
 
-MONGO_HOSTS = ['mongo.myhost.org:27017']
+MONGO_HOSTS = ['puppetdb-mongo.example.com:27017']
 MONGO_OPTIONS = { database: 'puppetdb', user: 'ops', password: 'very secret' }
 
 pm = PuppetDBQuery::MongoQuery.new(MONGO_HOSTS, MONGO_OPTIONS)

data/lib/puppetdb_query/mongodb.rb

@@ -51,10 +51,21 @@ module PuppetDBQuery
       collection.find.batch_size(999).projection(_id: 1).map { |k| k[:_id] }
     end
 
+    # get all nodes and their update dates
+    def node_properties
+      collection = connection[node_properties_collection]
+      result = {}
+      collection.find.batch_size(999).each do |values|
+        id = values.delete('_id')
+        result[id] = values
+      end
+      result
+    end
+
     # get facts for given node name
     def node_facts(node)
       collection = connection[nodes_collection]
-      result = collection.find(_id: node).limit(999).batch_size(999).to_a.first
+      result = collection.find(_id: node).limit(1).batch_size(1).to_a.first
       result.delete("_id") if result
       result
     end
@@ -70,6 +81,14 @@ module PuppetDBQuery
       result
     end
 
+    # get meta informations about updates
+    def meta
+      collection = connection[meta_collection]
+      result = collection.find.first
+      result.delete(:_id)
+      result
+    end
+
     # update or insert facts for given node name
     def node_update(node, facts)
       connection[nodes_collection].find(_id: node).replace_one(facts, upsert: true)
@@ -93,7 +112,17 @@ module PuppetDBQuery
       collection = connection[node_properties_collection]
       old_names = collection.find.batch_size(999).projection(_id: 1).map { |k| k[:_id] }
       delete = old_names - new_node_properties.keys
-      collection.insert_many(new_node_properties.map { |k, v| v.dup.tap { v[:_id] = k } })
+      data = new_node_properties.map do |k, v|
+        {
+          replace_one:
+          {
+            filter: { _id: k },
+            replacement: v,
+            upsert: true
+          }
+        }
+      end
+      collection.bulk_write(data)
       collection.delete_many(_id: { '$in' => delete })
     end
 

data/lib/puppetdb_query/sync.rb

@@ -16,6 +16,7 @@ module PuppetDBQuery
 
     def sync(minutes = 5, seconds = 10)
       logger.info "syncing puppetdb nodes and facts started"
+
       Timeout.timeout(60 * minutes - seconds) do
         updater = PuppetDBQuery::Updater.new(source, destination)
 

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end

data/puppetdb_query.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.post_install_message = "  Sitting quietly, doing nothing, spring comes, and grass grows by itself."
 
-  spec.add_dependency             "mongo"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop" #, "0.43.0" # matches with .rubocop.yml

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement