puppetdb_foreman 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c606bf582d08e8291a8b683cef9646123cef58
-  data.tar.gz: 56cecd8257e72267d52d04641f934d63573e236a
+  metadata.gz: bf740dafda9ec6838c44cb4d44bf8bf1d653fbe4
+  data.tar.gz: af83f76838e285c9d80e31a1ffc9b653c738c663
 SHA512:
-  metadata.gz: 43b4d5fac5e312bacdab1719059b2391b689871fafe74e95fd55675c176fab1b8801067a3b893b2cd1e1ac54e3530691b2d2f029c934d50c16949e381ebf1e2f
-  data.tar.gz: 227b396f7c800b06c9a7a3085d8501fc1b611720b6dda5c78203a5965099d5ca963f2017c20ebee5bd3782b2e5b0ae989c55942a7bb7240ea107d362549b9260
+  metadata.gz: 506c6af06c9f3c36a5a4ec0fb6dac4dcd7c0fef67be009fab2c173b62e747754b34230bc68121efe6c33501fb0afa7ed9dd9a1dfe999aed56c263902ed8ac6b9
+  data.tar.gz: c5a2cdc057f39fe9c88c68f7faec3d0f5f76bfadd905f47987bc65332ea095c65ec2251035a8e4db862b6b4365450dfcfcf28d2a7b1a3cf093ec6b8882f8549b

data/app/controllers/puppetdb_foreman/puppetdb_controller.rb

@@ -5,9 +5,9 @@ module PuppetdbForeman
       begin
         uri = URI.parse(Setting[:puppetdb_dashboard_address])
         puppetdb_url, layout = case params[:puppetdb]
-                               when 'd3.v2', 'charts' then ["#{uri.path}#{request.original_fullpath}", false]
-                               when 'v3'              then [request.original_fullpath, false]
-                               else                        ["#{uri.path}/index.html", true]
+                               when 'd3.v2', 'charts'                                                    then ["#{uri.path}#{request.original_fullpath}", false]
+                               when 'v3', 'metrics', 'pdb/meta/v1/version', 'pdb/meta/v1/version/latest' then [request.original_fullpath, false]
+                               else                                                                      ["#{uri.path}/index.html", true]
                                end
         result = Net::HTTP.get_response(uri.host, puppetdb_url, uri.port)
         render :text => result.body, :layout => layout

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  match ':puppetdb(/*puppetdb_url)', :to => 'puppetdb_foreman/puppetdb#index', :puppetdb => /d3\.v2|charts|v3|puppetdb/, :as => "puppetdb"
+  match ':puppetdb(/*puppetdb_url)', :to => 'puppetdb_foreman/puppetdb#index', :puppetdb => /d3\.v2|charts|v3|puppetdb|metrics|\/pdb\/meta\/v1\/version\/latest|pdb\/meta\/v1\/version/, :as => "puppetdb"
 end

data/lib/puppetdb_foreman/version.rb

@@ -0,0 +1,3 @@
+module PuppetdbForeman
+  VERSION = '0.2.0'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -26,6 +26,7 @@ files:
 - config/routes.rb
 - lib/puppetdb_foreman.rb
 - lib/puppetdb_foreman/engine.rb
+- lib/puppetdb_foreman/version.rb
 homepage: http://www.github.com/theforeman/puppetdb_foreman
 licenses:
 - GPL-3