Skip to content

Added the ability to explicitly specify the port on which the telnet, ssh is running for each host #3860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rajven wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Added the ability to explicitly specify the port on which the telnet, ssh is running for each host #3860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/oxidized/input/sshbase.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ def connected?
end

def make_ssh_opts
node_ssh_port = @node.input_port || vars(:ssh_port)
ssh_opts = {
number_of_password_prompts: 0,
keepalive: vars(:ssh_no_keepalive) ? false : true,
verify_host_key: must_secure? ? :always : :never,
append_all_supported_algorithms: true,
password: @node.auth[:password],
timeout: @node.timeout,
port: (vars(:ssh_port) || 22).to_i,
port: (node_ssh_port || 22).to_i,
forward_agent: false
}

Expand Down
2 changes: 1 addition & 1 deletion lib/oxidized/input/telnet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def connect(node) # rubocop:disable Naming/PredicateMethod

@text_debug = DebugText.new(Oxidized.config.input.debug, @node, config_name)

port = vars(:telnet_port) || 23
port = @node.input_port || vars(:telnet_port) || 23

telnet_opts = {
'Host' => @node.ip,
Expand Down
7 changes: 6 additions & 1 deletion lib/oxidized/node.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ModelNotFound < OxidizedError; end
class Node
include SemanticLogger::Loggable

attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :timeout, :vars, :last, :repo
attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :timeout, :vars, :last, :repo, :input_port
attr_accessor :running, :user, :email, :msg, :from, :stats, :retry, :err_type, :err_reason, :nexted
alias running? running
alias nexted? nexted
Expand All @@ -25,6 +25,7 @@ def initialize(opt)
@group = opt[:group]
@model = resolve_model opt
@input = resolve_input opt
@input_port = resolve_input_port opt
@output = resolve_output opt
@auth = resolve_auth opt
@prompt = resolve_prompt opt
Expand Down Expand Up @@ -183,6 +184,10 @@ def resolve_input(opt)
end
end

def resolve_input_port(opt)
resolve_key :input_port, opt
end

def resolve_output(opt)
output = resolve_key :output, opt, Oxidized.config.output.default
unless Oxidized.mgr.output[output]
Expand Down