ruby-puppetdb 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1beecbcce5ba235ea07c8285ceb07614e8502dde
-  data.tar.gz: e6321323e3fe82b17437139c5314175ee243495c
+  metadata.gz: 93d81a43c0316b2d59fb966659c283014a4a4e03
+  data.tar.gz: 7b844189a53c57849db60e828f36146aa113c0f9
 SHA512:
-  metadata.gz: 58f1303a9b2b09ae762cb99a49f649941b8e2265cb1aa5a1bde180ccb9356d1725304841a31821e04ef02b7ccb01174f78e77d00aed85260cedeaad8336fe81c
-  data.tar.gz: d545b33bc634612e6207f53a49cf0c5b6748c9e4dfca1960affae8959ea57ab3e7d5fd84e4617e90c81391185eb69d66f2f6c2a68333f500eb066e0fed953889
+  metadata.gz: e5b8a134365df7df9ed82e8e31fa26e76ad5b46423d80f3981eeb692f40a7deb0021252faeab59155a4690b3b6d253f3b88eafdca0c09ef4ea2644ececd1c0c5
+  data.tar.gz: 8e3a55dc4c110c54305ae3d8dcb27ae9307801bf9350302bf57d881962b02d7e5cc16ea58c8839cbdafc7509da95c61d58be014df2a77262e2872ee2ea0f17a6

data/Modulefile

@@ -1,5 +1,5 @@
 name    'dalen-puppetdbquery'
-version '1.2.0'
+version '1.3.0'
 author 'Erik Dalen <erik.gustav.dalen@gmail.com>'
 license 'Apache License V2'
 summary 'Query functions for the PuppetDB API'

data/README.md

@@ -64,6 +64,11 @@ facts - a hash of facts per node
        db_node_1  {"facterversion":"1.6.9","hostname":"controller",...........}
        db_node_2  {"facterversion":"1.6.9","hostname":"controller",...........}
 
+events - a list of events on the matched nodes
+
+     $ puppet query events '(Package["mysql-server"] and architecture=amd64)' --since='1 hour ago' --until=now --status=success
+       host.example.com: 2013-06-10T10:58:37.000Z: File[/foo/bar]/content ({md5}5711edf5f5c50bd7845465471d8d39f0 -> {md5}e485e731570b8370f19a2a40489cc24b): content changed '{md5}5711edf5f5c50bd7845465471d8d39f0' to '{md5}e485e731570b8370f19a2a40489cc24b'
+
 Ruby
 ----
 

data/lib/puppet/face/query.rb

@@ -1,8 +1,12 @@
 require 'puppet/application/query'
 require 'puppet/face'
+require 'puppet/util/colors'
+
 Puppet::Face.define(:query, '1.0.0') do
   require 'puppetdb/connection'
 
+  extend Puppet::Util::Colors
+
   copyright "Puppet Labs & Erik Dalen", 2012..2013
   license   "Apache 2 license; see COPYING"
 
@@ -70,4 +74,75 @@ Puppet::Face.define(:query, '1.0.0') do
     end
 
   end
+
+  action :events do
+    summary 'Serves as an interface to puppetdb allowing a user to query for a list of events'
+
+    description <<-EOT
+      Get all avents for nodes matching the query specified.
+    EOT
+
+    arguments "<query>"
+
+    option '--since SINCE' do
+      summary 'Get events since this time'
+      description <<-EOT
+        Uses chronic to parse time, can be specified in many human readable formats.
+      EOT
+      default_to { '1 hour ago' }
+    end
+
+    option '--until UNTIL' do
+      summary 'Get events until this time'
+      description <<-EOT
+        Uses chronic to parse time, can be specified in many human readable formats.
+      EOT
+      default_to { 'now' }
+    end
+
+    option '--status STATUS' do
+      summary 'Only get events with specified status, skipped, success or failure'
+      description <<-EOT
+        Only get events of specified status, can be either all, skipped, success or failure.
+      EOT
+      default_to { 'all' }
+    end
+
+    when_invoked do |query, options|
+      require 'chronic'
+
+      puppetdb = PuppetDB::Connection.new options[:puppetdb_host], options[:puppetdb_port]
+      nodes = puppetdb.query(:nodes, puppetdb.parse_query(query, :nodes)).collect { |n| n['name']}
+      starttime = Chronic.parse(options[:since], :context => :past, :guess => false).first.getutc.strftime('%FT%T.%LZ')
+      endtime = Chronic.parse(options[:until], :context => :past, :guess => false).last.getutc.strftime('%FT%T.%LZ')
+
+      events = []
+      # Event API doesn't support subqueries at the moment and
+      # we can't do too big queries, so fetch events for some nodes at a time
+      nodes.each_slice(20) do |nodeslice|
+        eventquery = ['and', ['>', 'timestamp', starttime], ['<', 'timestamp', endtime], ['or', *nodeslice.collect { |n| ['=', 'certname', n]}]]
+        eventquery << ['=', 'status', options[:status]] if options[:status] != 'all'
+        events.concat puppetdb.query(:events, eventquery, nil, :experimental)
+      end
+
+      events.sort_by do |e|
+        "#{e['timestamp']}+#{e['resource-type']}+#{e['resource-title']}+#{e['property']}"
+      end.each do |e|
+        out="#{e['certname']}: #{e['timestamp']}: #{e['resource-type']}[#{e['resource-title']}]"
+        out+="/#{e['property']}" if e['property']
+        out+=" (#{e['old-value']} -> #{e['new-value']})" if e['old-value'] && e['new-value']
+        out+=": #{e['message']}" if e['message']
+        out.chomp!
+        case e['status']
+        when 'failure'
+          puts colorize(:hred, out)
+        when 'success'
+          puts colorize(:green, out)
+        when 'skipped'
+          puts colorize(:hyellow, out) unless e['resource-type'] == 'Schedule'
+        end
+      end
+      nil
+    end
+  end
 end

data/lib/puppetdb/connection.rb

@@ -50,14 +50,14 @@ class PuppetDB::Connection
   # @param endpoint [Symbol] :resources, :facts or :nodes
   # @param query [Array] query to execute
   # @return [Array] the results of the query
-  def query(endpoint, query=nil, http=nil)
+  def query(endpoint, query=nil, http=nil, version=:v2)
     unless http then
       require 'puppet/network/http_pool'
       http = Puppet::Network::HttpPool.http_instance(@host, @port, @use_ssl)
     end
     headers = { "Accept" => "application/json" }
 
-    uri = "/v2/#{endpoint.to_s}"
+    uri = "/#{version.to_s}/#{endpoint.to_s}"
     uri += URI.escape "?query=#{query.to_json}" unless query.nil? or query.empty?
 
     resp = http.get(uri, headers)

data/ruby-puppetdb.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency('json')
+  s.add_dependency('chronic')
 
   s.add_development_dependency 'rspec', '2.13'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-puppetdb
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dan Bode
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  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: rspec
   requirement: !ruby/object:Gem::Requirement