oxidized 0.32.1 → 0.34.0

data/docs/Supported-OS-Types.md

@@ -2,6 +2,7 @@
 
 |Vendor              |OS model                      |oxidized model                                   |model maintainers|comment / model notes|
 |--------------------|------------------------------|-------------------------------------------------|-----------------|---------------------|
+|6WIND               |VSR                           |[sixwind](/lib/oxidized/model/sixwind.rb)        |@hcaldicott      |
 |A10 Networks        |ACOS                          |[acos](/lib/oxidized/model/acos.rb)              |                 |
 |Accedian Performance Elements (NIDs)|AEN           |[aen](/lib/oxidized/model/aen.rb)
 |Acme Packet         |ACMEPACKET                    |[acmepacket](/lib/oxidized/model/acmepacket.rb)
@@ -30,6 +31,7 @@
 |                    |BOSS (Baystack Operating System Software)|[boss](/lib/oxidized/model/boss.rb)
 |BDCOM               |S2200PB, S2200-B, S2500-B, S2500-C, S2500PB, S2500-P, S2900 series|[bdcom](/lib/oxidized/model/bdcom.rb)
 |Brocade             |FabricOS                      |[fabricos](/lib/oxidized/model/fabricos.rb)
+|                    |Enhanced Fabric OS            |[efos](/lib/oxidized/model/efos.rb)
 |                    |FastIron                      |[fastiron](/lib/oxidized/model/fastiron.rb)
 |                    |IronWare                      |[ironware](/lib/oxidized/model/ironware.rb)
 |                    |NOS (Network Operating System)|[nos](/lib/oxidized/model/nos.rb)
@@ -43,6 +45,7 @@
 |Centec Networks     |CNOS                          |[cnos](/lib/oxidized/model/cnos.rb)
 |Check Point         |GaiaOS                        |[gaiaos](/lib/oxidized/model/gaiaos.rb)
 |Ciena               |SAOS                          |[saos](/lib/oxidized/model/saos.rb)
+|                    |SAOS10                        |[saos10](/lib/oxidized/model/saos10.rb)
 |Cisco               |ACSW                          |[acsw](/lib/oxidized/model/acsw.rb)
 |                    |AireOS                        |[aireos](/lib/oxidized/model/aireos.rb)          |                 |[AireOS](Model-Notes/AireOS.md)
 |                    |ASA                           |[asa](/lib/oxidized/model/asa.rb)                |@robertcheramy
@@ -75,6 +78,7 @@
 |                    |Dell EMC Networking OS10      |[os10](/lib/oxidized/model/os10.rb)              |                 |[Dell EMC Networking OS10](Model-Notes/OS10.md)
 |D-Link              |D-Link                        |[dlink](/lib/oxidized/model/dlink.rb)
 |                    |D-Link cisco like CLI         |[dlinknextgen](/lib/oxidized/model/dlinknextgen.rb)
+|Eaton               |Gigabit Network Card          |[eatonnetwork](/lib/oxidized/model/eatonnetwork.rb) |@thanegill
 |ECI Telecom         |ECIapollo                     |[eciapollo](/lib/oxidized/model/eciapollo.rb)
 |EdgeCore            |ECS3510, ES3526XA-V2, ES3528M |[edgecos](/lib/oxidized/model/edgecos.rb)
 |Eltex               |Eltex                         |[eltex](/lib/oxidized/model/eltex.rb)
@@ -113,6 +117,7 @@
 |Huawei              |VRP                           |[vrp](/lib/oxidized/model/vrp.rb)                |                 |[VRP-Huawei](Model-Notes/VRP-Huawei.md)
 |                    |SmartAX series                |[smartax](/lib/oxidized/model/smartax.rb)        |                 |[SmartAX-Huawei](Model-Notes/SmartAX-Huawei.md)
 |Icotera             |6400 series                   |[icotera](/lib/oxidized/model/icotera.rb)
+|Ingate              |SIParator/Firewalls           |[ingate](/lib/oxidized/model/ingate.rb)          |@thanegill
 |IP Infusion         |OcNOS                         |[ocnos](/lib/oxidized/model/ocnos.rb)
 |Juniper             |JunOS                         |[junos](/lib/oxidized/model/junos.rb)            |                 |[MX/QFX/EX/SRX/J Series](Model-Notes/JunOS.md)
 |                    |ScreenOS (Netscreen)          |[screenos](/lib/oxidized/model/screenos.rb)
@@ -129,6 +134,7 @@
 |MRV                 |MasterOS                      |[masteros](/lib/oxidized/model/masteros.rb)
 |                    |FiberDriver                   |[fiberdriver](/lib/oxidized/model/fiberdriver.rb)
 |NEC                 |NEC IX                        |[necix](/lib/oxidized/model/necix.rb)
+|Netgate             |TNSR                          |[tnsr](/lib/oxidized/model/tnsr.rb)              |@Vantomas
 |Netgear             |Netgear switches              |[netgear](/lib/oxidized/model/netgear.rb)        |                 |[Netgear](Model-Notes/Netgear.md)
 |Netonix             |WISP Switch (As Netonix)      |[netonix](/lib/oxidized/model/netonix.rb)
 |Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)|SR OS (TiMOS)|[sros](/lib/oxidized/model/sros.rb)  |                 |[Nokia ISAM](Model-Notes/Nokia.md)
@@ -169,6 +175,7 @@
 |                    |Edgeos                        |[edgeos](/lib/oxidized/model/edgeos.rb)
 |                    |EdgeSwitch                    |[edgeswitch](/lib/oxidized/model/edgeswitch.rb)
 |                    |AirFiber                      |[airfiber](/lib/oxidized/model/airfiber.rb)
+|                    |UnifiAP                       |[unifiap](/lib/oxidized/model/unifiap.rb)              |@clifcox      |Also suports AirOS, and some Unifi switches
 |Uplink              |EP4440-DP                     |[EP4440](/lib/oxidized/model/uplinkolt.rb)             | |Might support all EP4440 series
 |VMWare              |NSX Edge (configuration)      |[nsxconfig](/lib/oxidized/model/nsxconfig.rb)
 |                    |NSX Edge (firewall rules)     |[nsxfirewall](/lib/oxidized/model/nsxfirewall.rb)

data/docs/Troubleshooting.md

@@ -27,7 +27,10 @@ Welcome to the advanced nuclear launchinator 5A-X20. Proceed with caution.
 SEKRET-5A-X20#
 ```
 
-Review the relevant device model file and identify the defined prompt. You can find the device models in the `lib/oxidized/model` sub-folder of the repository. For example, the Cisco IOS model, `ios.rb` may use the following prompt:
+Review the relevant device model file and identify the defined prompt. You can
+find the device models in the `lib/oxidized/model` subdirectory of the
+repository. For example, the Cisco IOS model, `ios.rb` may use the following
+prompt:
 
 ```text
   prompt /^([\w.@()-]+[#>]\s?)$/
@@ -85,18 +88,6 @@ If you are running oxidized in a container, you need to map /home/oxidized/.ssh
 container to a local repository and save the known_hosts in the local repository. You can
 find an example how to do this under [examples/podman-compose](/examples/podman-compose/)
 
-## Git performance issues with large device counts
-When you use git to store your configurations, the size of your repository will
-grow over time. This growth can lead to performance issues. To resolve these issues, you should perform a Git garbage collection on your repository.
-
-Follow these steps to do so:
-
-1. Stop oxidized (no one should access the git repository while running garbage collection)
-2. Make a backup of your oxidized data, especially the Git repository
-3. Change directory your oxidized git repository (as configured in oxidized configuration file)
-4. Execute the command `git gc` to run the garbage collection
-5. Restart oxidized - you're done!
-
 ## Oxidized ignores the changes I made to its git repository
 First of all: you shouldn't manipulate the git repository of oxidized. Don't
 create it, don't modify it, leave it alone. You can break things. You have

data/extra/device2yaml.rb

@@ -6,24 +6,21 @@ require 'optparse'
 require 'etc'
 require 'timeout'
 
-# This scripts logs in a network device and outputs a yaml file that can be
+# This script logs in a network device and outputs a YAML file that can be
 # used for model unit tests in spec/model/
 # For more information, see docs/DeviceSimulation.md
 
-# This script is quick & dirty - it grew with the time an could be a project
-# for its own. It works, and that should be enough ;-)
-
 ################# Methods
 # Runs cmd in the ssh session, either im exec mode or with a tty
 # saves the output to @output
 def ssh_exec(cmd)
-  puts "\n### Sending #{cmd}..."
-  @output&.puts "  #{cmd}: |-"
+  puts "\n### Sending #{cmd.dump}..."
+  @output&.puts "  #{@sequence_prepend_command}#{cmd.dump}: |-"
 
   if @exec_mode
-    @ssh_output = @ssh.exec! cmd + "\n"
+    @ssh_output = @ssh.exec! cmd
   else
-    @ses.send_data cmd + "\n"
+    @ses.send_data cmd
     shell_wait
   end
   yaml_output('    ')
@@ -68,7 +65,14 @@ def shell_wait
           puts "\n### ESC pressed, skipping idle timeout"
           return false
         else
-          # if not, send the char through ssh
+          # if not, record the char and send the char through ssh
+          puts "\n### #{char.dump} pressed"
+          yaml_output('    ')
+          @output&.puts "  #{@sequence_prepend_command}#{char.dump}: |-"
+          @ssh_output = ''
+          start_time = Time.now
+          @ssh_output_length = @ssh_output.length
+
           @ses.send_data char
         end
       end
@@ -85,6 +89,8 @@ def yaml_output(prepend = '')
   # Now print the collected output to @output
   firstline = true
 
+  prepend = @sequence_prepend_output + prepend
+
   # as we want to prepend 'prepend' to each line, we need each_line and chomp
   # chomp removes the trainling \n
   @ssh_output.each_line(chomp: true) do |line|
@@ -113,6 +119,9 @@ end
 
 # Define options
 options = {}
+@sequence_prepend_command = '- '
+@sequence_prepend_output = '  '
+
 optparse = OptionParser.new do |opts|
   opts.banner = <<~HEREDOC
     Usages:
@@ -140,6 +149,10 @@ optparse = OptionParser.new do |opts|
     options[:timeout] = timeout
   end
   opts.on('-e', '--exec-mode', 'Run ssh in exec mode (without tty)') { @exec_mode = true }
+  opts.on('-u', '--unordered', 'The YAML simulation should not enforce an order of the commands') do
+    @sequence_prepend_command = ''
+    @sequence_prepend_output = ''
+  end
   opts.on '-h', '--help', 'Print this help' do
     puts opts
     exit
@@ -182,6 +195,8 @@ elsif options[:input]
 end
 
 puts "Running #{ssh_commands} on #{ssh_user}@#{ssh_host}"
+# Add \n to each command
+ssh_commands.map! { |s| s + "\n" }
 
 # Defaut idle timeout: 5 seconds, as tests showed that 2 seconds is too short
 @idle_timeout = options[:timeout] || 5

data/extra/rest_client.rb

@@ -6,7 +6,7 @@ module Oxidized
     require 'asetus'
 
     class Config
-      Root = ENV['OXIDIZED_HOME'] || File.join(Dir.home, '.config', 'oxidized')
+      ROOT = ENV['OXIDIZED_HOME'] || File.join(Dir.home, '.config', 'oxidized')
     end
 
     CFGS = Asetus.new name: 'oxidized', load: false, key_to_s: true
@@ -38,7 +38,8 @@ module Oxidized
 
     def next(opt)
       data = JSON.dump opt
-      @web.put PATH + '/node/next/' + opt[:name].to_s, data
+      headers = { 'content-type': 'application/json' }
+      @web.put PATH + '/node/next/' + opt[:name].to_s, data, headers
     end
   end
 end

data/extra/syslog.rb

@@ -8,8 +8,10 @@
 # set system syslog host SERVER interactive-commands notice
 # set system syslog host SERVER match "^mgd\[[0-9]+\]: UI_COMMIT: .*"
 
-# Ports < 1024 need extra privileges, use a port higher than this by setting the port option in your oxidized config file.
-# To use the default port for syslog (514) you shouldn't pass an argument, but you will need to allow this with:
+# Ports < 1024 need extra privileges, use a port higher than this by setting the
+# port option in your oxidized config file.
+# To use the default port for syslog (514) you shouldn't pass an argument, but
+# you will need to allow this with:
 # sudo setcap 'cap_net_bind_service=+ep' /usr/bin/ruby
 
 # Config options are:
@@ -52,6 +54,7 @@ module Oxidized
   class SyslogMonitor
     MSG = {
       ios:   /%SYS-(SW[0-9]+-)?5-CONFIG_I:/,
+      iosxr: /%MGBL-SYS-5-CONFIG_I/,
       junos: 'UI_COMMIT:',
       eos:   /%SYS-5-CONFIG_I:/,
       nxos:  /%VSHD-5-VSHD_SYSLOG_CONFIG_I:/,
@@ -89,6 +92,7 @@ module Oxidized
       opts[:from] = log[-1][1..-2]
       opts
     end
+    alias iosxr ios
     alias nxos ios
     alias eos ios
 
@@ -116,7 +120,8 @@ module Oxidized
     def run(io)
       loop do
         log = select [io]
-        log, ip = log.first.first, nil
+        log = log.first.first
+        ip = nil
         if @mode == :udp
           log, ip = log.recvfrom_nonblock 2000
           ip = ip.last

data/lib/oxidized/cli.rb

@@ -1,5 +1,9 @@
+require 'semantic_logger'
+
 module Oxidized
   class CLI
+    include SemanticLogger::Loggable
+
     require 'slop'
     require 'oxidized'
     require 'English'
@@ -9,7 +13,7 @@ module Oxidized
       Process.daemon if @opts[:daemonize]
       write_pid
       begin
-        Oxidized.logger.info "Oxidized starting, running as pid #{$PROCESS_ID}"
+        logger.info "Oxidized starting, running as pid #{$PROCESS_ID}"
         Oxidized.new
       rescue StandardError => e
         crash e
@@ -23,13 +27,13 @@ module Oxidized
       _args, @opts = parse_opts
 
       Config.load(@opts)
-      Oxidized.setup_logger
+      Oxidized::Logger.setup
 
       @pidfile = File.expand_path(Oxidized.config.pid)
     end
 
     def crash(error)
-      Oxidized.logger.fatal "Oxidized crashed, crashfile written in #{Config::CRASH}"
+      logger.fatal "Oxidized crashed, crashfile written in #{Config::CRASH}"
       File.open Config::CRASH, 'w' do |file|
         file.puts '-' * 50
         file.puts Time.now.utc

data/lib/oxidized/config/vars.rb

@@ -1,17 +1,25 @@
-module Oxidized::Config::Vars
-  # convenience method for accessing node, group or global level user variables
-  def vars(name)
-    model_name = @node.model.class.name.to_s.downcase
-    if @node.vars&.has_key?(name)
-      @node.vars[name]
-    elsif Oxidized.config.groups.has_key?(@node.group) && Oxidized.config.groups[@node.group].models.has_key(model_name) && Oxidized.config.groups[@node.group].models[model_name].vars.has_key?(name.to_s)
-      Oxidized.config.groups[@node.group].models[model_name].vars[name.to_s]
-    elsif Oxidized.config.groups.has_key?(@node.group) && Oxidized.config.groups[@node.group].vars.has_key?(name.to_s)
-      Oxidized.config.groups[@node.group].vars[name.to_s]
-    elsif Oxidized.config.models.has_key(model_name) && Oxidized.config.models[model_name].vars.has_key?(name.to_s)
-      Oxidized.config.models[model_name].vars[name.to_s]
-    elsif Oxidized.config.vars.has_key?(name.to_s)
-      Oxidized.config.vars[name.to_s]
+module Oxidized
+  class Config
+    module Vars
+      # convenience method for accessing node, group or global level user variables
+      def vars(name)
+        model_name = @node.model.class.name.to_s.downcase
+        if @node.vars&.has_key?(name)
+          @node.vars[name]
+        elsif Oxidized.config.groups.has_key?(@node.group) &&
+              Oxidized.config.groups[@node.group].models.has_key(model_name) &&
+              Oxidized.config.groups[@node.group].models[model_name].vars.has_key?(name.to_s)
+          Oxidized.config.groups[@node.group].models[model_name].vars[name.to_s]
+        elsif Oxidized.config.groups.has_key?(@node.group) &&
+              Oxidized.config.groups[@node.group].vars.has_key?(name.to_s)
+          Oxidized.config.groups[@node.group].vars[name.to_s]
+        elsif Oxidized.config.models.has_key(model_name) &&
+              Oxidized.config.models[model_name].vars.has_key?(name.to_s)
+          Oxidized.config.models[model_name].vars[name.to_s]
+        elsif Oxidized.config.vars.has_key?(name.to_s)
+          Oxidized.config.vars[name.to_s]
+        end
+      end
     end
   end
 end

data/lib/oxidized/config.rb

@@ -27,7 +27,6 @@ module Oxidized
       asetus.default.model         = 'junos'
       asetus.default.resolve_dns   = true # if false, don't resolve DNS to IP
       asetus.default.interval      = 3600
-      asetus.default.use_syslog    = false
       asetus.default.debug         = false
       asetus.default.run_once      = false
       asetus.default.threads       = 30
@@ -35,7 +34,6 @@ module Oxidized
       asetus.default.timeout       = 20
       asetus.default.retries       = 3
       asetus.default.prompt        = /^([\w.@-]+[#>]\s?)$/
-      asetus.default.rest          = '127.0.0.1:8888' # or false to disable
       asetus.default.next_adds_job = false            # if true, /next adds job, so device is fetched immmeiately
       asetus.default.vars          = {}               # could be 'enable'=>'enablePW'
       asetus.default.groups        = {}               # group level configuration
@@ -43,6 +41,9 @@ module Oxidized
       asetus.default.models        = {}               # model level configuration
       asetus.default.pid           = File.join(Oxidized::Config::ROOT, 'pid')
 
+      # Extentions
+      asetus.default.extensions['oxidized-web'].load = false
+
       asetus.default.crash.directory = File.join(Oxidized::Config::ROOT, 'crashes')
       asetus.default.crash.hostnames = false
 

data/lib/oxidized/core.rb

@@ -6,6 +6,8 @@ module Oxidized
   end
 
   class Core
+    include SemanticLogger::Loggable
+
     class NoNodesFound < OxidizedError; end
 
     def initialize(_args)
@@ -23,15 +25,36 @@ module Oxidized
       end
       Signals.register_signal('HUP', reload_proc)
 
-      # Initialize REST API and webUI if requested
-      if Oxidized.config.rest?
+      # Load extensions, currently only oxidized-web
+      # We have different namespaces for oxidized-web, which needs to be
+      # adressed if we need a generic way to load extensions:
+      # - gem: oxidized-web
+      # - module: Oxidized::API
+      # - path: oxidized/web
+      # - entrypoint: Oxidized::API::Web.new(nodes, configuration)
+
+      # Initialize oxidized-web if requested
+      if Oxidized.config.has_key? 'rest'
+        logger.warn(
+          'configuration: "rest" is deprecated. Migrate to ' \
+          '"extensions.oxidized-web" and remove "rest" from the configuration'
+        )
+        configuration = Oxidized.config.rest
+      elsif Oxidized.config.extensions['oxidized-web'].load?
+        # This comment stops rubocop complaining about Style/IfUnlessModifier
+        configuration = Oxidized.config.extensions['oxidized-web']
+      end
+
+      if configuration
         begin
           require 'oxidized/web'
         rescue LoadError
-          raise OxidizedError, 'oxidized-web not found: sudo gem install oxidized-web - \
-          or disable web support by setting "rest: false" in your configuration'
+          raise OxidizedError,
+                'oxidized-web not found: install it or disable it by ' \
+                'removing "rest" and "extensions.oxidized-web" from your ' \
+                'configuration'
         end
-        @rest = API::Web.new nodes, Oxidized.config.rest
+        @rest = API::Web.new nodes, configuration
         @rest.run
       end
       run
@@ -40,14 +63,13 @@ module Oxidized
     private
 
     def reload
-      Oxidized.logger.info("Reloading node list and log files")
+      logger.info("Reloading node list")
       @worker.reload
-      Oxidized.logger.reopen
       @need_reload = false
     end
 
     def run
-      Oxidized.logger.debug "lib/oxidized/core.rb: Starting the worker..."
+      logger.debug "Starting the worker..."
       loop do
         reload if @need_reload
         @worker.work

data/lib/oxidized/hook/ciscosparkdiff.rb

@@ -14,30 +14,32 @@ class CiscoSparkDiff < Oxidized::Hook
     return unless ctx.node
     return unless ctx.event.to_s == "post_store"
 
-    log "Connecting to Cisco Spark"
+    logger.info "Connecting to Cisco Spark"
     CiscoSpark.configure do |config|
       config.api_key = cfg.accesskey
       config.proxy = cfg.proxy if cfg.has_key?('proxy')
     end
     room = CiscoSpark::Room.new(id: cfg.space)
-    log "Connected"
+    logger.info "Connected"
 
     if cfg.has_key?("diff") ? cfg.diff : true
       gitoutput = ctx.node.output.new
       diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
       title = ctx.node.name.to_s
-      log "Posting diff as snippet to #{cfg.space}"
-      room.send_message CiscoSpark::Message.new(text: 'Device ' + title + ' modified:' + "\n" + diff[:patch].lines.to_a[4..-1].join)
+      logger.info "Posting diff as snippet to #{cfg.space}"
+      room.send_message CiscoSpark::Message.new(text: "Device #{title} modified:\n" +
+                                                      diff[:patch].lines.to_a[4..-1].join)
     end
 
     if cfg.message?
-      log cfg.message
-      msg = cfg.message % { node: ctx.node.name.to_s, group: ctx.node.group.to_s, commitref: ctx.commitref, model: ctx.node.model.class.name.to_s.downcase }
-      log msg
-      log "Posting message to #{cfg.space}"
+      logger.info cfg.message
+      msg = cfg.message % { node: ctx.node.name.to_s, group: ctx.node.group.to_s, commitref: ctx.commitref,
+                            model: ctx.node.model.class.name.to_s.downcase }
+      logger.info msg
+      logger.info "Posting message to #{cfg.space}"
       room.send_message CiscoSpark::Message.new(text: msg)
     end
 
-    log "Finished"
+    logger.info "Finished"
   end
 end

data/lib/oxidized/hook/exec.rb

@@ -28,7 +28,7 @@ class Exec < Oxidized::Hook
 
   def run_hook(ctx)
     env = make_env ctx
-    log "Execute: #{@cmd.inspect}", :debug
+    logger.debug "Execute: #{@cmd.inspect}"
     th = Thread.new do
       run_cmd! env
     rescue StandardError => e
@@ -38,20 +38,21 @@ class Exec < Oxidized::Hook
   end
 
   def run_cmd!(env)
-    pid, status = nil, nil
+    pid = nil
+    status = nil
     Timeout.timeout(@timeout) do
       pid = spawn env, @cmd, unsetenv_others: true
       pid, status = wait2 pid
       unless status.exitstatus.zero?
         msg = "#{@cmd.inspect} failed with exit value #{status.exitstatus}"
-        log msg, :error
+        logger.error msg
         raise msg
       end
     end
   rescue Timeout::Error
     kill "TERM", pid
     msg = "#{@cmd} timed out"
-    log msg, :error
+    logger.error msg
     raise Timeout::Error, msg
   end
 

data/lib/oxidized/hook/githubrepo.rb

@@ -6,8 +6,13 @@ class GithubRepo < Oxidized::Hook
   end
 
   def run_hook(ctx)
+    unless ctx.node
+      logger.error 'GithubRepo.run_hook: no node provided'
+      return
+    end
+
     unless ctx.node.repo
-      log "Oxidized output is not git, can't push to remote", :error
+      logger.error "Oxidized output is not git, can't push to remote"
       return
     end
     repo  = Rugged::Repository.new(ctx.node.repo)
@@ -15,12 +20,11 @@ class GithubRepo < Oxidized::Hook
     url   = remote_repo(ctx.node)
 
     if url.nil? || url.empty?
-      log "No repository defined for #{ctx.node.group}/#{ctx.node.name}", :error
+      logger.error "No repository defined for #{ctx.node.group}/#{ctx.node.name}"
       return
     end
 
-    log "Pushing local repository(#{repo.path})..."
-    log "to remote: #{url}"
+    logger.info "Pushing local repository(#{repo.path}) to remote: #{url}"
 
     if repo.remotes['origin'].nil?
       repo.remotes.create('origin', url)
@@ -34,10 +38,10 @@ class GithubRepo < Oxidized::Hook
       remote.push([repo.head.name], credentials: creds)
     rescue Rugged::NetworkError => e
       if e.message == 'unsupported URL protocol'
-        log "Rugged does not support the git URL '#{url}'.", :warn
+        logger.warn "Rugged does not support the git URL '#{url}'."
         unless Rugged.features.include?(:ssh)
-          log 'You may need to install Rugged with ssh support ' \
-              '(gem install rugged -- --with-ssh)', :warn
+          logger.warn "Note: Rugged isn't installed with ssh support. You may need " \
+                      '"gem install rugged -- --with-ssh"'
         end
       end
       # re-raise exception for the calling method
@@ -47,28 +51,28 @@ class GithubRepo < Oxidized::Hook
 
   def fetch_and_merge_remote(repo, creds)
     result = repo.fetch('origin', [repo.head.name], credentials: creds)
-    log result.inspect, :debug
+    logger.debug result.inspect
 
     their_branch = remote_branch(repo)
 
     unless their_branch
-      log 'remote branch does not exist yet, nothing to merge', :debug
+      logger.debug 'remote branch does not exist yet, nothing to merge'
       return
     end
 
     result = repo.merge_analysis(their_branch.target_id)
 
     if result.include? :up_to_date
-      log 'nothing to merge', :debug
+      logger.debug 'nothing to merge'
       return
     end
 
-    log "merging fetched branch #{their_branch.name}", :debug
+    logger.debug "merging fetched branch #{their_branch.name}"
 
     merge_index = repo.merge_commits(repo.head.target_id, their_branch.target_id)
 
     if merge_index.conflicts?
-      log("Conflicts detected, skipping Rugged::Commit.create", :warn)
+      logger.warn "Conflicts detected, skipping Rugged::Commit.create"
       return
     end
 
@@ -85,18 +89,20 @@ class GithubRepo < Oxidized::Hook
     Proc.new do |_url, username_from_url, _allowed_types| # rubocop:disable Style/Proc
       git_user = cfg.has_key?('username') ? cfg.username : (username_from_url || 'git')
       if cfg.has_key?('password')
-        log "Authenticating using username and password as '#{git_user}'", :debug
+        logger.debug "Authenticating using username and password as '#{git_user}'"
         Rugged::Credentials::UserPassword.new(username: git_user, password: cfg.password)
       elsif cfg.has_key?('privatekey')
         pubkey = cfg.has_key?('publickey') ? cfg.publickey : nil
-        log "Authenticating using ssh keys as '#{git_user}'", :debug
+        logger.debug "Authenticating using ssh keys as '#{git_user}'"
         rugged_sshkey(git_user: git_user, privkey: cfg.privatekey, pubkey: pubkey)
-      elsif cfg.has_key?('remote_repo') && cfg.remote_repo.has_key?(node.group) && cfg.remote_repo[node.group].has_key?('privatekey')
+      elsif cfg.has_key?('remote_repo') &&
+            cfg.remote_repo.has_key?(node.group) &&
+            cfg.remote_repo[node.group].has_key?('privatekey')
         pubkey = cfg.remote_repo[node.group].has_key?('publickey') ? cfg.remote_repo[node.group].publickey : nil
-        log "Authenticating using ssh keys as '#{git_user}' for '#{node.group}/#{node.name}'", :debug
+        logger.debug "Authenticating using ssh keys as '#{git_user}' for '#{node.group}/#{node.name}'"
         rugged_sshkey(git_user: git_user, privkey: cfg.remote_repo[node.group].privatekey, pubkey: pubkey)
       else
-        log "Authenticating using ssh agent as '#{git_user}'", :debug
+        logger.debug "Authenticating using ssh agent as '#{git_user}'"
         Rugged::Credentials::SshKeyFromAgent.new(username: git_user)
       end
     end

data/lib/oxidized/hook/noophook.rb

@@ -1,9 +1,9 @@
 class NoopHook < Oxidized::Hook
   def validate_cfg!
-    log "Validate config"
+    logger.info "Validate config"
   end
 
   def run_hook(ctx)
-    log "Run hook with context: #{ctx}"
+    logger.info "Run hook with context: #{ctx}"
   end
 end

data/lib/oxidized/hook/slackdiff.rb

@@ -12,7 +12,7 @@ class SlackDiff < Oxidized::Hook
   end
 
   def slack_upload(client, title, content, channel)
-    log "Posting diff as snippet to #{channel}"
+    logger.info "Posting diff as snippet to #{channel}"
     upload_dest = client.files_getUploadURLExternal(filename:     "change",
                                                     length:       content.length,
                                                     snippet_type: "diff")
@@ -39,14 +39,14 @@ class SlackDiff < Oxidized::Hook
     return unless ctx.node
     return unless ctx.event.to_s == "post_store"
 
-    log "Connecting to slack"
+    logger.info "Connecting to slack"
     Slack::Web::Client.configure do |config|
       config.token = cfg.token
       config.proxy = cfg.proxy if cfg.has_key?('proxy')
     end
     client = Slack::Web::Client.new
     client.auth_test
-    log "Connected"
+    logger.info "Connected"
     if cfg.has_key?("diff") ? cfg.diff : true
       gitoutput = ctx.node.output.new
       diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
@@ -58,12 +58,13 @@ class SlackDiff < Oxidized::Hook
     end
     # message custom formatted - optional
     if cfg.message?
-      log cfg.message
-      msg = cfg.message % { node: ctx.node.name.to_s, group: ctx.node.group.to_s, commitref: ctx.commitref, model: ctx.node.model.class.name.to_s.downcase }
-      log msg
-      log "Posting message to #{cfg.channel}"
+      logger.info cfg.message
+      msg = cfg.message % { node: ctx.node.name.to_s, group: ctx.node.group.to_s, commitref: ctx.commitref,
+                            model: ctx.node.model.class.name.to_s.downcase }
+      logger.info msg
+      logger.info "Posting message to #{cfg.channel}"
       client.chat_postMessage(channel: cfg.channel, text: msg, as_user: true)
     end
-    log "Finished"
+    logger.info "Finished"
   end
 end