oxidized 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4293285f8095f28f9f3d38dc2d606a03a58d163b
-  data.tar.gz: f108592ebdce488d10f06d7ee0e5545e3e117e32
+  metadata.gz: f88947ee1d76a827ebd27c7bed550316840adb77
+  data.tar.gz: ed10ff21f48f72e1f447ea4c1a6f2c47f07affe1
 SHA512:
-  metadata.gz: aed22b16c6223c5b27a6b68476e25aea4154fcafd104a8567f7f19c4de38c8dddcd3fe18e1fd0950bc6e01e927d6af2fed514dd8f966eb33670f2a3517c6285f
-  data.tar.gz: 62a21f8caa39a27c853d2d56b3b96d35f6320db5cf6743ea76dd0cb7c6562729a0b96b5cc9b83524ad6edaac960dfb07ab88c7bffa526b459248603ba0e71bfa
+  metadata.gz: 210d315e689781ffc62d5d64faff5f6cf6be4e6e5178703d4f30026be62dab6764987f85cb8eb406aa456f96e074fc6d8a47f7ce7a4df66e106ee099c9d9d179
+  data.tar.gz: 65ab67187988d2fbc67cea78498b9cd6dd5b4ba35a0c9e871079eaa840c0f66f930b4c89b59bc20041b0f8cc4bd58f990d22e4f811fd668cd10cf100dbf3cfd7

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 0 17.3
+# 0.18.0
+- FEATURE: APC model (by @davromaniak )
+- BUGFIX: ironware, aosw
+- BUGFIX: interpolate nil, false, true for node vars too
+
+# 0 17.0
 - FEATURE: "nil", "false" and "true" in source (e.g. router.db) are interpeted as nil, false, true. Empty is now always considered empty string, instead of in some cases nil and some cases empty string.
 - FEATURE: support tftp as input model (@MajesticFalcon)
 - FEATURE: add alvarion model (@MajesticFalcon)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oxidized (0.17.0)
+    oxidized (0.18.0)
       asetus (~> 0.1)
       net-ssh (~> 3.0.2)
       net-telnet

data/README.md

@@ -1,4 +1,4 @@
-# Oxidized [![Build Status](https://travis-ci.org/Shopify/oxidized.svg)](https://travis-ci.org/Shopify/oxidized) [![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized) [![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
+# Oxidized [![Build Status](https://travis-ci.org/Shopify/oxidized.svg)](https://travis-ci.org/Shopify/oxidized) [![Gem Version](https://badge.fury.io/rb/oxidized.svg)](http://badge.fury.io/rb/oxidized) [![Join the chat at https://gitter.im/oxidized/Lobby](https://badges.gitter.im/oxidized/Lobby.svg)](https://gitter.im/oxidized/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Oxidized is a network device configuration backup tool. It's a RANCID replacement!
 
@@ -45,102 +45,104 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
 
 # Supported OS types
  * Vendor
-   * OS - model_name
+   * OS model
 
  * A10 Networks
-   * ACOS - acos
+   * [ACOS](lib/oxidized/model/acos.rb)
  * Alcatel-Lucent
-   * AOS - aos
-   * AOS7 - aos7
-   * ISAM - isam
+   * [AOS](lib/oxidized/model/aos.rb)
+   * [AOS7](lib/oxidized/model/aos7.rb)
+   * [ISAM](lib/oxidized/model/isam.rb)
    * Wireless
  * Alvarion
-   * BreezeACCESS - alvarion
+   * [BreezeACCESS](lib/oxidized/model/alvarion.rb)
+ * APC
+   * [AOS](lib/oxidized/model/apc_aos.rb)
  * Arista
-   * EOS - eos
+   * [EOS](lib/oxidized/model/eos.rb)
  * Arris
-   * C4CMTS - c4cmts
+   * [C4CMTS](lib/oxidized/model/c4cmts.rb)
  * Aruba
-   * AOSW - aosw
+   * [AOSW](lib/oxidized/model/aosw.rb)
  * Brocade
-   * FabricOS - fabricos
-   * Ironware - ironware
-   * NOS (Network Operating System) - nos
-   * Vyatta - vyatta
-   * 6910 - br6910
+   * [FabricOS](lib/oxidized/model/fabricos.rb)
+   * [Ironware](lib/oxidized/model/ironware.rb)
+   * [NOS (Network Operating System)](lib/oxidized/model/nos.rb)
+   * [Vyatta](lib/oxidized/model/vyatta.rb)
+   * [6910](lib/oxidized/model/br6910.rb)
  * Check Point
-   * GaiaOS - gaiaos
+   * [GaiaOS](lib/oxidized/model/gaiaos.rb)
  * Ciena
-   * SOAS - saos
+   * [SOAS](lib/oxidized/model/saos.rb)
  * Cisco
-   * AireOS - aireos
-   * ASA - asa
-   * CatOS - catos
-   * IOS - ios
-   * IOSXR - iosxr
-   * NXOS - nxos
-   * SMB (Nikola series) 
+   * [AireOS](lib/oxidized/model/aireos.rb)
+   * [ASA](lib/oxidized/model/asa.rb)
+   * [CatOS](lib/oxidized/model/catos.rb)
+   * [IOS](lib/oxidized/model/ios.rb)
+   * [IOSXR](lib/oxidized/model/iosxr.rb)
+   * [NXOS](lib/oxidized/model/nxos.rb)
+   * [SMB (Nikola series)](lib/oxidized/model/ciscosmb.rb)
  * Citrix
-   * NetScaler (Virtual Applicance) - netscaler
+   * [NetScaler (Virtual Applicance)](lib/oxidized/model/netscaler.rb)
  * Coriant (former Tellabs)
-   * TMOS (8800) - tmos
-   * 8600 - 
+   * [TMOS (8800)](lib/oxidized/model/corianttmos.rb)
+   * [8600](lib/oxidized/model/coriant8600.rb)
  * Cumulus
-   * Linux
+   * [Linux](lib/oxidized/model/cumulus.rb)
  * DataCom
-   * DmSwitch 3000
+   * [DmSwitch 3000](lib/oxidized/model/datacom.rb)
  * DELL
-   * PowerConnect - powerconnect
-   * AOSW - aosw
+   * [PowerConnect](lib/oxidized/model/powerconnect.rb)
+   * [AOSW](lib/oxidized/model/aosw.rb)
  * Ericsson/Redback
-   * IPOS (former SEOS) - ipos
+   * [IPOS (former SEOS)](lib/oxidized/model/ipos.rb)
  * Extreme Networks
-   * XOS - xos
-   * WM
+   * [XOS](lib/oxidized/model/xos.rb)
+   * [WM](lib/oxidized/model/mtrlrfs.rb)
  * F5
-   * TMOS
+   * [TMOS](lib/oxidized/model/tmos.rb)
  * Force10
-   * DNOS - dnos
-   * FTOS - ftos
+   * [DNOS](lib/oxidized/model/dnos.rb)
+   * [FTOS](lib/oxidized/model/ftos.rb)
  * FortiGate
-   * FortiOS - fortios
+   * [FortiOS](lib/oxidized/model/fortios.rb)
  * HP
-   * Comware (HP A-series, H3C, 3Com) - comware
-   * Procurve - procurve
+   * [Comware (HP A-series, H3C, 3Com)](lib/oxidized/model/comware.rb)
+   * [Procurve](lib/oxidized/model/procurve.rb)
  * Huawei
-   * VRP
+   * [VRP](lib/oxidized/model/vrp.rb)
  * Juniper
-   * JunOS
-   * ScreenOS (Netscreen)
+   * [JunOS](lib/oxidized/model/junos.rb)
+   * [ScreenOS (Netscreen)](lib/oxidized/model/screenos.rb)
  * Mellanox
-   * MLNX-OS - mlnxos
+   * [MLNX-OS](lib/oxidized/model/mlnxos.rb)
  * Mikrotik
-   * RouterOS - routeros
+   * [RouterOS](lib/oxidized/model/routeros.rb)
  * Motorola
-   * RFS
+   * [RFS](lib/oxidized/model/mtrlrfs.rb)
  * MRV
-   * MasterOS - masteros
+   * [MasterOS](lib/oxidized/model/masteros.rb)
  * Netonix
-   * WISP Switch (As Netonix) - netonix
+   * [WISP Switch (As Netonix)](lib/oxidized/model/netonix.rb)
  * Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)
-   * SR OS (TiMOS) - timos
+   * [SR OS (TiMOS)](lib/oxidized/model/timos.rb)
  * Opengear
-   * Opengear - opengear
+   * [Opengear](lib/oxidized/model/opengear.rb)
  * Palo Alto
-   * PANOS - panos
- * pfSense - pfsense
+   * [PANOS](lib/oxidized/model/panos.rb)
+ * [pfSense](lib/oxidized/model/pfsense.rb)
  * Quanta
-   * Quanta / VxWorks 6.6 (1.1.0.8) - quantaos
+   * [Quanta / VxWorks 6.6 (1.1.0.8)](lib/oxidized/model/quantaos.rb)
  * Supermicro
-   * Supermicro - supermicro
+   * [Supermicro](lib/oxidized/model/supermicro.rb)
  * Ubiquiti
-   * AirOS - airos
-   * Edgeos - edgeos
-   * EdgeSwitch - edgeswitch
+   * [AirOS](lib/oxidized/model/airos.rb)
+   * [Edgeos](lib/oxidized/model/edgeos.rb)
+   * [EdgeSwitch](lib/oxidized/model/edgeswitch.rb)
  * Watchguard
-   * Fireware OS - firewareos
+   * [Fireware OS](lib/oxidized/model/firewareos.rb)
  * Zyxel
-   * ZyNOS - zynos
+   * [ZyNOS](lib/oxidized/model/zynos.rb)
 
 
 # Installation
@@ -286,6 +288,24 @@ _Note: this step in only needed for creating Oxidized's configuration file and c
 ```
 docker run --rm -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest oxidized
 ```
+If the RESTful API and Web Interface are enabled, on the docker host running the container
+edit /etc/oxidized/config and modify 'rest: 127.0.0.1:8888' by 'rest: 0.0.0.0:8888'
+this will bind port 8888 to all interfaces then expose port out. (Issue #445)
+
+You can also use docker-compose to launch oxidized container:
+```
+# docker-compose.yml 
+# docker-compose file example for oxidized that will start along with docker daemon
+oxidized:
+  restart: always
+  image: oxidized/oxidized:latest 
+  ports:
+    - 8888:8888/tcp
+  environment:
+    CONFIG_RELOAD_INTERVAL: 600
+  volumes:
+    - /etc/oxidized:/root/.config/oxidized 
+```
 
 create the `/etc/oxidized/router.db`
 
@@ -347,10 +367,10 @@ Device models can contain substitution filters to remove potentially sensitive d
 
 As a partial example from ios.rb:
 
-```  
+```
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    (...)    
+    (...)
     cfg
   end
 ```
@@ -416,10 +436,10 @@ source:
     adapter: mysql2
     database: oxidized
     table: nodes
-    username: root 
+    username: root
     password: rootpass
     map:
-      name: ip 
+      name: ip
       model: model
       username: username
       password: password

data/extra/oxidized.apache2

@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+	# Place in sites-available
+	
+    ServerAdmin admin@example.com
+    ServerName oxidized.example.com
+    ServerAlias oxidized
+
+    ProxyPass /  http://127.0.0.1:8888/
+    ProxyPassReverse / http://127.0.0.1:8888/
+
+    ErrorLog /var/log/apache2/oxidized_error.log
+    CustomLog /var/log/apache2/oxidized_access.log combined
+
+</VirtualHost>

data/extra/oxidized.nginx

@@ -0,0 +1,14 @@
+server {
+        listen 80;
+        listen [::]:80;
+
+        server_name oxidized.example.com;
+
+        location / {
+                proxy_pass http://127.0.0.1:8888/;
+        }
+
+        access_log /var/log/nginx/access_oxidized.log;
+        error_log /var/log/nginx/error_oxidized.log;
+}
+

data/lib/oxidized/model/aosw.rb

@@ -60,8 +60,8 @@ class AOSW < Oxidized::Model
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send 'enable\n'
-        send vars(:enable) + '\n'
+        send "enable\n"
+        send vars(:enable) + "\n"
       end
     end
     post_login 'no paging'

data/lib/oxidized/model/apc_aos.rb

@@ -0,0 +1,11 @@
+class Apc_aos < Oxidized::Model
+
+  cmd 'config.ini' do |cfg|
+    cfg.gsub! /^; Configuration file\, generated on.*/, ''
+  end
+
+  cfg :ftp do
+  end
+
+end
+

data/lib/oxidized/model/ironware.rb

@@ -2,14 +2,14 @@ class IronWare < Oxidized::Model
 
   prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
   comment  '! '
-  
+
   #to handle pager without enable
   #expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
   #end
 
-  
+
   #to remove backspace (if handle pager without enable)
   #expect /^((.*)[\b](.*))$/ do |data, re|
   #  data.sub re, ''
@@ -44,14 +44,14 @@ class IronWare < Oxidized::Model
       out << sc.rest
       cfg = out
     end
-    
+
     comment cfg
   end
-  
+
   cmd 'show flash' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show module' do |cfg|
     cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
     comment cfg
@@ -74,7 +74,7 @@ class IronWare < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\r\n"
-        send vars(:enable) + "\r\n"
+        cmd vars(:enable)
       end
     end
     post_login ''

data/lib/oxidized/source/csv.rb

@@ -25,7 +25,7 @@ class CSV < Source
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = data[position]
+        keys[key.to_sym] = node_var_interpolate data[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 

data/lib/oxidized/source/http.rb

@@ -39,7 +39,7 @@ class HTTP < Source
       # map node parameters
       keys = {}
       @cfg.map.each do |key, position|
-        keys[key.to_sym] = line[position]
+        keys[key.to_sym] = node_var_interpolate line[position]
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 

data/lib/oxidized/source/sql.rb

@@ -26,7 +26,7 @@ class SQL < Source
     query.each do |node|
       # map node parameters
       keys = {}
-      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.map.each { |key, sql_column| keys[key.to_sym] = node_var_interpolate node[sql_column.to_sym] }
       keys[:model] = map_model keys[:model] if keys.key? :model
 
       # map node specific vars

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -182,8 +182,10 @@ files:
 - extra/auto-reload-config.runit
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized-report-git-commits
+- extra/oxidized.apache2
 - extra/oxidized.init
 - extra/oxidized.init.d
+- extra/oxidized.nginx
 - extra/oxidized.runit
 - extra/oxidized.service
 - extra/oxidized.supervisord
@@ -216,6 +218,7 @@ files:
 - lib/oxidized/model/aos.rb
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
+- lib/oxidized/model/apc_aos.rb
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/br6910.rb
 - lib/oxidized/model/c4cmts.rb