diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 4f9a61d80b..a0db8ea5e4 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,31 @@
+2008-07-30  Sancho Lerena <slerena@gmail.com>
+	
+	* pandoradb.sql: Some changes in structure for new export server. Removed
+	and extra comma in tplanned_downtime.
+
+	* pandoradb_data.sql: Deleted some stuff from Gigabit module templates, 
+	too much.
+
+	* logon_ok.php: Header update.
+
+	* menu.php: Plugin editor moved under server section.
+
+	* modificar_agente.php: Added icon to agent config editor from manage
+	agents view.
+
+	* links.php: Some code cleanup.
+
+	* pandora.ico: New .ICO file for web, this will be official one for
+	2.0 version.
+
+	* functions_db.php: Fixed a problem in audit_db() where parameters
+	was not properly cleaned and with ' chars this makes an SQL error.
+	Fixed BUG #2032885, in function get_monitors_in_agent () where a 
+	bad SQL forced an error in report.
+
+	* estado_agente.php, estado_generalagente.php: Added link to group 
+	view from group icon.
+
 2008-07-30  Evi Vanoost <vanooste@rcbi.rochester.edu>
 
 	* include/functions_db.php: Small bug that gave a warning in case there were no events for an agent
diff --git a/pandora_console/general/links_menu.php b/pandora_console/general/links_menu.php
index eb1971f018..ea4188f815 100644
--- a/pandora_console/general/links_menu.php
+++ b/pandora_console/general/links_menu.php
@@ -1,11 +1,8 @@
 <?php
-// Pandora FMS - the Free monitoring system
-// ========================================
-// Copyright (c) 2004-2007 Sancho Lerena, slerena@openideas.info
-// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas
-// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com
-// Copyright (c) 2006-2007 Jose Navarro jose@jnavarro.net
-// Copyright (c) 2006-2007 Jonathan Barajas, jonathan.barajas[AT]gmail[DOT]com
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index bbdf3e49c8..17e41b5f56 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -1,10 +1,10 @@
 <?php
 
-// Pandora FMS
-// ====================================
-// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
-// Copyright (c) 2005-2008 Artica Soluciones Tecnologicas, info@artica.es
-// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
+
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
diff --git a/pandora_console/godmode/agentes/agent_disk_conf_editor.php b/pandora_console/godmode/agentes/agent_disk_conf_editor.php
index 9737cee799..da4295aaae 100644
--- a/pandora_console/godmode/agentes/agent_disk_conf_editor.php
+++ b/pandora_console/godmode/agentes/agent_disk_conf_editor.php
@@ -1,8 +1,8 @@
 <?php
-// Pandora FMS - the Free Monitoring System
-// ========================================
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
-// Copyright (c) 2008 Ramon Novoa <rnovoa@artica.es>
 // Please see http://pandora.sourceforge.net for full contribution list
 
 // This program is free software; you can redistribute it and/or
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 4a3491e29f..f771d39029 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -1,9 +1,8 @@
 <?PHP
 
-// Pandora FMS - the Free Monitoring System
-// ========================================
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
-// Copyright (c) 2008 Jorge Gonzalez <jorge.gonzalez@artica.es>
 // Please see http://pandora.sourceforge.net for full contribution list
 
 // This program is free software; you can redistribute it and/or
diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php
index cff76f7588..9ee1cd36ca 100644
--- a/pandora_console/godmode/agentes/manage_config.php
+++ b/pandora_console/godmode/agentes/manage_config.php
@@ -1,11 +1,10 @@
 <?php
 
-// Pandora FM
-// ====================================
-// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
-// Copyright (c) 2005-2008 Artica Soluciones Tecnoloicas S.L, info@artica.es
-// Copyright (c) 2004-2006 Raul Mateos Martin, raulofpandora@gmail.com
-// Copyright (c) 2008 Jorge Gonzalez <jorge.gonzalez@artica.es>
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
+
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php
index d46f11a6b9..451ef34dc5 100644
--- a/pandora_console/godmode/agentes/manage_config_remote.php
+++ b/pandora_console/godmode/agentes/manage_config_remote.php
@@ -1,14 +1,13 @@
 <?php
 
-// Pandora FMS 
-// ====================================
-// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
-// Copyright (c) 2005-2008 Artica Soluciones Tecnoloicas S.L, info@artica.es
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+// as published by the Free Software Foundation; version 2.
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index a0bdd1ecc3..585ba0ec94 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -1,8 +1,8 @@
 <?php
-// Pandora FMS - the Free Monitoring System
-// ========================================
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
-// Copyright (c) 2008 Jorge Gonzalez <jorge.gonzalez@artica.es>
 // Please see http://pandora.sourceforge.net for full contribution list
 
 // This program is free software; you can redistribute it and/or
@@ -227,7 +227,10 @@ if (mysql_num_rows($result)){
 			// Has remote configuration ?
 			$agent_md5 = md5($row["nombre"], FALSE);
 			if (file_exists($config["remote_config"] . "/" . $agent_md5 . ".md5")){
+
+				echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$row["id_agente"]."&disk_conf=" . $agent_md5 . "'>";
 				echo "<img src='images/application_edit.png' border='0' align='middle' title='".lang_string("Edit remote config")."'>";
+				echo "</A>";
 			}
 			echo "</td>";
 
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 011dc63507..86663e46cf 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -1,14 +1,9 @@
 <?php
 
-// Pandora FMS - the Free monitoring system
-// ========================================
-// Copyright (c) 2004-2008 Sancho Lerena, slerena@gmail.com
-// Main PHP/SQL code development and project architecture and management
-// Copyright (c) 2004-2007 Raul Mateos Martin, raulofpandora@gmail.com
-// CSS and some PHP additions
-// Copyright (c) 2006 Jose Navarro <contacto@indiseg.net>
-// Additions to Pandora FMS 1.2 graph code 
-// Copyright (c) 2005-2007 Artica Soluciones Tecnologicas, info@artica.es
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -117,14 +112,6 @@ if (comprueba_login() == 0){
             echo '<div id="god2">';
 		echo '<ul class="mn"><li><a href="index.php?sec=galertas&amp;sec2=godmode/alerts/modify_alert" class="mn">'.lang_string ("manage_alerts").'</a></li></ul></div>';
 
-        if (isset($_GET["sec"]) && $_GET["sec"] == "galertas"){
-            if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/alerts/plugin"){
-                echo "<div class='arrowgs'>";
-            }
-            else echo "<div class='arrowg'>";
-
-            echo "<ul class='mn'><li><a href='index.php?sec=galertas&sec2=godmode/alerts/plugin' class='mn'>".lang_string("Manage plugins")."</a></li></ul></div>";
-        }
 	}
 	if ((give_acl($id_user, 0, "UM")==1)){
 		if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/users/user_list" || $_GET["sec2"] == "godmode/users/configure_user")){
@@ -199,6 +186,16 @@ if (comprueba_login() == 0){
 				echo "<div class='arrowg'>";
 			echo "<ul class='mn'><li><a href='index.php?sec=gservers&sec2=godmode/servers/manage_recontask' class='mn'>".lang_string ("manage_recontask")."</a></li></ul></div>";
 		}
+
+		if (isset($_GET["sec"]) && $_GET["sec"] == "gservers"){
+            if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/servers/plugin"){
+                echo "<div class='arrowgs'>";
+            }
+            else echo "<div class='arrowg'>";
+
+            echo "<ul class='mn'><li><a href='index.php?sec=gservers&sec2=godmode/servers/plugin' class='mn'>".lang_string("Manage plugins")."</a></li></ul></div>";
+        }
+
        	// AUDIT
        	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/admin_access_logs"){
diff --git a/pandora_console/godmode/alerts/plugin.php b/pandora_console/godmode/servers/plugin.php
similarity index 100%
rename from pandora_console/godmode/alerts/plugin.php
rename to pandora_console/godmode/servers/plugin.php
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 2e0fc22358..2e7a14f5b6 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -1,14 +1,33 @@
-<?php
-// Pandora - The Free Monitoring System
-// This code is protected by GPL license.
-// Este codigo esta protegido por la licencia GPL.
-// Sancho Lerena <slerena@gmail.com>, 2003-2007
-// Raul Mateos <raulofpandora@gmail.com>, 2005-2007
+<?PHP
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
+// Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
+// Please see http://pandora.sourceforge.net for full contribution list
+
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation for version 2.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Load global vars
-if (comprueba_login() == 0)
-   $id_user = $_SESSION["id_usuario"];
-   if (give_acl($id_user, 0, "PM")==1) {
+require("include/config.php");
+
+if (comprueba_login()) {
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Link Management");
+	require ("general/noaccess.php");
+}
+if (! give_acl ($config['id_user'], 0, "PM") || ! dame_admin ($config['id_user'])) {
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Link Management");
+	require ("general/noaccess.php");
+}
+
 
 	if (isset($_POST["create"])){ // If create
 		$name = entrada_limpia($_POST["name"]);
@@ -119,10 +138,5 @@ if (comprueba_login() == 0)
 			echo "<form method='post' action='index.php?sec=gsetup&sec2=godmode/setup/links&form_add=1'>";
 			echo "<input type='submit' class='sub next' name='form_add' value='".$lang_label["add"]."'>";
 			echo "</form></table>";
-} // Fin bloque else
-} else  {
-			audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Link Management");
-			require ("general/noaccess.php");
 	}
-
 ?>
\ No newline at end of file
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 7a488ec1be..b53ee1da46 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -1,7 +1,7 @@
 <?php 
 
-// Pandora FMS - the Free Monitoring System
-// ========================================
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
 // Please see http://pandora.sourceforge.net for full contribution list
 
@@ -20,11 +20,11 @@
 require("include/config.php");
 
 if (comprueba_login()) {
-	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Database Management");
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Setup Management");
 	require ("general/noaccess.php");
 }
 if (! give_acl ($config['id_user'], 0, "PM") || ! dame_admin ($config['id_user'])) {
-	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Database Management");
+	audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", "Trying to access Setup Management");
 	require ("general/noaccess.php");
 }
 
diff --git a/pandora_console/images/pandora.ico b/pandora_console/images/pandora.ico
index 59773d34bf..978c24a591 100644
Binary files a/pandora_console/images/pandora.ico and b/pandora_console/images/pandora.ico differ
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 95708ea63b..e9a4f7daf2 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -128,6 +128,8 @@ AND tusuario_perfil.id_usuario = '%s' AND (tusuario_perfil.id_grupo = %d OR tusu
  * @param descripcion Long action description
  */
 function audit_db ($id, $ip, $accion, $descripcion){
+	$accion = safe_input($accion);
+	$descripcion = safe_input($descripcion);
 	$sql = sprintf ("INSERT INTO tsesion (ID_usuario, accion, fecha, IP_origen,descripcion, utimestamp) VALUES ('%s','%s',NOW(),'%s','%s',UNIX_TIMESTAMP(NOW()))",$id,$accion,$ip,$descripcion);
 	process_sql ($sql);
 }
@@ -553,7 +555,7 @@ function get_monitors_in_agent ($id_agent) {
 			FROM `tagente_modulo`, `ttipo_modulo`, `tagente`
 			WHERE `id_tipo_modulo` = `id_tipo`
 			AND `tagente`.`id_agente` = `tagente_modulo`.`id_agente`
-			AND `ttipo_modulo.nombre` LIKE '%%_proc'
+			AND `ttipo_modulo`.`nombre` LIKE '%%_proc'
 			AND `tagente`.`id_agente` = %d", $id_agent);
 	return get_db_all_rows_sql ($sql);
 }
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 1c8cd84ecf..eb2f6a8d99 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -1,6 +1,7 @@
 <?php
-// Pandora FMS - the Free Monitoring System
-// ========================================
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
 // Please see http://pandora.sourceforge.net for full contribution list
 
@@ -252,10 +253,10 @@ if (mysql_num_rows($result)){
 			}
 
 			// Show GROUP icon
-			echo '<td class="'.$tdcolor.'" align="center">
-			<img src="images/groups_small/'.show_icon_group($id_grupo).'.png" title="'.dame_grupo($id_grupo).'">';
-			echo '</td>';
+			echo '<td class="'.$tdcolor.'" align="center">';
 
+			echo "<a href='index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=$id_grupo'>";
+echo '<img class="bot" src="images/groups_small/'.show_icon_group($id_grupo).'.png" title="'. dame_grupo($id_grupo).'"></A></td>';
 
 			echo "<td class='$tdcolor'> ".
 			$numero_modulos." <b>/</b> ".$numero_monitor;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 9349e6d0de..33a680859a 100644
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -1,6 +1,7 @@
 <?php
-// Pandora FMS - the Free Monitoring System
-// ========================================
+
+// Pandora FMS - the Flexible Monitoring System
+// ============================================
 // Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
 // Please see http://pandora.sourceforge.net for full contribution list
 
@@ -101,8 +102,10 @@ echo '<tr><td class="datos"><b>'.$lang_label["interval"].'</b></td><td class="da
 echo '<tr><td class="datos2"><b>'.$lang_label["description"].'</b></td><td class="datos2" colspan=2>'.$comentarios.'</td></tr>';
 
 // Group
-echo '<tr><td class="datos"><b>'.$lang_label["group"].'</b></td><td class="datos" colspan="2">
-	<img class="bot" src="images/groups_small/'.show_icon_group($id_grupo).'.png" >&nbsp;&nbsp; '.dame_grupo($id_grupo).'</td></tr>';
+echo '<tr><td class="datos"><b>'.$lang_label["group"].'</b></td><td class="datos" colspan="2">';
+
+echo "<a href='index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id=$id_grupo'>";
+echo '<img class="bot" src="images/groups_small/'.show_icon_group($id_grupo).'.png" title="'. dame_grupo($id_grupo).'"></A></td></tr>';
 
 // Agent version
 echo '<tr><td class="datos2"><b>'.lang_string ("agentversion"). '</b>';
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 61393e8d87..98dfab45cf 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1,5 +1,5 @@
--- Pandora FMS - the Free Monitoring System
--- ========================================
+-- Pandora FMS - the Flexible Monitoring System
+-- ============================================
 -- Copyright (c) 2008 Artica Soluciones Tecnológicas, http://www.artica.es
 -- Please see http://pandora.sourceforge.net for full contribution list
 
@@ -695,20 +695,22 @@ CREATE TABLE `tserver_export` (
   `preffix` varchar(100) NOT NULL default '',
   `interval` int(5) unsigned NOT NULL default '300',
   `ip_server` varchar(100) NOT NULL default '',
-  `connect_mode` tinyint(2) NOT NULL default '0',
-  `id_export_server` int(5) unsigned NOT NULL default '0',
+  `connect_mode` enum ('tentacle', 'ssh', 'local') default 'local',
+  `id_export_server` int(10) unsigned default NULL,
+  `user` varchar(100) NOT NULL default '',
+  `pass` varchar(100) NOT NULL default '',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+-- id_export_server is real pandora fms export server process that manages this server
+-- id is the "destination" server to export
 
 CREATE TABLE `tserver_export_data` (
   `id` int(20) unsigned NOT NULL auto_increment,
   `id_export_server` int(10) unsigned default NULL,
-  `agent` varchar(100) NOT NULL default '',
-  `type` varchar(50) NOT NULL default '',
-  `module` varchar(100) NOT NULL default '',
-  `value` varchar(100) NOT NULL default '',
-  `timestamp` datetime NOT NULL default '0000-00-00 00:00:00',
+  `id_agent_module` mediumint(8) unsigned NOT NULL default '0',
+  `data` varchar(255) default NULL, 
+  `utimestamp` int(10) unsigned default '0'
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -720,7 +722,7 @@ CREATE TABLE `tplanned_downtime` (
   `end` INT NOT NULL ,
   `module_id` BIGINT( 14 ) NOT NULL ,
   PRIMARY KEY (  `id` ) ,
-  INDEX (  `start` ,  `end` ,  `module_id` ) ,
+  INDEX (  `start` ,  `end` ,  `module_id` ) 
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `tplanned_downtime_agents` (
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 9c88347128..17d6b7db70 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -268,82 +268,6 @@ INSERT INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `t
 INSERT INTO `tnetwork_component` VALUES (61,'GigabitEthernet1/0/1 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10101',2);
 INSERT INTO `tnetwork_component` VALUES (62,'GigabitEthernet1/0/2 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10102',2);
 INSERT INTO `tnetwork_component` VALUES (63,'GigabitEthernet1/0/3 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10103',2);
-INSERT INTO `tnetwork_component` VALUES (64,'GigabitEthernet1/0/4 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10104',2);
-INSERT INTO `tnetwork_component` VALUES (65,'GigabitEthernet1/0/5 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10105',2);
-INSERT INTO `tnetwork_component` VALUES (66,'GigabitEthernet1/0/6 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10106',2);
-INSERT INTO `tnetwork_component` VALUES (67,'GigabitEthernet1/0/7 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10107',2);
-INSERT INTO `tnetwork_component` VALUES (68,'GigabitEthernet1/0/8 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10108',2);
-INSERT INTO `tnetwork_component` VALUES (69,'GigabitEthernet1/0/9 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10109',2);
-INSERT INTO `tnetwork_component` VALUES (70,'GigabitEthernet1/0/10 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10110',2);
-INSERT INTO `tnetwork_component` VALUES (71,'GigabitEthernet1/0/11 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10111',2);
-INSERT INTO `tnetwork_component` VALUES (72,'GigabitEthernet1/0/12 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10112',2);
-INSERT INTO `tnetwork_component` VALUES (73,'GigabitEthernet1/0/13 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10113',2);
-INSERT INTO `tnetwork_component` VALUES (74,'GigabitEthernet1/0/14 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10114',2);
-INSERT INTO `tnetwork_component` VALUES (75,'GigabitEthernet1/0/15 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10115',2);
-INSERT INTO `tnetwork_component` VALUES (76,'GigabitEthernet1/0/16 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10116',2);
-INSERT INTO `tnetwork_component` VALUES (77,'GigabitEthernet1/0/17 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10117',2);
-INSERT INTO `tnetwork_component` VALUES (78,'GigabitEthernet1/0/18 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10118',2);
-INSERT INTO `tnetwork_component` VALUES (79,'GigabitEthernet1/0/19 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10119',2);
-INSERT INTO `tnetwork_component` VALUES (80,'GigabitEthernet1/0/20 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10120',2);
-INSERT INTO `tnetwork_component` VALUES (81,'GigabitEthernet1/0/21 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10121',2);
-INSERT INTO `tnetwork_component` VALUES (82,'GigabitEthernet1/0/22 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10122',2);
-INSERT INTO `tnetwork_component` VALUES (83,'GigabitEthernet1/0/23 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10123',2);
-INSERT INTO `tnetwork_component` VALUES (84,'GigabitEthernet1/0/24 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10124',2);
-INSERT INTO `tnetwork_component` VALUES (85,'GigabitEthernet1/0/25 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10125',2);
-INSERT INTO `tnetwork_component` VALUES (86,'GigabitEthernet1/0/26 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10126',2);
-INSERT INTO `tnetwork_component` VALUES (87,'GigabitEthernet1/0/27 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10127',2);
-INSERT INTO `tnetwork_component` VALUES (88,'GigabitEthernet1/0/28 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10128',2);
-INSERT INTO `tnetwork_component` VALUES (90,'GigabitEthernet2/0/1 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10601',2);
-INSERT INTO `tnetwork_component` VALUES (91,'GigabitEthernet2/0/2 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10602',2);
-INSERT INTO `tnetwork_component` VALUES (92,'GigabitEthernet2/0/3 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10603',2);
-INSERT INTO `tnetwork_component` VALUES (93,'GigabitEthernet2/0/4 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10604',2);
-INSERT INTO `tnetwork_component` VALUES (94,'GigabitEthernet2/0/5 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10605',2);
-INSERT INTO `tnetwork_component` VALUES (95,'GigabitEthernet2/0/6 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10606',2);
-INSERT INTO `tnetwork_component` VALUES (96,'GigabitEthernet2/0/7 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10607',2);
-INSERT INTO `tnetwork_component` VALUES (97,'GigabitEthernet2/0/8 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10608',2);
-INSERT INTO `tnetwork_component` VALUES (98,'GigabitEthernet2/0/9 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10609',2);
-INSERT INTO `tnetwork_component` VALUES (99,'GigabitEthernet2/0/10 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10610',2);
-INSERT INTO `tnetwork_component` VALUES (100,'GigabitEthernet2/0/11 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10611',2);
-INSERT INTO `tnetwork_component` VALUES (101,'GigabitEthernet2/0/12 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10612',2);
-INSERT INTO `tnetwork_component` VALUES (102,'GigabitEthernet2/0/13 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10613',2);
-INSERT INTO `tnetwork_component` VALUES (103,'GigabitEthernet2/0/14 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10614',2);
-INSERT INTO `tnetwork_component` VALUES (104,'GigabitEthernet2/0/15 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10615',2);
-INSERT INTO `tnetwork_component` VALUES (105,'GigabitEthernet2/0/16 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10616',2);
-INSERT INTO `tnetwork_component` VALUES (106,'GigabitEthernet2/0/17 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10617',2);
-INSERT INTO `tnetwork_component` VALUES (107,'GigabitEthernet2/0/18 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10618',2);
-INSERT INTO `tnetwork_component` VALUES (108,'GigabitEthernet2/0/19 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10619',2);
-INSERT INTO `tnetwork_component` VALUES (109,'GigabitEthernet2/0/20 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10620',2);
-INSERT INTO `tnetwork_component` VALUES (110,'GigabitEthernet2/0/21 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10621',2);
-INSERT INTO `tnetwork_component` VALUES (111,'GigabitEthernet2/0/22 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10622',2);
-INSERT INTO `tnetwork_component` VALUES (112,'GigabitEthernet2/0/23 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10623',2);
-INSERT INTO `tnetwork_component` VALUES (113,'GigabitEthernet2/0/24 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10624',2);
-INSERT INTO `tnetwork_component` VALUES (114,'GigabitEthernet2/0/25 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10625',2);
-INSERT INTO `tnetwork_component` VALUES (115,'GigabitEthernet2/0/26 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10626',2);
-INSERT INTO `tnetwork_component` VALUES (116,'GigabitEthernet2/0/27 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10627',2);
-INSERT INTO `tnetwork_component` VALUES (117,'GigabitEthernet2/0/28 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10628',2);
-INSERT INTO `tnetwork_component` VALUES (152,'GigabitEthernet1/0/35 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10135',2);
-INSERT INTO `tnetwork_component` VALUES (153,'GigabitEthernet1/0/36 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10136',2);
-INSERT INTO `tnetwork_component` VALUES (154,'GigabitEthernet1/0/37 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10137',2);
-INSERT INTO `tnetwork_component` VALUES (155,'GigabitEthernet1/0/38 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10138',2);
-INSERT INTO `tnetwork_component` VALUES (156,'GigabitEthernet1/0/39 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10139',2);
-INSERT INTO `tnetwork_component` VALUES (157,'GigabitEthernet1/0/40 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10140',2);
-INSERT INTO `tnetwork_component` VALUES (158,'GigabitEthernet1/0/41 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10141',2);
-INSERT INTO `tnetwork_component` VALUES (159,'GigabitEthernet1/0/42 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10142',2);
-INSERT INTO `tnetwork_component` VALUES (160,'GigabitEthernet1/0/43 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10143',2);
-INSERT INTO `tnetwork_component` VALUES (161,'GigabitEthernet1/0/44 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10144',2);
-INSERT INTO `tnetwork_component` VALUES (162,'GigabitEthernet1/0/45 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10145',2);
-INSERT INTO `tnetwork_component` VALUES (163,'GigabitEthernet1/0/46 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10146',2);
-INSERT INTO `tnetwork_component` VALUES (164,'GigabitEthernet1/0/47 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10147',2);
-INSERT INTO `tnetwork_component` VALUES (165,'GigabitEthernet1/0/48 Status','',2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10148',2);
-INSERT INTO `tnetwork_component` VALUES (170,'GigabitEthernet1/0/29 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10129',2);
-INSERT INTO `tnetwork_component` VALUES (171,'GigabitEthernet1/0/30 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10130',2);
-INSERT INTO `tnetwork_component` VALUES (172,'GigabitEthernet1/0/31 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10131',2);
-INSERT INTO `tnetwork_component` VALUES (173,'GigabitEthernet1/0/32 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10132',2);
-INSERT INTO `tnetwork_component` VALUES (174,'GigabitEthernet1/0/33 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10133',2);
-INSERT INTO `tnetwork_component` VALUES (175,'GigabitEthernet1/0/34 Status',NULL,2,18,0,0,180,0,'','','public','.1.3.6.1.2.1.2.2.1.8.10134',2);
-
-
-
 
 --
 -- Dumping data for table `tnetwork_component_group`