puppetdb_foreman 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48759390553b86a6fc48221336d87d82ba8709cf
-  data.tar.gz: ab85080bdfd95fc4695b74fd2c249fc17a952008
+  metadata.gz: 1142db9229ad1c8bac8c3c5a19587953049fc273
+  data.tar.gz: a86d737820c3bf8d943e05950542b35a87297fa4
 SHA512:
-  metadata.gz: 4412889fa8bd32783a15f367ee0283f7a88be4418f14e919ff93932caa982b4db2e3ae664c94bc3322c4bd25a486a60b3e06e15eeebc8eeddad39cdc817c3570
-  data.tar.gz: 0c330cf7fb392595a319825456e7c5920f3953c40b704dd3c7dd575d686e162b5ea21cb3c07dcdaac258e11efb1ae7ea6a1a8521729ab17052e121cc4be0489e
+  metadata.gz: ed22d996b91c1654132baa44a0c09c63614e159d2c65bf44b991e3a61dc22545eb27927fc65e631d5eb145056a2a98e097543f92bc308051ef17b0cc4880c5bc
+  data.tar.gz: 035013ec2eef2701caaf1fae461bcc669dc5c2c7eac02181764dadebebb5bb282d2dee403ec80582120548ebfe9234555f067994dca648ebe05ac67f393fd33a

data/app/controllers/puppetdb_foreman/puppetdb_controller.rb

@@ -0,0 +1,25 @@
+module PuppetdbForeman
+  class PuppetdbController < ApplicationController
+
+    def index
+      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]
+                               end
+        result = Net::HTTP.get_response(uri.host, puppetdb_url, uri.port)
+        render :text => result.body, :layout => layout
+      rescue SocketError => error
+        render :action => :error, :layout => true
+      end
+    end
+
+    # Override from application controller to fix issue
+    def api_request?
+      request.format && (request.format.json? || request.format.yaml?)
+    end
+
+  end
+end

data/app/models/setting/puppetdb.rb

@@ -5,10 +5,12 @@ class Setting::Puppetdb < ::Setting
     if SETTINGS[:puppetdb].present?
       default_enabled = SETTINGS[:puppetdb][:enabled]
       default_address = SETTINGS[:puppetdb][:address]
+      default_dashboard_address = SETTINGS[:puppetdb][:dashboard_address]
     end
 
     default_enabled = false if default_enabled.nil?
     default_address ||= 'https://puppetdb:8081/v2/commands'
+    default_dashboard_address ||= 'http://puppetdb:8080/dashboard'
 
     Setting.transaction do
       [
@@ -21,5 +23,11 @@ class Setting::Puppetdb < ::Setting
         self.set('puppetdb_address', _('Foreman will send PuppetDB requests to this address'), default_address)
       ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
     end
+
+    Setting.transaction do
+      [
+        self.set('puppetdb_dashboard_address', _('Foreman will proxy PuppetDB Performance Dashboard requests to this address'), default_dashboard_address)
+      ].compact.each { |s| self.create s.update(:category => 'Setting::Puppetdb')}
+    end
   end
 end

data/app/views/puppetdb_foreman/puppetdb/error.html.erb

@@ -0,0 +1,4 @@
+<div class="alert alert-block alert-warning">
+  <p><strong><%= _("Notice") %></strong> <%= _("Error Proxying PuppetDB Dashboard") %></p>
+  <p><%= _("Maybe you need to set") %> <%= link_to(_("puppetdb_dashboard_address"), settings_path(:search => 'puppetdb_dashboard_address')) %> <%= _("in Settings") %></p>
+</div>

data/lib/puppetdb_foreman/engine.rb

@@ -23,6 +23,14 @@ module PuppetdbForeman
     initializer 'puppetdb_foreman.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :puppetdb_foreman do
         requires_foreman '> 1.0'
+        security_block :puppetdb_foreman do
+          permission :view_puppetdb_dashboard, {:'puppetdb_foreman/puppetdb' => [:index]}
+        end
+        role 'PuppetDB Dashboard', [:view_puppetdb_dashboard]
+        menu :top_menu, :puppetdb, :caption => N_('PuppetDB Dashboard'),
+                                   :url_hash => {:controller => 'puppetdb_foreman/puppetdb', :action => 'index', :puppetdb => 'puppetdb'},
+                                   :parent => :monitor_menu,
+                                   :last => true
       end
     end
 

metadata

@@ -1,25 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_foreman
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-11 00:00:00.000000000 Z
 dependencies: []
-description: Disable hosts on puppetdb after they are deleted or built in Foreman.
-  Follow https://github.com/theforeman/puppetdb_foreman and raise an issue/submit
-  a pull request if you need extra functionality
+description: 'Disable hosts on PuppetDB after they are deleted or built in Foreman,
+  and proxy the PuppetDB dashboard to Foreman. Follow https://github.com/theforeman/puppetdb_foreman
+  and raise an issue/submit a pull request if you need extra functionality. You can
+  also find some help in #theforeman IRC channel on Freenode.'
 email: elobatocs@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/puppetdb_foreman/puppetdb_controller.rb
 - app/models/puppetdb_foreman/host_extensions.rb
 - app/models/setting/puppetdb.rb
+- app/views/puppetdb_foreman/puppetdb/error.html.erb
 - lib/puppetdb_foreman.rb
 - lib/puppetdb_foreman/engine.rb
 homepage: http://www.github.com/theforeman/puppetdb_foreman
@@ -45,5 +48,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: This is a foreman plugin to interact with puppetdb through callbacks.
+summary: This is a Foreman plugin to interact with PuppetDB.
 test_files: []
+has_rdoc: