oxidized 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b0526060e394b00d65a0910bc943c6ab0e7d297e10af5bba036b98d69a592c
-  data.tar.gz: d3ff1a990a0cd666313e3027a59148e7e1e3dc5cef403205a136a74510655718
+  metadata.gz: c00743626e287a15848821ba168ad2cbb824e5df3a325cbaa890b955ea3dafa1
+  data.tar.gz: e83a4ba0e11cf259ec0c81850812f736bbe519428d36297c6b8741e0a68e9036
 SHA512:
-  metadata.gz: 9ba909c41f9e35f02ba8c8429aaad7997c1837871d7d7c16097330c8f96a2d642106597a4289bdefb839540f17d080a7e3bfbd669c289f0bce693c24e4a58219
-  data.tar.gz: ffc0b7476888718ab44ee1372e247107c33092396478d0fcb91a7af7e3361f3de45f072184abd70f25f42d3a4ed658bf1d666c43d57c0a77dcf8e669ec7ab335
+  metadata.gz: f38ea9bb12acf38a4a4f5477c87c478f9f761497a9d138e776793cca9d64b25010ae319d3c580fcafea772c1f5dc14a2d34b4cbb5b2ecc8d7001b45df0d24089
+  data.tar.gz: 22393220362199339fbad22f7db8b2c4981e229a48a8d8762e7fe6e56bcb33e722664747b4600bc3c9185b1f367b40db803800efdd513c5f167a2e3c2afd92d3

data/.rubocop.yml

@@ -30,6 +30,9 @@ Style/FormatStringToken:
 Style/RescueModifier:
   Enabled: false
 
+Style/MultilineBlockChain:
+  Enabled: false
+
 # Do not attempt to police vendored code, and exclude special cases
 AllCops:
   Exclude:

data/CHANGELOG.md

@@ -1,9 +1,22 @@
 # Changelog
 
-## Master
+## 024.0
 
-* BUGFIX: model edgecos does not trigger falsepositives due to uptime and memory utilization
+* FEATURE: add frr support to cumulus model (@User4574 / @bobthebutcher)
+* FEATURE: honour MAX_STAT in mtime, to store last N mtime
+* FEATURE: configurable stats history size
+* FEATURE: model callback enhancements for customizing existing models (@ytti)
+* BUGFIX: models ciscosmb, dlink
+
+
+## 0.23.0
+
+* FEATURE: support arbitrary user/password/prompt detection in telnet, same behaviour as ssh
+* FEATURE: manager refactor, support local loading of input, output, source, not just model and hook
+* FEATURE: store modification time in node stats
+* BUGFIX: model edgecos does not trigger false positives due to uptime and memory utilization (@sq9mev)
 * BUGFIX: Use SECRET-DATA hints for hiding secrets in JunOS (@Zmegolaz)
+* BUGFIX: comware (@adamboutcher)
 
 ## 0.22.0
 
@@ -20,6 +33,7 @@
 * FEATURE: cambium model
 * FEATURE: ssh key passphrase (@wk)
 * FEATURE: cisco spark hook (@rgnv)
+* FEATURE: added support for setting ssh auth methods (@laf)
 * BUGFIX: models procurve, br6910, vyos, fortios, edgeos, vyatta, junos, powerconnect, supermicro, fortios, firewareos, aricentiss, dnos, nxos, hpbladesystem, netgear, xos, boss, opengear, pfsense, asyncos
 
 ## 0.21.0

data/README.md

@@ -79,30 +79,32 @@ Check out the [Oxidized TREX 2014 presentation](http://youtu.be/kBQ_CTUuqeU#t=3h
 Install all required packages and gems.
 
 ```shell
-apt-get install ruby ruby-dev libsqlite3-dev libssl-dev pkg-config cmake libssh2-1-dev libicu-dev
+apt-get install ruby ruby-dev libsqlite3-dev libssl-dev pkg-config cmake libssh2-1-dev libicu-dev zlib1g-dev
 gem install oxidized
 gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
 ```
 
 ### CentOS, Oracle Linux, Red Hat Linux
 
-On CentOS 6 / RHEL 6, install Ruby 2.0 or greater (for Ruby 2.1.2 installation instructions see [Installing Ruby 2.1.2 using RVM](#installing-ruby-212-using-rvm)), then install Oxidized dependencies
+On CentOS 6 / RHEL 6, begin by installing Ruby 2.0 or greater. For Ruby 2.1.2 installation instructions see [Installing Ruby 2.1.2 using RVM](#installing-ruby-212-using-rvm).
+
+If you've installed Ruby 2.0 or greater via a 3rd party package rather than the RVM instructions, additional dependencies will be required:
 
 ```shell
-yum install cmake sqlite-devel openssl-devel libssh2-devel libicu-devel
+yum install make cmake which sqlite-devel openssl-devel libssh2-devel ruby gcc ruby-devel libicu-devel gcc-c++
 ```
 
 RHEL 7 / CentOS 7 will work out of the box with the following package list:
 
 ```shell
-yum install cmake sqlite-devel openssl-devel libssh2-devel ruby gcc ruby-devel libicu-devel gcc-c++
+yum install make cmake which sqlite-devel openssl-devel libssh2-devel ruby gcc ruby-devel libicu-devel gcc-c++
 ```
 
 Now let's install oxidized via Rubygems:
 
 ```shell
 gem install oxidized
-gem install oxidized-script oxidized-web
+gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
 ```
 
 ### FreeBSD
@@ -218,7 +220,7 @@ Install Ruby 2.1.2 build dependencies
 ```shell
 yum install curl gcc-c++ patch readline readline-devel zlib zlib-devel
 yum install libyaml-devel libffi-devel openssl-devel make cmake
-yum install bzip2 autoconf automake libtool bison iconv-devel libssh2-devel
+yum install bzip2 autoconf automake libtool bison iconv-devel libssh2-devel libicu-devel
 ```
 
 Install RVM

data/docs/Configuration.md

@@ -66,9 +66,9 @@ vars:
 
 By default, Oxidized registers the following auth methods: `none`, `publickey` and `password`. However you can configure this globally, by groups, models or nodes.
 
-```
+```yaml
 vars:
-    auth_methods: none, publickey, password, keyboard-interactive
+    auth_methods: [ "none", "publickey", "password", "keyboard-interactive" ]
 ```
 
 ## SSH Proxy Command

data/docs/Creating-Models.md

@@ -76,3 +76,27 @@ end
 ```
 
 The output of the `show configuration | display set` command is marked with a new arbitrary alternative output type, `junos-set`.  The `git` output will use the output type to create a new subdirectory by the same name. In this subdirectory, the `git` output will create files with the name `<devicename>--set` that will contain the output of this command for each device.
+
+## Monkey-patching blocks in existing models
+
+In addition to adding new commands and blocks to existing models, Oxidized offers convenience methods for monkey-patching existing commands and blocks within existing models.
+
+When defining a monkey-patched block, two boolean arguments can be passed as part of the block definition:
+
+* `clear: true`, which resets the existing block, allowing the user to completely override its contents.
+* `prepend: true`, which ensures that the contents of the block are prepended, rather than appended (the default) to an existing block.
+
+This functionality is supported for `cfg`, `cmd`, `pre`, `post`, and `expect` blocks.
+
+Examples:
+
+```ruby
+cmd :secret clear: true do
+  ... "(new code for secret removal which replaces the existing :secret definition in the model)" ...
+end
+```
+
+```ruby
+cmd :ssh do prepend: true do
+  ... "(code that should run first, before any code in the existing :ssh definition in the model)" ...
+end

data/docs/Hooks.md

@@ -130,11 +130,11 @@ Fields sent in the message:
 * `model`: Model name (e.g. `eos`)
 * `node`: Device hostname
 
-
 The AWS SNS hook requires the following configuration keys:
 
 * `region`: AWS Region name
 * `topic_arn`: ASN Topic reference
+
 ### awssns hook configuration example
 
 ```yaml

data/docs/Model-Notes/Cumulus.md

@@ -0,0 +1,40 @@
+# Cumulus Linux
+
+## Routing Daemon
+
+With the release of Cumulus Linux 3.4.0 the platform moved the routing daemon to a fork of `Quagga` named `FRRouting`. See the below link for the release notes.
+
+[https://support.cumulusnetworks.com/hc/en-us/articles/115011217808-Cumulus-Linux-3-4-0-Release-Notes](https://support.cumulusnetworks.com/hc/en-us/articles/115011217808-Cumulus-Linux-3-4-0-Release-Notes)
+
+A variable has been added to enable users running Cumulus Linux > 3.4.0 to target the new `frr` routing daemon.
+
+### Example usage
+
+```yaml
+vars:
+  cumulus_routing_daemon: frr
+```
+
+Alternatively map a column for the  `cumulus_routing_daemon` variable.
+
+```yaml
+source:
+  csv:
+    map:
+      name: 0
+      ip: 1
+      model: 2
+      group: 3
+    vars_map:
+      cumulus_routing_daemon: 4
+```
+
+And set the `cumulus_routing_daemon` variable in the `router.db` file.
+
+```text
+cumulus1:192.168.121.134:cumulus:cumulus:frr
+```
+
+The default variable is `quagga` so existing installations continue to operate without interruption.
+
+Back to [Model-Notes](README.md)

data/docs/Model-Notes/EOS.md

@@ -1,9 +1,13 @@
 Arista EOS Configuration
 ========================
 
-By default EOS requires keyboard-interactive to be added to your Oxidized config. You can avoid having to do this by configuring the following on the EOS device:
+By default, EOS requires the `keyboard-interactive` SSH authentication method for a successful SSH login. To add support for this method to your Oxidized configuration, see the [SSH Auth Methods](../Configuration.md#ssh-auth-methods) directive.
 
-```
+It is also possible to modify the EOS configuration to accept the `password` method which Oxidized presents by default. To do so, the following configuration statement can be used:
+
+```text
 management ssh
    authentication mode password
 ```
+
+Back to [Model-Notes](README.md)

data/docs/Model-Notes/Netgear.md

@@ -2,8 +2,10 @@ Netgear Configuration
 =====================
 
 There are several models available with CLI management via telnet (port 60000), but they all behave like one of the following:
-- older models:
-```
+
+### Older models:
+
+```text
 Connected to 192.168.3.201.
 
 (GS748Tv4)
@@ -17,8 +19,9 @@ Password:
 (GS748Tv4) #show running-config
 ```
 
-- newer models:
-```
+### Newer models:
+
+```text
 Connected to 172.0.3.203.
 
 User:admin
@@ -31,17 +34,21 @@ Password:********
 ```
 
 The main differences are:
-- the prompt for username is different (looks quite strange for older models)
-- enable password
-  - the older model prompts for enable password and it expects empty string
-  - the newer model does not prompt for enable password at all
+
+* the prompt for username is different (looks quite strange for older models)
+* enable password
+  * the older model prompts for enable password and it expects empty string
+  * the newer model does not prompt for enable password at all
 
 Configuration for older/newer models: make sure you have defined variable 'enable':
-- `'true'` for newer models
-- `''` empty string: for older models
+
+* `'true'` for newer models
+* `''` empty string: for older models
 
 One possible configuration:
-- oxidized config
+
+### oxidized config
+
 ```yaml
 source:
   default: csv
@@ -57,8 +64,10 @@ source:
       enable: 4
       telnet_port: 5
 ```
-- router.db
-```
+
+### router.db
+
+```text
 switchOldFW:netgear:admin:adminpw::60000
 switchNewFW:netgear:admin:adminpw:true:60000
 ```

data/docs/Model-Notes/README.md

@@ -11,6 +11,7 @@ Vendor          | Model           |Updated
 AireOS|[AireOS](AireOS.md)|29 Nov 2017
 Arbor Networks|[ArbOS](ArbOS.md)|27 Feb 2018
 Arista|[EOS](EOS.md)|05 Feb 2018
+Cumulus|[Cumulus](Cumulus.md)|11 Jun 2018
 Huawei|[VRP](VRP-Huawei.md)|17 Nov 2017
 Juniper|[MX/QFX/EX/SRX/J Series](JunOS.md)|18 Jan 2018
 Netgear|[Netgear](Netgear.md)|11 Apr 2018

data/docs/Model-Notes/XGS4600-Zyxel.md

@@ -20,7 +20,6 @@ input:
     passive: false
 ```
 
-
 ## SSH/TelNet
 
 Below is the table from the XGS4600 CLI Reference Guide (Version 3.79~4.50 Edition 1, 07/2017)
@@ -33,7 +32,6 @@ Privilege Level | Types of commands at this privilege level
 13|Configure features except for login accounts, SNMP user accounts, the authentication method sequence and authorization settings, multiple logins, administrator and enable passwords, and configuration information display.
 14|Configure login accounts, SNMP user accounts, the authentication method sequence and authorization settings, multiple logins, and administrator and enable passwords, and display configuration information.
 
-
 Oxidized can now retrieve your configuration!
 
 Back to [Model-Notes](README.md)

data/docs/Outputs.md

@@ -133,6 +133,7 @@ Please note that user list is only updated once at creation.
 The HTTP output will POST a config to the specified HTTP URL. Basic username/password authentication is supported.
 
 Example HTTP output configuration:
+
 ```yaml
 output:
   default: http

data/docs/Sources.md

@@ -61,7 +61,6 @@ pinentry-mode loopback
 
 **NOTE** - Many database engines have reserved keywords that may conflict with Oxidized configuration field names (such as 'name', 'group', etc). Pay attention to any names that are used and observed proper quoting methods to avoid errors or unpredictable results.
 
-
 ## Source: MYSQL
 
 `sudo apt-get install libmysqlclient-dev`

data/docs/Supported-OS-Types.md

@@ -77,7 +77,7 @@
 * D-Link
   * [D-Link](/lib/oxidized/model/dlink.rb)
 * EdgeCore
- * [ES3528M](/lib/oxidized/model/edgecos.rb)
+  * [ES3528M](/lib/oxidized/model/edgecos.rb)
 * Ericsson/Redback
   * [IPOS (former SEOS)](/lib/oxidized/model/ipos.rb)
 * Extreme Networks

data/lib/oxidized/config.rb

@@ -35,6 +35,7 @@ module Oxidized
       asetus.default.models        = {}               # model level configuration
       asetus.default.pid           = File.join(Oxidized::Config::Root, 'pid')
 
+      asetus.default.stats.history_size = 10
       asetus.default.input.default      = 'ssh, telnet'
       asetus.default.input.debug        = false # or String for session log file
       asetus.default.input.ssh.secure   = false # complain about changed certs

data/lib/oxidized/input/telnet.rb

@@ -25,16 +25,19 @@ module Oxidized
       rescue Timeout::Error
         raise PromptUndetect, ['unable to detect prompt:', @node.prompt].join(' ')
       end
+      connected?
     end
 
     def connected?
       @telnet and not @telnet.sock.closed?
     end
 
-    def cmd cmd, expect = @node.prompt
-      Oxidized.logger.debug "Telnet: #{cmd} @#{@node.name}"
-      args = { 'String' => cmd }
-      args.merge!({ 'Match' => expect, 'Timeout' => @timeout }) if expect
+    def cmd cmd_str, expect = @node.prompt
+      return send(cmd_str + "\n") unless expect
+      Oxidized.logger.debug "Telnet: #{cmd_str} @#{@node.name}"
+      args = { 'String'  => cmd_str,
+               'Match'   => expect,
+               'Timeout' => @timeout }
       @telnet.cmd args
     end
 
@@ -49,7 +52,7 @@ module Oxidized
     private
 
     def expect re
-      @telnet.waitfor 'Match' => re, 'Timeout' => @timeout
+      @telnet.oxidized_expect expect: re, timeout: @timeout
     end
 
     def disconnect
@@ -66,75 +69,36 @@ module Oxidized
 end
 
 class Net::Telnet
-  ## FIXME: we just need 'line = model.expects line' to handle pager
   ## how to do this, without redefining the whole damn thing
   ## FIXME: we also need output (not sure I'm going to support this)
   attr_reader :output
-  def waitfor(options) # :yield: recvdata
-    time_out = @options["Timeout"]
-    waittime = @options["Waittime"]
-    fail_eof = @options["FailEOF"]
+  def oxidized_expect(options) # :yield: recvdata
     model    = @options["Model"]
     @log     = @options["Log"]
 
-    if options.kind_of?(Hash)
-      prompt   = if options.has_key?("Match")
-                   options["Match"]
-                 elsif options.has_key?("Prompt")
-                   options["Prompt"]
-                 elsif options.has_key?("String")
-                   Regexp.new(Regexp.quote(options["String"]))
-                 end
-      time_out = options["Timeout"]  if options.has_key?("Timeout")
-      waittime = options["Waittime"] if options.has_key?("Waittime")
-      fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
-    else
-      prompt = options
-    end
-
-    if time_out == false
-      time_out = nil
-    end
+    expects  = [options[:expect]].flatten
+    time_out = options[:timeout] || @options["Timeout"] || Oxidized.config.timeout?
 
-    line = ''
-    buf = ''
-    rest = ''
-    until prompt === line and not IO::select([@sock], nil, nil, waittime)
-      unless IO::select([@sock], nil, nil, time_out)
-        raise Timeout::Error, "timed out while waiting for more data"
-      end
-      begin
+    Timeout::timeout(time_out) do
+      line = ""
+      rest = ""
+      buf  = ""
+      loop do
         c = @sock.readpartial(1024 * 1024)
         @output = c
-        @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
-        if @options["Telnetmode"]
-          c = rest + c
-          if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
-             Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
-            buf = preprocess(c[0...c.rindex(/#{IAC}#{SB}/no)])
-            rest = c[c.rindex(/#{IAC}#{SB}/no)..-1]
-          elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
-                     c.rindex(/\r\z/no)
-            buf = preprocess(c[0...pt])
-            rest = c[pt..-1]
-          else
-            buf = preprocess(c)
-            rest = ''
-          end
+        c = rest + c
+
+        if Integer(c.rindex(/#{IAC}#{SE}/no) || 0) <
+           Integer(c.rindex(/#{IAC}#{SB}/no) || 0)
+          buf = preprocess(c[0...c.rindex(/#{IAC}#{SB}/no)])
+          rest = c[c.rindex(/#{IAC}#{SB}/no)..-1]
+        elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no) ||
+                   c.rindex(/\r\z/no)
+          buf = preprocess(c[0...pt])
+          rest = c[pt..-1]
         else
-          # Not Telnetmode.
-          #
-          # We cannot use preprocess() on this data, because that
-          # method makes some Telnetmode-specific assumptions.
-          buf = rest + c
+          buf = preprocess(c)
           rest = ''
-          unless @options["Binmode"]
-            if pt = buf.rindex(/\r\z/no)
-              buf = buf[0...pt]
-              rest = buf[pt..-1]
-            end
-            buf.gsub!(/#{EOL}/no, "\n")
-          end
         end
         if Oxidized.config.input.debug?
           @log.print buf
@@ -142,17 +106,9 @@ class Net::Telnet
         end
         line += buf
         line = model.expects line
-        line = yield line if block_given?
-        yield buf if block_given?
-      rescue EOFError # End of file reached
-        raise if fail_eof
-        if line == ''
-          line = nil
-          yield nil if block_given?
-        end
-        break
+        match = expects.find { |re| line.match re }
+        return match if match
       end
     end
-    line
   end
 end

data/lib/oxidized/model/ciscosmb.rb

@@ -16,7 +16,6 @@ class CiscoSMB < Oxidized::Model
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /^(encrypted radius-server key).*/, '\\1 <configuration removed>'
-    cfg.gsub! /System Up Time.*/, ''
     cfg
   end
 
@@ -25,6 +24,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
+    cfg.gsub! /System Up Time.*/, ''
     comment cfg
   end
 

data/lib/oxidized/model/cumulus.rb

@@ -13,6 +13,11 @@ class Cumulus < Oxidized::Model
 
   # show the persistent configuration
   pre do
+    # Set FRR or Quagga in config
+    routing_daemon = vars(:cumulus_routing_daemon) ? vars(:cumulus_routing_daemon).downcase : 'quagga'
+    routing_conf_file = routing_daemon == 'frr' ? 'frr.conf' : 'Quagga.conf'
+    routing_daemon_shout = routing_daemon.upcase
+
     cfg = add_comment 'THE HOSTNAME'
     cfg += cmd 'cat /etc/hostname'
 
@@ -34,23 +39,23 @@ class Cumulus < Oxidized::Model
     cfg += add_comment 'SNMP settings'
     cfg += cmd 'cat /etc/snmp/snmpd.conf'
 
-    cfg += add_comment 'QUAGGA DAEMONS'
-    cfg += cmd 'cat /etc/quagga/daemons'
+    cfg += add_comment "#{routing_daemon_shout} DAEMONS"
+    cfg += cmd "cat /etc/#{routing_daemon}/daemons"
 
-    cfg += add_comment 'QUAGGA ZEBRA'
-    cfg += cmd 'cat /etc/quagga/zebra.conf'
+    cfg += add_comment "#{routing_daemon_shout} ZEBRA"
+    cfg += cmd "cat /etc/#{routing_daemon}/zebra.conf"
 
-    cfg += add_comment 'QUAGGA BGP'
-    cfg += cmd 'cat /etc/quagga/bgpd.conf'
+    cfg += add_comment "#{routing_daemon_shout} BGP"
+    cfg += cmd "cat /etc/#{routing_daemon}/bgpd.conf"
 
-    cfg += add_comment 'QUAGGA OSPF'
-    cfg += cmd 'cat /etc/quagga/ospfd.conf'
+    cfg += add_comment "#{routing_daemon_shout} OSPF"
+    cfg += cmd "cat /etc/#{routing_daemon}/ospfd.conf"
 
-    cfg += add_comment 'QUAGGA OSPF6'
-    cfg += cmd 'cat /etc/quagga/ospf6d.conf'
+    cfg += add_comment "#{routing_daemon_shout} OSPF6"
+    cfg += cmd "cat /etc/#{routing_daemon}/ospf6d.conf"
 
-    cfg += add_comment 'QUAGGA CONF'
-    cfg += cmd 'cat /etc/quagga/Quagga.conf'
+    cfg += add_comment "#{routing_daemon_shout} CONF"
+    cfg += cmd "cat /etc/#{routing_daemon}/#{routing_conf_file}"
 
     cfg += add_comment 'MOTD'
     cfg += cmd 'cat /etc/motd'

data/lib/oxidized/model/dlink.rb

@@ -26,8 +26,8 @@ class Dlink < Oxidized::Model
   cmd 'show config current'
 
   cfg :telnet do
-    username /\r*username:/
-    password /\r*password:/
+    username /\r*[Uu]ser[Nn]ame:/
+    password /\r*[Pp]ass[Ww]ord:/
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/model.rb

@@ -24,9 +24,9 @@ module Oxidized
         @prompt or @prompt = _prompt
       end
 
-      def cfg *methods, &block
+      def cfg *methods, **args, &block
         [methods].flatten.each do |method|
-          @cfg[method.to_s] << block
+          process_args_block(@cfg[method.to_s], args, block)
         end
       end
 
@@ -34,11 +34,11 @@ module Oxidized
         @cfg
       end
 
-      def cmd _cmd = nil, &block
+      def cmd _cmd = nil, **args, &block
         if _cmd.class == Symbol
-          @cmd[_cmd] << block
+          process_args_block(@cmd[_cmd], args, block)
         else
-          @cmd[:cmd] << [_cmd, block]
+          process_args_block(@cmd[:cmd], args, [_cmd, block])
         end
         Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{_cmd} to the commands list"
       end
@@ -47,8 +47,8 @@ module Oxidized
         @cmd
       end
 
-      def expect re, &block
-        @expect << [re, block]
+      def expect re, **args, &block
+        process_args_block(@expect, args, [re, block])
       end
 
       def expects
@@ -62,8 +62,8 @@ module Oxidized
       # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
-      def pre &block
-        @procs[:pre] << block
+      def pre **args, &block
+        process_args_block(@procs[:pre], args, block)
       end
 
       # calls the block at the end of the model, adding the output of the block
@@ -73,8 +73,8 @@ module Oxidized
       # @since 0.0.39
       # @yield expects block which should return [String]
       # @return [void]
-      def post &block
-        @procs[:post] << block
+      def post **args, &block
+        process_args_block(@procs[:post], args, block)
       end
 
       # @author Saku Ytti <saku@ytti.fi>
@@ -83,6 +83,17 @@ module Oxidized
       def procs
         @procs
       end
+
+      private
+
+      def process_args_block(target, args, block)
+        if args[:clear]
+          target.replace([block])
+        else
+          method = args[:prepend] ? :unshift : :push
+          target.send(method, block)
+        end
+      end
     end
 
     attr_accessor :input, :node

data/lib/oxidized/node/stats.rb

@@ -1,7 +1,7 @@
 module Oxidized
   class Node
     class Stats
-      attr_accessor :mtime
+      attr_reader :mtimes
       MAX_STAT = 10
 
       # @param [Job] job job whose information add to stats
@@ -13,7 +13,7 @@ module Oxidized
           :time   => job.time,
         }
         @stats[job.status] ||= []
-        @stats[job.status].shift if @stats[job.status].size > MAX_STAT
+        @stats[job.status].shift if @stats[job.status].size > @history_size
         @stats[job.status].push stat
         @stats[:counter][job.status] += 1
       end
@@ -36,15 +36,21 @@ module Oxidized
         @stats[:counter].reduce(0) { |m, h| h[0] == :success ? m : m + h[1] }
       end
 
+      def mtime
+        mtimes.last
+      end
+
       def update_mtime
-        @mtime = Time.now.utc
+        @mtimes.push Time.now.utc
+        @mtimes.shift
       end
 
       private
 
       def initialize
-        @mtime = "unknown"
-        @stats = {}
+        @history_size = Oxidized.config.stats.history_size? || MAX_STAT
+        @mtimes = Array.new(@history_size, "unknown")
+        @stats  = {}
         @stats[:counter] = Hash.new 0
       end
     end

data/lib/oxidized/source/http.rb

@@ -39,21 +39,20 @@ module Oxidized
 
       response = http.request(request)
       data = JSON.parse(response.body)
+      data = string_navigate(data, @cfg.hosts_location) if @cfg.hosts_location?
       data.each do |node|
         next if node.empty?
         # map node parameters
         keys = {}
         @cfg.map.each do |key, want_position|
-          want_positions = want_position.split('.')
-          keys[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+          keys[key.to_sym] = node_var_interpolate string_navigate(node, want_position)
         end
         keys[:model] = map_model keys[:model] if keys.has_key? :model
 
         # map node specific vars
         vars = {}
         @cfg.vars_map.each do |key, want_position|
-          want_positions = want_position.split('.')
-          vars[key.to_sym] = node_var_interpolate node.dig(*want_positions)
+          vars[key.to_sym] = node_var_interpolate string_navigate(node, want_position)
         end
         keys[:vars] = vars unless vars.empty?
 
@@ -61,20 +60,17 @@ module Oxidized
       end
       nodes
     end
-  end
-end
 
-if RUBY_VERSION < '2.3'
-  class Hash
-    def dig(key, *rest)
-      value = self[key]
-      if value.nil? || rest.empty?
-        value
-      elsif value.respond_to?(:dig)
-        value.dig(*rest)
-      else # foo.bar.baz (bar exist but is not hash)
-        return nil
+    private
+
+    def string_navigate object, wants
+      wants.split(".").map do |want|
+        head, match, _tail = want.partition(/\[\d+\]/)
+        match.empty? ? head : [head, match[1..-2].to_i]
+      end.flatten.each do |want|
+        object = object[want] if object.respond_to? :each
       end
+      object
     end
   end
 end

data/lib/oxidized/version.rb

@@ -1,6 +1,6 @@
 module Oxidized
-  VERSION = '0.23.0'
-  VERSION_FULL = '0.23.0'
+  VERSION = '0.24.0'
+  VERSION_FULL = '0.24.0'
   def self.version_set
     version_full = %x(git describe --tags).chop rescue ""
     version      = %x(git describe --tags --abbrev=0).chop rescue ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -231,6 +231,7 @@ files:
 - docs/Model-Notes/AireOS.md
 - docs/Model-Notes/ArbOS.md
 - docs/Model-Notes/Comware.md
+- docs/Model-Notes/Cumulus.md
 - docs/Model-Notes/EOS.md
 - docs/Model-Notes/JunOS.md
 - docs/Model-Notes/Netgear.md