remove extra gems

Signed-off-by: Sebastien Varrette <[email protected]>

lib/puppet/reports/slack.rb

@@ -22,7 +22,7 @@
   SLACK_ICON_EMOJI  = @config['icon_emoji']    || ''
   PUPPETCONSOLE     = @config['puppetconsole'] || ''
   PUPPETBOARD       = @config['puppetboard']   || ''
-  FOREMAN           = @config['foreman']       || ''
+#  FOREMAN           = @config['foreman']       || ''
 
   DISABLED_FILE = "#{@configfile}.disabled"
 
@@ -39,8 +39,10 @@ def process
       options[:icon_url]   = SLACK_ICON_URL   unless SLACK_ICON_URL.empty?
       options[:icon_emoji] = SLACK_ICON_EMOJI unless SLACK_ICON_EMOJI.empty?
       # Prepare the message to display
-      msg = "Puppet run for `#{self.host}` *#{self.status}* at #{Time.now.asctime} on #{self.configuration_version} in environment _#{self.environment}_." #" Report available "
-      #Report available <https://#{PUPPETCONSOLE}/#/node_groups/inventory/node/#{self.host}/reports|here>"
+      report_url = "https://#{PUPPETCONSOLE}/#/node_groups/inventory/node/#{self.host}/reports" unless PUPPETCONSOLE.empty?
+      report_url = "https://#{PUPPETBOARD}/node/#{self.host}" unless PUPPETBOARD.empty?
+
+      msg = "Puppet run for `#{self.host}` *#{self.status}* at #{Time.now.asctime} on #{self.configuration_version} in environment _#{self.environment}_. Report available <#{report_url}|here>."
       # TODO: adapt the link
       client = SlackNotify::Client.new(options)
       client.notify(msg)

manifests/init.pp

@@ -1,5 +1,5 @@
 # -*- mode: puppet; -*-
-# Time-stamp: <Sat 2017-05-27 16:54 svarrette>
+# Time-stamp: <Sat 2017-05-27 18:27 svarrette>
 # ------------------------------------------------------------------------------
 # Class reportslack
 #
@@ -14,8 +14,12 @@
 # @param puppetconsole [String]
 # @param username [String] Default: 'Puppet'
 #   Username that this integration will post as.
-# @param icon_url [String] Default: wikipedia logo
+# @param icon_url [String]
 #   Icon that is used for messages from this integration.
+# @param icon_emoji [String] Default
+#   EMoji that is used for messages from this integration.
+# @param puppetboard [String]
+#   base hostname of the puppetboard, typically "<fqdn>:<port>"
 #
 # @author Nicolas Corrarello <[email protected]>,
 #         Sebastien Varrette aka Falkor <[email protected]>
@@ -35,7 +39,8 @@
   String $puppetconsole = $settings::ca_server,
   String $username      = $reportslack::params::username,
   String $icon_url      = $reportslack::params::icon_url,
-  String $icon_emoji    = $reportslack::params::icon_emoji
+  String $icon_emoji    = $reportslack::params::icon_emoji,
+  String $puppetboard   = $reportslack::params::puppetboard
 )
 inherits reportslack::params
 {
@@ -51,14 +56,6 @@
     name     => $reportslack::params::gemname,
     provider => 'puppetserver_gem'
   }
-  $reportslack::params::extra_gems.each |String $gem| {
-    if (!defined(Package[$gem])) {
-      package { $gem:
-        ensure   => 'present',
-        provider => 'puppetserver_gem'
-      }
-    }
-  }
 
   ini_setting { 'enable_reports':
     ensure  => present,

manifests/params.pp

@@ -1,5 +1,5 @@
 # -*- mode: puppet; -*-
-# Time-stamp: <Sat 2017-05-27 16:47 svarrette>
+# Time-stamp: <Sat 2017-05-27 18:27 svarrette>
 # ------------------------------------------------------------------------------
 # = Class: reportslack::params
 #
@@ -27,22 +27,20 @@
   ###########################################
 
   # ensure the presence (or absence) of reportslack
-  $ensure     = 'present'
-  $channel    = '#general'
-  $username   = 'Puppet'
-  $icon_url   = ''
+  $ensure      = 'present'
+  $channel     = '#general'
+  $username    = 'Puppet'
+  $icon_url    = ''
   # 'https://learn.puppet.com/static/images/logos/Puppet-Logo-Mark-Amber.png'
-  $icon_emoji = ''
+  $icon_emoji  = ''
+  $puppetboard = ''
 
   #### MODULE INTERNAL VARIABLES  #########
   # (Modify to adapt to unsupported OSes)
   #######################################
   $gemname = $::operatingsystem ? {
     default => 'slack-notify',
   }
-  $extra_gems = $::operatingsystem ? {
-    default => [ 'yaml' ]
-  }
 
   $configfile = $::operatingsystem ? {
     default => "${settings::confdir}/slack.yaml",

templates/slack.yaml.erb

@@ -1,9 +1,15 @@
 # -*- mode: yaml; -*-
 # Slack Notification plugin
 ---
+# Incoming webhook
 webhook_url: "<%= @webhook %>"
 channel: "<%= @channel %>"
+<% unless @puppetconsole.empty? -%>
 puppetconsole: "<%= @puppetconsole %>"
+<% end -%>
+<% unless @puppetboard.empty? -%>
+puppetboard: "<%= @puppetboard %>"
+<% end -%>
 <% unless @username.empty? -%>
 username: "<%= @username %>"
 <% end -%>