gnms 2.1.0.rc2 → 2.1.0

data/lib/gui/base_window.rb

@@ -121,23 +121,23 @@ def show_menu()
 	@main_vbox.reorder_child(@main_bar,0)
 end
 
-  def check_update()
+def check_update()
 	check_update_window()
-  end
+end
 
-  def set_display_view_menu()
+def set_display_view_menu()
 	@ag.get_action("User defined").activate
-  end
+end
 
-  def get_size_changed_from_menu()
+def get_size_changed_from_menu()
 	return @size_changed_from_menu
-  end
+end
 
-  def set_size_changed_from_menu(b)
+def set_size_changed_from_menu(b)
 	@size_changed_from_menu=b
-  end
+end
 
-  def initialize(title)
+def initialize(title)
 
     super(title)
     @size_changed_from_menu=false
@@ -297,8 +297,9 @@ main_menu = %Q[
       	<menuitem action='Add host range'/>
       	<menuitem action='Add network'/>
       </menu>
-      <separator/>
       <menuitem action='Del node'/>
+      <separator/>
+      <menuitem action='Unwanted node'/>
     </menu>
     <menu action='OptionMenu'>
       <menuitem action='Preference'/>
@@ -357,6 +358,7 @@ main_menu = %Q[
   ["Add host range", nil, "Host range", nil, "", proc { add_host_range }],
   ["Add network", nil, "Network", nil, "", proc { addnetworkwin }],
   ["Del node", Gtk::Stock::REMOVE, "Del node", nil, "", proc { delnodewin }],
+  ["Unwanted node", Gtk::Stock::PREFERENCES, "Unwanted node", nil, "", proc { unwantednodewin }],  
   ["OptionMenu", nil, "Option"],
   ["Preference", Gtk::Stock::PREFERENCES, "Preference", nil, "", proc { create_config_option } ],
   ["EventConfMenu", nil, "Monitoring conf"],

data/lib/gui/config_window.rb

@@ -61,7 +61,7 @@ def save_config_yaml()
 	  }
 
   scan = {
-	  'broadcast_ping' => {
+	  'find_node' => {
 				  'state' => @button_bp.active?,
 				  'delay' => @entry_delay_bp.text.to_i,
 				  },
@@ -380,7 +380,7 @@ notebook.show
   @button_noshow_fqdn = Gtk::CheckButton.new "Display hostname instead of FQDN"
   @button_noshow_fqdn.set_size_request 10,-1
   @button_noshow_fqdn.set_active @config.noshow_fqdn && @button_show_label.active?
-  @button_noshow_fqdn.set_sensitive @config.noshow_fqdn && @button_show_label.active?
+  @button_noshow_fqdn.set_sensitive @button_show_label.active?
   @button_noshow_fqdn.show
   table.attach(@button_noshow_fqdn,0,1,2,3)
 
@@ -1028,18 +1028,18 @@ end
   frame.add table
 
   #find hosts using broadcast ping, and if possible arp+lldp sniffing
-  @button_bp = Gtk::CheckButton.new "Find hosts in local segment delay (in s)"
+  @button_bp = Gtk::CheckButton.new "Find new nodes delay (in s)"
   @button_bp.set_size_request 10,-1
-  @button_bp.set_active @config.broadcast_ping_state
+  @button_bp.set_active @config.find_node_state
   @button_bp.show
 
   @entry_delay_bp = Gtk::Entry.new
   @entry_delay_bp.show
   @entry_delay_bp.set_size_request 5,-1
-  if @config.broadcast_ping_delay == "" || @config.broadcast_ping_delay == nil
+  if @config.find_node_delay == "" || @config.find_node_delay == nil
     @entry_delay_bp.set_text "300"
   else
-    @entry_delay_bp.set_text @config.broadcast_ping_delay.to_s
+    @entry_delay_bp.set_text @config.find_node_delay.to_s
   end
   @entry_delay_bp.set_sensitive @button_bp.active?
 
@@ -1151,14 +1151,6 @@ end
   end
   @entry_delay_pm.set_sensitive @button_pm.active?
 
-  if ENV["USER"] != "root"
-	@button_pm.set_active false
-	@button_pm.set_sensitive false
-	@entry_delay_pm.set_sensitive false
-  else
-	@entry_delay_pm.set_sensitive @button_pm.active?
-  end
-
   @button_pm.signal_connect("toggled") {
     @entry_delay_pm.set_sensitive @button_pm.active?
   }
@@ -1842,7 +1834,7 @@ button.signal_connect("clicked") do
   old_wmi_mon=@config.wmi_mon
   old_jmx_mon=@config.jmx_mon
   old_custom_mon=@config.custom_mon
-  old_ping_state=@config.broadcast_ping_state
+  old_ping_state=@config.find_node_state
   old_mac_state=@config.mac_state
   old_node_resolving=@config.node_resolving
   old_syslog_mon=@config.syslog_mon
@@ -1963,10 +1955,12 @@ button.signal_connect("clicked") do
 						add_monitoring_thread("Resolve ip to name",tresolvip())
 						add_monitoring_thread("Resolve ip to netbios",tresolvnetbiosname())
 						add_monitoring_thread("Find os",tresolvos())
+						add_monitoring_thread("Find snmp",tresolvsnmp())
 					else
 						del_monitoring_thread("Resolve ip to name")
 						del_monitoring_thread("Resolve ip to netbios")
 						del_monitoring_thread("Find os")
+						del_monitoring_thread("Find snmp")
 					end
 				end
 

data/lib/gui/help_window.rb

@@ -30,12 +30,12 @@ def help_window
   scrolled_window.add(text)
 
   text.grab_focus
-
-  if FileTest.exist?"README"
-   fic = File.new("README",'r')
+  readme_file = "#{GNMSLIB}/../README"
+  if FileTest.exist?(readme_file)
+   fic = File.new(readme_file,'r')
    tlign = fic.readlines
    fic.close
-   text.buffer.insert_at_cursor(tlign.to_s)
+   text.buffer.insert_at_cursor(tlign.join)
   else
     text.buffer.insert_at_cursor("Error: Could not find README file")
   end

data/lib/gui/ipcalculator.rb

@@ -56,7 +56,7 @@ def netmask_calculator
     hbox = Gtk::HBox.new
     hbox.show
     entry_netmask = Gtk::Entry.new
-    entry_netmask.set_text "255.255.255.0"
+    entry_netmask.set_text DEFAULT_CLASS_C_NETMASK
     entry_netmask.set_editable false
     entry_netmask.show
   

data/lib/gui/node_host_property.rb

@@ -1359,9 +1359,9 @@ end
 
 def fill_port_list(node)
 
-	#we need to append all monitored ports of service hash
-	#@scanned_port_list is ordered as udp first and port number ...
-	if node.service != nil
+     #we need to append all monitored ports of service hash
+     #@scanned_port_list is ordered as udp first and port number ...
+     if node.service != nil
      if @scanned_port_list == nil
 		  @scanned_port_list=[]
 		  node.service.sort{|s1,s2| s1[0].split('/')[1].to_i()<=>s2[0].split('/')[1].to_i()}.each {|w,serv|
@@ -2573,7 +2573,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	  iter[0] = fixed
    end
 
-	column1 = Gtk::TreeViewColumn.new("Selected",
+	column1 = Gtk::TreeViewColumn.new("Enabled",
 					 renderer, {:active => 0})
 	column1.set_clickable(true)
 	column2 = Gtk::TreeViewColumn.new("Protocol",
@@ -2662,6 +2662,11 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 			 item_edit_serv.set_sensitive(true)
 			 item_del_serv.set_sensitive(true)
 		 end
+		 if $config.nmap_vers.to_f() == 0.0
+		   scan_port_serv.set_sensitive(false)
+		 else
+		   scan_port_serv.set_sensitive(true)
+		 end
    	 menu_port.popup(nil, nil, event.button, event.time)
 	  elsif (@treeview.selection.selected!=nil) && (event.event_type == Gdk::Event::BUTTON2_PRESS)
 		edit_monitored_service()	
@@ -2717,7 +2722,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 frame.set_label("No SNMP OID defined, go in Tools menu")
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer_snmp, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("OID label",
@@ -2850,7 +2855,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 frame.set_label("No WMI request defined, go in Tools menu")
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer_wmi, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("WMI label",
@@ -2984,7 +2989,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 frame.set_label("No jmx request defined, go in Tools menu")
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer_jmx, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("Label",
@@ -3098,7 +3103,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 frame.set_label("This monitoring is disabled")
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer_snmp, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("Trap label",
@@ -3217,7 +3222,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 frame.set_label("This monitoring is disabled")
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer_syslog, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("Syslog label",
@@ -3349,7 +3354,7 @@ eval IO.read("#{GNMSLIB}"+'/gui/sub/account_frame.rb')
 	 iter[0] = fixed
   end
 
-  column1 = Gtk::TreeViewColumn.new("Selected",
+  column1 = Gtk::TreeViewColumn.new("Enabled",
 					renderer, {:active => 0})
   column1.set_clickable(true)
   column2 = Gtk::TreeViewColumn.new("Name",

data/lib/gui/update_window.rb

@@ -39,7 +39,10 @@ def check_update_window
   vbox.show
   window.add vbox
 
-  Net::HTTP.version_1_1
+  begin
+    Net::HTTP.version_1_1
+  rescue
+  end
   last_version=""
   text = Gtk::TextView.new
   combo_last_version = Gtk::ComboBox.new

data/lib/main.rb

@@ -88,6 +88,35 @@ end
 # Main Event Window
 ################################################################################
 
+#
+# add node definition to exception list
+# it could be an ip or a regex
+#
+def add_node_def_exception_list(str)
+  if !$node_exception_list.include?(str)
+    $node_exception_list.push(str)
+  end
+end
+
+#
+# del node definition from exception list
+#
+def del_node_def_exception_list(str)
+    $node_exception_list.delete(str)
+end
+
+#
+# check if node definition is
+# matched by an entry from in_exception_list
+#
+def in_exception_list(str)
+  $node_exception_list.each {|str_lign|
+    if str_lign.match(str)
+      return true
+    end
+    } unless $node_exception_list == nil
+    return false
+end
 
 #
 # return a version 4 UUID
@@ -104,6 +133,9 @@ def create_uuid()
   end
 end
 
+#
+# encode the given str using blowfish crypto algo
+#
 def blowfish_encode(str)
   begin
     blowfish = Crypt::Blowfish.new(GNMSPPH)
@@ -114,6 +146,9 @@ def blowfish_encode(str)
   return ""
 end
 
+#
+# decode the given str using blowfish crypto algo
+#
 def blowfish_decode(str)
   begin
     blowfish = Crypt::Blowfish.new(GNMSPPH)
@@ -135,6 +170,9 @@ def get_snmp_version(str)
   end
 end
 
+#
+# return a color based on the node sev status
+#
 def get_color_from_status(status)
   case status
   when "CRITICAL"
@@ -157,6 +195,7 @@ end
 #
 #	convert status to level
 #  can return a level or '' if not convert or "UNKNOWN", "UNMANAGED" if "UNMANAGED"
+#
 def get_level_from_status(status)
   case status
   when "UNMANAGED"
@@ -176,6 +215,9 @@ def get_level_from_status(status)
   end
 end
 
+#
+# map syslog level to node status
+#
 def get_status_from_level(level)
   case level
   when "UNMANAGED"
@@ -195,11 +237,16 @@ def get_status_from_level(level)
   end
 end
 
-
+#
+# check if corresponding str name exists as a thread
+#
 def exist_monitoring_thread(str)
   return $thread_list[str] != nil
 end
 
+#
+# add a thread identified by a corresponding str name
+#
 def add_monitoring_thread(str, thr)
   $log.debug("Starting thread #{str}")
   if thr
@@ -268,6 +315,9 @@ def fill_ip_str(ip)
   return ip_tmp
 end
 
+#
+# return window map width or default value
+#
 def get_map_width()
   if $win and $win.window != nil
     return $win.window.geometry[2]
@@ -276,6 +326,9 @@ def get_map_width()
   end
 end
 
+#
+# return window map height or default value
+#
 def get_map_height()
   if $win and $win.window != nil
     return $win.window.geometry[3]
@@ -284,6 +337,9 @@ def get_map_height()
   end
 end
 
+#
+# return screen width
+#
 def get_default_map_width()
   if $config.default_width == nil || $config.default_width == ""
     return Gdk::screen_width/2
@@ -292,6 +348,9 @@ def get_default_map_width()
   end
 end
 
+#
+# return screen height
+#
 def get_default_map_height()
   if $config.default_height == nil || $config.default_height == ""
     return Gdk::screen_height/2
@@ -300,6 +359,9 @@ def get_default_map_height()
   end
 end
 
+#
+# delete selected node(s) 
+#
 def del_selected_node()
   mapp=get_map()
   if $map != nil
@@ -719,7 +781,7 @@ def set_map(mp=nil)
 
       opts = OptionParser.new
       opts.on("-f=ARG", "--file filename",String,"Load xml node filename") {|val| file_to_load=val }
-      opts.on("-d=ARG", "--debug level",Integer,"Set debug level to default output") {|val| debuglevel=val }
+      opts.on("-d=ARG", "--debug level",Integer,"Set debug output level (0 is the most verbose)") {|val| debuglevel=val }
       opts.on("-t=ARG", "--test scenario",String,"Load and execute scenario from test/ dir") {|val| testunitfile=val
         $testunit=true
       }
@@ -935,6 +997,9 @@ def set_map(mp=nil)
         $event_win.add_event(EventWindow::CORE_EVENT_TYPE,"INFO",$host["127.0.0.1"], "GNMS launch")
       end
 
+      #node we don't want to see
+      $node_exception_list = Array.new
+      
       #rescue Exception => msg
       #	puts "-"*80
       #	$log.fatal("Please report this error: #{msg}\n#{msg.backtrace.join("\n")}")
@@ -966,7 +1031,7 @@ def set_map(mp=nil)
         #thread to listen to monitored jmx cmd
         add_monitoring_thread("JMX monitoring", tmonitorjmx())
       end
-      if $config.broadcast_ping_state
+      if $config.find_node_state
         #thread to find new host in local network with broacast ping	
         add_monitoring_thread("Local ping", t_find_local_segment_pinging())
 	#thread to find new host in local segment sniffing for arp/lldp/dhcp packets
@@ -985,6 +1050,8 @@ def set_map(mp=nil)
         add_monitoring_thread("Resolve ip to netbios", tresolvnetbiosname())
         #thread to find os with fingerprinting
         add_monitoring_thread("Find os", tresolvos())
+	#thread to find nodes with snmp
+        add_monitoring_thread("Find snmp", tresolvesnmp())	
       end
 
       if $config.auto_save_map

data/lib/monitor/client/snmp/snmp.rb

@@ -22,13 +22,16 @@ def get_snmp_OID(node, oid)
   end
 
   begin
-    print "get_snmp_OID: ", node.ip, " ", community_read, " ", community_write, " ", get_snmp_version(version), " ", port.to_i, " ", timeout.to_i, " ", retr.to_i,"\n"
+    #print "get_snmp_OID: ", node.ip, " ", community_read, " ", community_write, " ", get_snmp_version(version), " ", port.to_i, " ", timeout.to_i, " ", retr.to_i,"\n"
     SNMP::Manager.open(:Host => node.ip, :Community => community_read, :WriteCommunity => community_write, :Version => get_snmp_version(version), :Port => port.to_i, :Timeout => timeout.to_i, :Retries => retr.to_i) do |manager|
       response = manager.get(oid)
       response.each_varbind do |vb|
         return vb.value.to_s
       end
     end
+  rescue SNMP::RequestTimeout    
+    $log.debug("Error in get_snmp_OID: #{node.ip} not responding")
+    return "Error"  
   rescue Exception => msg
     $log.error("Error in get_snmp_OID: #{msg}")
     return "Error"
@@ -60,6 +63,9 @@ def walk_snmp_OID(node, oid)
       }
       return resultt
     end
+  rescue SNMP::RequestTimeout
+    $log.debug("Error in get_snmp_OID: #{node.ip} not responding")
+    return "Error"
   rescue Exception => msg
     $log.error("Error in get_snmp_OID: #{msg}")
     return "Error"