El 08/09/10 10:23, Esben Laursen escribi=F3:

Good news Esben, this has been accepted and we're working on that next
week, even with a few new improvements :-)

-- =

Un saludo,

Sancho Lerena
Director T=E9cnico
http://www.artica.es
c/ Silva 2, 1. 28013 Madrid
Tel. +34-91-559-7222
Mov. +34-627-934-649

Este mensaje se dirige exclusivamente a su destinatario y puede contener
informaci=F3n privilegiada o confidencial. Si no es vd. el destinatario
indicado, queda notificado de que la lectura, utilizaci=F3n, divulgaci=F3n
y/o copia sin autorizaci=F3n est=E1 prohibida en virtud de la legislaci=F3n
vigente. Si ha recibido este mensaje por error, le rogamos que nos lo
comunique inmediatamente por esta misma v=EDa y proceda a su destrucci=F3n.

This message is intended exclusively for its addressee and may contain
information that is CONFIDENTIAL and protected by a professional
privilege or whose disclosure is prohibited by law.
If you are not the intended recipient you are hereby notified that any
read, dissemination, copy or disclosure of this communication is
strictly prohibited by law. If this message has been received in error,
please immediately notify us via e-mail and delete it.

---------------------------------------------------------------------------=
---
Automate Storage Tiering Simply
Optimize IT performance and efficiency through flexible, powerful, =

automated storage tiering capabilities. View this brief to learn how
you can reduce costs and improve performance. =

http://p.sf.net/sfu/dell-sfdev2dev
_______________________________________________
Pandora-develop mailing list
Pandora-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-develop

I assume you've configured the pop3 server correctly.

Could be for the POP account you're using. I've tested only with a few account types and probably fails due the message parsing method (a bit ugly and problematic) :-S

I'll test with another account and say you something in a few days. Thanks for reporting

Revision: 3237
http://pandora.svn.sourceforge.net/pandora/?rev=3237&view=rev
Author:   ramonn
Date:     2010-09-10 09:42:32 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
2010-09-10  Ramon Novoa  

* lib/PandoraFMS/NetworkServer.pm,
lib/PandoraFMS/Core.pm: Fixed some prototypes that led to warnings
in recent versions of PERL. This fixes bug #3061906.

Modified Paths:
--------------
trunk/pandora_server/ChangeLog
trunk/pandora_server/lib/PandoraFMS/Core.pm
trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog   2010-09-09 18:14:05 UTC (rev 3236)
+++ trunk/pandora_server/ChangeLog   2010-09-10 09:42:32 UTC (rev 3237)
@@ -1,3 +1,9 @@
+2010-09-10  Ramon Novoa  
+
+   * lib/PandoraFMS/NetworkServer.pm,
+     lib/PandoraFMS/Core.pm: Fixed some prototypes that led to warnings
+     in recent versions of PERL. This fixes bug #3061906.
+
2010-09-09  Ramon Novoa  

* lib/PandoraFMS/Core.pm: Fixed alert behaviour when time_from is

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm   2010-09-09 18:14:05 UTC (rev 3236)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm   2010-09-10 09:42:32 UTC (rev 3237)
@@ -1571,7 +1571,7 @@
# Validate event.
# This validates all events pending to ACK for the same id_agent_module
##########################################################################
-sub pandora_validate_event (%$$) {
+sub pandora_validate_event ($$$) {
my ($pa_config, $id_agentmodule, $dbh) = @_;
if (!defined($id_agentmodule)){
return;

Modified: trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm   2010-09-09 18:14:05 UTC (rev 3236)
+++ trunk/pandora_server/lib/PandoraFMS/NetworkServer.pm   2010-09-10 09:42:32 UTC (rev 3237)
@@ -140,7 +140,7 @@
#                   tcp_rcv, id_tipo_module, dbh)
# Makes a call to TCP modules to get a value.
##########################################################################
-sub pandora_query_tcp (%$$$$$$$) {
+sub pandora_query_tcp ($$$$$$$$) {
my $pa_config = $_[0];
my $tcp_port = $_[1];
my $ip_target = $_[2];
@@ -247,7 +247,7 @@
# Makes a call to SNMP modules to get a value,
##########################################################################

-sub pandora_query_snmp (%$) {
+sub pandora_query_snmp ($$) {
my $pa_config = $_[0];
my $module = $_[1];



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Automate Storage Tiering Simply
Optimize IT performance and efficiency through flexible, powerful,
automated storage tiering capabilities. View this brief to learn how
you can reduce costs and improve performance.
http://p.sf.net/sfu/dell-sfdev2dev
_______________________________________________
Pandora-commits mailing list
Pandora-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-commits

El 09/09/10 07:28, Manuel Arostegui Ramirez escribi=F3:


This is too much specific, for things like that is the SQL manager:

UPDATE tagente_modulo SET ip_target =3D "10.0.0.1" WHERE id_target =3D "10.=
0.0.2";

Woah :-)

-- =

Un saludo,

Sancho Lerena
Director T=E9cnico
http://www.artica.es
c/ Silva 2, 1. 28013 Madrid
Tel. +34-91-559-7222
Mov. +34-627-934-649

Este mensaje se dirige exclusivamente a su destinatario y puede contener
informaci=F3n privilegiada o confidencial. Si no es vd. el destinatario
indicado, queda notificado de que la lectura, utilizaci=F3n, divulgaci=F3n
y/o copia sin autorizaci=F3n est=E1 prohibida en virtud de la legislaci=F3n
vigente. Si ha recibido este mensaje por error, le rogamos que nos lo
comunique inmediatamente por esta misma v=EDa y proceda a su destrucci=F3n.

This message is intended exclusively for its addressee and may contain
information that is CONFIDENTIAL and protected by a professional
privilege or whose disclosure is prohibited by law.
If you are not the intended recipient you are hereby notified that any
read, dissemination, copy or disclosure of this communication is
strictly prohibited by law. If this message has been received in error,
please immediately notify us via e-mail and delete it.

---------------------------------------------------------------------------=
---
Automate Storage Tiering Simply
Optimize IT performance and efficiency through flexible, powerful, =

automated storage tiering capabilities. View this brief to learn how
you can reduce costs and improve performance. =

http://p.sf.net/sfu/dell-sfdev2dev
_______________________________________________
Pandora-develop mailing list
Pandora-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-develop

Revision: 3236
http://pandora.svn.sourceforge.net/pandora/?rev=3236&view=rev
Author:   ramonn
Date:     2010-09-09 18:14:05 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
2010-09-09  Ramon Novoa  

* lib/PandoraFMS/Core.pm: Fixed alert behaviour when time_from is
greater than time_to. Fixes bug #3048043.

Modified Paths:
--------------
trunk/pandora_server/ChangeLog
trunk/pandora_server/lib/PandoraFMS/Core.pm

Modified: trunk/pandora_server/ChangeLog
===================================================================
--- trunk/pandora_server/ChangeLog   2010-09-09 14:07:21 UTC (rev 3235)
+++ trunk/pandora_server/ChangeLog   2010-09-09 18:14:05 UTC (rev 3236)
@@ -1,3 +1,8 @@
+2010-09-09  Ramon Novoa  
+
+   * lib/PandoraFMS/Core.pm: Fixed alert behaviour when time_from is
+     greater than time_to. Fixes bug #3048043.
+
2010-09-08  Sancho Lerena

* util/compaq_chassis_trap_manager.pl,

Modified: trunk/pandora_server/lib/PandoraFMS/Core.pm
===================================================================
--- trunk/pandora_server/lib/PandoraFMS/Core.pm   2010-09-09 14:07:21 UTC (rev 3235)
+++ trunk/pandora_server/lib/PandoraFMS/Core.pm   2010-09-09 18:14:05 UTC (rev 3236)
@@ -228,8 +228,13 @@

# Check time slot
my $time = sprintf ("%.2d:%.2d:%.2d", $hour, $min, $sec);
-   return 1 if (($alert->{'time_to'} ne $alert->{'time_from'}) &&
-      (($time ge $alert->{'time_to'}) || ($time le $alert->{'time_from'})));
+   if (($alert->{'time_from'} ne $alert->{'time_to'})) {
+      if ($alert->{'time_from'} lt $alert->{'time_to'}) {
+         return 1 if (($time le $alert->{'time_from'}) || ($time ge $alert->{'time_to'}));
+      } else {
+         return 1 if (($time le $alert->{'time_from'}) && ($time ge $alert->{'time_to'}));
+      }
+   }

# Check time threshold
my $limit_utimestamp = $alert->{'last_reference'} + $alert->{'time_threshold'};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Pandora-commits mailing list
Pandora-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-commits

Revision: 3235
http://pandora.svn.sourceforge.net/pandora/?rev=3235&view=rev
Author:   mdtrooper
Date:     2010-09-09 14:07:21 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
2010-09-09  Miguel de Dios  

* godmode/setup/os.list.php, godmode/setup/os.builder.php,
godmode/setup/os.php: changed the source code and added "os.builder.php" and
"os.list.php" for to change the management page for to be a "tab page".

Modified Paths:
--------------
trunk/pandora_console/ChangeLog
trunk/pandora_console/godmode/setup/os.php

Added Paths:
-----------
trunk/pandora_console/godmode/setup/os.builder.php
trunk/pandora_console/godmode/setup/os.list.php

Modified: trunk/pandora_console/ChangeLog
===================================================================
--- trunk/pandora_console/ChangeLog   2010-09-09 12:19:11 UTC (rev 3234)
+++ trunk/pandora_console/ChangeLog   2010-09-09 14:07:21 UTC (rev 3235)
@@ -1,5 +1,11 @@
2010-09-09  Miguel de Dios  

+   * godmode/setup/os.list.php, godmode/setup/os.builder.php,
+   godmode/setup/os.php: changed the source code and added "os.builder.php" and
+   "os.list.php" for to change the management page for to be a "tab page".
+
+2010-09-09  Miguel de Dios  
+
* include/functions_networkmap.php: cleaned source code.

* include/functions_ui.php: in function "print_os_icon" change the

Added: trunk/pandora_console/godmode/setup/os.builder.php
===================================================================
--- trunk/pandora_console/godmode/setup/os.builder.php                           (rev 0)
+++ trunk/pandora_console/godmode/setup/os.builder.php   2010-09-09 14:07:21 UTC (rev 3235)
@@ -0,0 +1,79 @@
++
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org 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.
+
+// Load global vars
+global $config;
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+   audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access Setup Management");
+   require ("general/noaccess.php");
+   return;
+}
+
+echo '

';
+$table = null;
+$table->width = '50%';
+
+$table->style[0] = 'font-weight: bolder; vertical-align: top;';
+
+$table->data[0][0] = __('Name:');
+$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
+$table->data[1][0] = __('Description');
+$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
+$icons = get_list_os_icons_dir();
+$table->data[2][0] = __('Icon');
+$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
+$table->data[2][1] .= ' ' . print_os_icon($idOS, false, true) . '';
+
+echo '';
+print_table($table);
+
+print_input_hidden('id_os', $idOS);
+print_input_hidden ('action', $actionHidden);
+
+echo '

';
+print_submit_button ($textButton, 'update_button', false, $classButton);
+echo '

';
+echo '

';
+
+function get_list_os_icons_dir() {
+   global $config;
+
+   $return = array();
+
+   $items = scandir($config['homedir'] . '/images/os_icons');
+
+   foreach ($items as $item) {
+      if (strstr($item, '_small.png') || strstr($item, '_small.gif')
+         || strstr($item, '_small.jpg')) {
+         continue;
+      }
+      if (strstr($item, '.png') || strstr($item, '.gif')
+         || strstr($item, '.jpg')) {
+         $return[$item] = $item;
+      }
+   }
+
+   return $return;
+}
+?>
+
\ No newline at end of file

Added: trunk/pandora_console/godmode/setup/os.list.php
===================================================================
--- trunk/pandora_console/godmode/setup/os.list.php                           (rev 0)
+++ trunk/pandora_console/godmode/setup/os.list.php   2010-09-09 14:07:21 UTC (rev 3235)
@@ -0,0 +1,59 @@
++
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org 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.
+
+// Load global vars
+global $config;
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+   audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access Setup Management");
+   require ("general/noaccess.php");
+   return;
+}
+
+$table = null;
+
+$table->width = '80%';
+$table->head[0] = '';
+$table->head[1] = __('Name');
+$table->head[2] = __('Description');
+$table->head[3] = '';
+$table->align[0] = 'center';
+$table->align[3] = 'center';
+$table->size[0] = '20px';
+$table->size[3] = '20px';
+
+$osList = get_db_all_rows_in_table('tconfig_os');
+
+$table->data = array();
+foreach ($osList as $os) {
+   $data = array();
+   $data[] = print_os_icon($os['id_os'], false, true);
+   $data[] = '' . safe_output($os['name']) . '';
+   $data[] = printTruncateText(safe_output($os['description']), 25, true, true);
+   if ($os['id_os'] > 13) {
+      $data[] = '';
+   }
+   else {
+      //The original icons of pandora don't delete.
+      $data[] = '';
+   }
+
+   $table->data[] = $data;
+}
+
+print_table($table);
+?>
\ No newline at end of file

Modified: trunk/pandora_console/godmode/setup/os.php
===================================================================
--- trunk/pandora_console/godmode/setup/os.php   2010-09-09 12:19:11 UTC (rev 3234)
+++ trunk/pandora_console/godmode/setup/os.php   2010-09-09 14:07:21 UTC (rev 3235)
@@ -26,6 +26,7 @@

$action = get_parameter('action', 'new');
$idOS = get_parameter('id_os', 0);
+$tab = get_parameter('tab', 'builder');

if ($idOS) {
$os = get_db_row_filter('tconfig_os', array('id_os' => $idOS));
@@ -39,8 +40,7 @@
$icon = get_parameter('icon',0);
}

-// Header
-print_page_header(__('Edit OS'), "", false, "", true);
+$message = '';

switch ($action) {
default:
@@ -65,17 +65,15 @@
$resultOrId = process_sql_insert('tconfig_os', $values);

if ($resultOrId === false) {
-         print_error_message(__('Fail to create OS'));
+         $message = print_error_message(__('Fail to create OS'), '', true);
+         $tab = 'builder';
$actionHidden = 'save';
$textButton = __('Create');
$classButton = 'class="sub next"';
}
else {
-         $idOs = $resultOrId;
-         print_success_message(__('Success to create OS'));
-         $actionHidden = 'update';
-         $textButton = __('Update');
-         $classButton = 'class="sub upd"';
+         $message = print_success_message(__('Success to create OS'), '', true);
+         $tab = 'list';
}
break;
case 'update':
@@ -92,7 +90,10 @@
}
$result = process_sql_update('tconfig_os', $values, array('id_os' => $idOS));

-      print_result_message($result, __('Success to update OS'), __('Error to update OS'));
+      $message = print_result_message($result, __('Success to update OS'), __('Error to update OS'), '', true);
+      if ($result !== false) {
+         $tab = 'list';
+      }

$actionHidden = 'update';
$textButton = __('Update');
@@ -104,125 +105,42 @@
$count = $count[0]['count'];

if ($count > 0) {
-         print_error_message(__('There are agents with this OS.'));
+         $message = print_error_message(__('There are agents with this OS.'), '', true);
}
else {
$result = (bool)process_sql_delete('tconfig_os', array('id_os' => $idOS));

-         print_result_message($result, __('Success to delete'), __('Error to delete'));
+         $message = print_result_message($result, __('Success to delete'), __('Error to delete'), '', true);
}
-
-      $idOS = 0;
-      $name = get_parameter('name', '');
-      $description = get_parameter('description', '');
-      $icon = get_parameter('icon',0);
-
-      $actionHidden = 'save';
-      $textButton = __('Create');
-      $classButton = 'class="sub next"';
break;
}

-$table = null;
+$buttons = array(
+   'list' => array(
+      'active' => false,
+      'text' => '' .
+         print_image ("images/god6.png", true, array ("title" => __('List OS'))) .''),
+   'builder' => array(
+      'active' => false,
+      'text' => '' .
+         print_image ("images/config.png", true, array ("title" => __('Builder OS'))) .''));

-$table->width = '80%';
-$table->head[0] = '';
-$table->head[1] = __('Name');
-$table->head[2] = __('Description');
-$table->head[3] = '';
-$table->align[0] = 'center';
-$table->align[3] = 'center';
-$table->size[0] = '20px';
-$table->size[3] = '20px';
+
+$buttons[$tab]['active'] = true;

-$osList = get_db_all_rows_in_table('tconfig_os');
+// Header
+print_page_header(__('Edit OS'), "", false, "", true, $buttons);

-$table->data = array();
-foreach ($osList as $os) {
-   $data = array();
-   $data[] = print_os_icon($os['id_os'], false, true);
-   $data[] = '' . safe_output($os['name']) . '';
-   $data[] = printTruncateText(safe_output($os['description']), 25, true, true);
-   if ($os['id_os'] > 13) {
-      $data[] = '';
-   }
-   else {
-      //The original icons of pandora don't delete.
-      $data[] = '';
-   }
-
-   $table->data[] = $data;
-}
+echo $message;

-$htmlListOS = print_table($table, true);
-
-toggle($htmlListOS,__('List of OS'), __('Toggle'));
-
-echo '

';
-unset($table->head);
-unset($table->align);
-unset($table->size);
-unset($table->data);
-
-$table->width = '50%';
-
-$table->style[0] = 'font-weight: bolder; vertical-align: top;';
-
-$table->data[0][0] = __('Name:');
-$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
-$table->data[1][0] = __('Description');
-$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
-$icons = get_list_os_icons_dir();
-$table->data[2][0] = __('Icon');
-$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
-$table->data[2][1] .= ' ' . print_os_icon($idOS, false, true) . '';
-
-
-echo '

';
-print_button(__('New OS'), 'new_button', false, 'new_os();', 'class="sub add"');
-echo '

';
-echo '';
-print_table($table);
-
-print_input_hidden('id_os', $idOS);
-print_input_hidden ('action', $actionHidden);
-
-echo '

';
-print_submit_button ($textButton, 'update_button', false, $classButton);
-echo '

';
-echo '

';
-
-function get_list_os_icons_dir() {
-   global $config;
-
-   $return = array();
-
-   $items = scandir($config['homedir'] . '/images/os_icons');
-
-   foreach ($items as $item) {
-      if (strstr($item, '_small.png') || strstr($item, '_small.gif')
-         || strstr($item, '_small.jpg')) {
-         continue;
-      }
-      if (strstr($item, '.png') || strstr($item, '.gif')
-         || strstr($item, '.jpg')) {
-         $return[$item] = $item;
-      }
-   }
-
-   return $return;
+switch ($tab) {
+   case 'list':
+      require_once('godmode/setup/os.list.php');
+      return;
+      break;
+   case 'builder':
+      require_once('godmode/setup/os.builder.php');
+      return;
+      break;
}
-?>
-
\ No newline at end of file
+?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Pandora-commits mailing list
Pandora-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-commits

Revision: 3234
http://pandora.svn.sourceforge.net/pandora/?rev=3234&view=rev
Author:   mdtrooper
Date:     2010-09-09 12:19:11 +0000 (Thu, 09 Sep 2010)

Log Message:
-----------
2010-09-09  Miguel de Dios  

* include/functions_networkmap.php: cleaned source code.

* include/functions_ui.php: in function "print_os_icon" change the
directory to search os icon because it change for new feature.

* images/os_icons, images/os_icons/*: copied the icons image files into this
dir for to use in new feature.

* godmode/menu.php: added new item in submenu "Setup" for the management
the OS.

* godmode/setup/os.php: added the page to management the list OS of agents.

Pending task: #3057663

Modified Paths:
--------------
trunk/pandora_console/ChangeLog
trunk/pandora_console/godmode/menu.php
trunk/pandora_console/include/functions_networkmap.php
trunk/pandora_console/include/functions_ui.php

Added Paths:
-----------
trunk/pandora_console/godmode/setup/os.php
trunk/pandora_console/images/os_icons/
trunk/pandora_console/images/os_icons/network.png
trunk/pandora_console/images/os_icons/network_small.png
trunk/pandora_console/images/os_icons/so_aix.png
trunk/pandora_console/images/os_icons/so_aix_small.png
trunk/pandora_console/images/os_icons/so_bsd.png
trunk/pandora_console/images/os_icons/so_bsd_small.png
trunk/pandora_console/images/os_icons/so_cisco.png
trunk/pandora_console/images/os_icons/so_cisco_small.png
trunk/pandora_console/images/os_icons/so_hpux.png
trunk/pandora_console/images/os_icons/so_hpux_small.png
trunk/pandora_console/images/os_icons/so_linux.png
trunk/pandora_console/images/os_icons/so_linux_small.png
trunk/pandora_console/images/os_icons/so_mac.png
trunk/pandora_console/images/os_icons/so_mac_small.png
trunk/pandora_console/images/os_icons/so_other.png
trunk/pandora_console/images/os_icons/so_other_small.png
trunk/pandora_console/images/os_icons/so_solaris.png
trunk/pandora_console/images/os_icons/so_solaris_small.png
trunk/pandora_console/images/os_icons/so_win.png
trunk/pandora_console/images/os_icons/so_win_small.png

Modified: trunk/pandora_console/ChangeLog
===================================================================
--- trunk/pandora_console/ChangeLog   2010-09-09 05:16:36 UTC (rev 3233)
+++ trunk/pandora_console/ChangeLog   2010-09-09 12:19:11 UTC (rev 3234)
@@ -1,3 +1,20 @@
+2010-09-09  Miguel de Dios  
+
+   * include/functions_networkmap.php: cleaned source code.
+
+   * include/functions_ui.php: in function "print_os_icon" change the
+   directory to search os icon because it change for new feature.
+
+   * images/os_icons, images/os_icons/*: copied the icons image files into this
+   dir for to use in new feature.
+
+   * godmode/menu.php: added new item in submenu "Setup" for the management
+   the OS.
+
+   * godmode/setup/os.php: added the page to management the list OS of agents.
+
+   Pending task: #3057663
+
2010-09-09  Sancho Lerena  

* fgraph.php: Graph "Modules per agent" was not working properly

Modified: trunk/pandora_console/godmode/menu.php
===================================================================
--- trunk/pandora_console/godmode/menu.php   2010-09-09 05:16:36 UTC (rev 3233)
+++ trunk/pandora_console/godmode/menu.php   2010-09-09 12:19:11 UTC (rev 3234)
@@ -207,6 +207,7 @@
$sub["godmode/setup/gis"]["text"] = __('Map conections GIS');
$sub["godmode/setup/links"]["text"] = __('Links');
$sub["godmode/setup/news"]["text"] = __('Site news');
+   $sub["godmode/setup/os"]["text"] = __('Edit OS');
enterprise_hook ('historydb_submenu');
enterprise_hook ('enterprise_acl_submenu');


Added: trunk/pandora_console/godmode/setup/os.php
===================================================================
--- trunk/pandora_console/godmode/setup/os.php                           (rev 0)
+++ trunk/pandora_console/godmode/setup/os.php   2010-09-09 12:19:11 UTC (rev 3234)
@@ -0,0 +1,228 @@
++
+// Pandora FMS - http://pandorafms.com
+// ==================================================
+// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
+// Please see http://pandorafms.org 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.
+
+// Load global vars
+global $config;
+
+check_login ();
+
+if (! give_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
+   audit_db ($config['id_user'], $_SERVER['REMOTE_ADDR'], "ACL Violation", "Trying to access Setup Management");
+   require ("general/noaccess.php");
+   return;
+}
+
+$action = get_parameter('action', 'new');
+$idOS = get_parameter('id_os', 0);
+
+if ($idOS) {
+   $os = get_db_row_filter('tconfig_os', array('id_os' => $idOS));
+   $name = $os['name'];
+   $description = $os['description'];
+   $icon = $os['icon_name'];
+}
+else {
+   $name = get_parameter('name', '');
+   $description = get_parameter('description', '');
+   $icon = get_parameter('icon',0);
+}
+
+// Header
+print_page_header(__('Edit OS'), "", false, "", true);
+
+switch ($action) {
+   default:
+   case 'new':
+      $actionHidden = 'save';
+      $textButton = __('Create');
+      $classButton = 'class="sub next"';
+      break;
+   case 'edit':
+      $actionHidden = 'update';
+      $textButton = __('Update');
+      $classButton = 'class="sub upd"';
+      break;
+   case 'save':
+      $values = array();
+      $values['name'] = $name;
+      $values['description'] = $description;
+
+      if (($icon !== 0) && ($icon != '')) {
+         $values['icon_name'] = $icon;
+      }
+      $resultOrId = process_sql_insert('tconfig_os', $values);
+
+      if ($resultOrId === false) {
+         print_error_message(__('Fail to create OS'));
+         $actionHidden = 'save';
+         $textButton = __('Create');
+         $classButton = 'class="sub next"';
+      }
+      else {
+         $idOs = $resultOrId;
+         print_success_message(__('Success to create OS'));
+         $actionHidden = 'update';
+         $textButton = __('Update');
+         $classButton = 'class="sub upd"';
+      }
+      break;
+   case 'update':
+      $name = get_parameter('name', '');
+      $description = get_parameter('description', '');
+      $icon = get_parameter('icon',0);
+
+      $values = array();
+      $values['name'] = $name;
+      $values['description'] = $description;
+
+      if (($icon !== 0) && ($icon != '')) {
+         $values['icon_name'] = $icon;
+      }
+      $result = process_sql_update('tconfig_os', $values, array('id_os' => $idOS));
+
+      print_result_message($result, __('Success to update OS'), __('Error to update OS'));
+
+      $actionHidden = 'update';
+      $textButton = __('Update');
+      $classButton = 'class="sub upd"';
+      break;
+   case 'delete':
+      $sql = 'SELECT COUNT(id_os) AS count FROM tagente WHERE id_os = ' . $idOS;
+      $count = get_db_all_rows_sql($sql);
+      $count = $count[0]['count'];
+
+      if ($count > 0) {
+         print_error_message(__('There are agents with this OS.'));
+      }
+      else {
+         $result = (bool)process_sql_delete('tconfig_os', array('id_os' => $idOS));
+
+         print_result_message($result, __('Success to delete'), __('Error to delete'));
+      }
+
+      $idOS = 0;
+      $name = get_parameter('name', '');
+      $description = get_parameter('description', '');
+      $icon = get_parameter('icon',0);
+
+      $actionHidden = 'save';
+      $textButton = __('Create');
+      $classButton = 'class="sub next"';
+      break;
+}
+
+$table = null;
+
+$table->width = '80%';
+$table->head[0] = '';
+$table->head[1] = __('Name');
+$table->head[2] = __('Description');
+$table->head[3] = '';
+$table->align[0] = 'center';
+$table->align[3] = 'center';
+$table->size[0] = '20px';
+$table->size[3] = '20px';
+
+$osList = get_db_all_rows_in_table('tconfig_os');
+
+$table->data = array();
+foreach ($osList as $os) {
+   $data = array();
+   $data[] = print_os_icon($os['id_os'], false, true);
+   $data[] = '' . safe_output($os['name']) . '';
+   $data[] = printTruncateText(safe_output($os['description']), 25, true, true);
+   if ($os['id_os'] > 13) {
+      $data[] = '';
+   }
+   else {
+      //The original icons of pandora don't delete.
+      $data[] = '';
+   }
+
+   $table->data[] = $data;
+}
+
+$htmlListOS = print_table($table, true);
+
+toggle($htmlListOS,__('List of OS'), __('Toggle'));
+
+echo '

';
+unset($table->head);
+unset($table->align);
+unset($table->size);
+unset($table->data);
+
+$table->width = '50%';
+
+$table->style[0] = 'font-weight: bolder; vertical-align: top;';
+
+$table->data[0][0] = __('Name:');
+$table->data[0][1] = print_input_text('name', $name, __('Name'), 20, 30, true);
+$table->data[1][0] = __('Description');
+$table->data[1][1] = print_textarea('description', 5, 10, $description, '', true);
+$icons = get_list_os_icons_dir();
+$table->data[2][0] = __('Icon');
+$table->data[2][1] = print_select($icons, 'icon',  $icon, 'show_icon_OS();', __('None'), 0, true);
+$table->data[2][1] .= ' ' . print_os_icon($idOS, false, true) . '';
+
+
+echo '

';
+print_button(__('New OS'), 'new_button', false, 'new_os();', 'class="sub add"');
+echo '

';
+echo '';
+print_table($table);
+
+print_input_hidden('id_os', $idOS);
+print_input_hidden ('action', $actionHidden);
+
+echo '

';
+print_submit_button ($textButton, 'update_button', false, $classButton);
+echo '

';
+echo '

';
+
+function get_list_os_icons_dir() {
+   global $config;
+
+   $return = array();
+
+   $items = scandir($config['homedir'] . '/images/os_icons');
+
+   foreach ($items as $item) {
+      if (strstr($item, '_small.png') || strstr($item, '_small.gif')
+         || strstr($item, '_small.jpg')) {
+         continue;
+      }
+      if (strstr($item, '.png') || strstr($item, '.gif')
+         || strstr($item, '.jpg')) {
+         $return[$item] = $item;
+      }
+   }
+
+   return $return;
+}
+?>
+
\ No newline at end of file

Added: trunk/pandora_console/images/os_icons/network.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/network.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/network_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/network_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_aix.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_aix.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_aix_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_aix_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_bsd.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_bsd.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_bsd_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_bsd_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_cisco.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_cisco.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_cisco_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_cisco_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_hpux.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_hpux.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_hpux_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_hpux_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_linux.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_linux.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_linux_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_linux_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_mac.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_mac.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_mac_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_mac_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_other.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_other.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_other_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_other_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_solaris.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_solaris.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_solaris_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_solaris_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_win.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_win.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Added: trunk/pandora_console/images/os_icons/so_win_small.png
===================================================================
(Binary files differ)


Property changes on: trunk/pandora_console/images/os_icons/so_win_small.png
______________________________________________________ _____________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream

Modified: trunk/pandora_console/include/functions_networkmap.php
===================================================================
--- trunk/pandora_console/include/functions_networkmap.php   2010-09-09 05:16:36 UTC (rev 3233)
+++ trunk/pandora_console/include/functions_networkmap.php   2010-09-09 12:19:11 UTC (rev 3234)
@@ -319,7 +319,7 @@
if ($simple == 0){
// Set node icon
if (file_exists ('images/groups_small/'.$icon.'.png')) {
-         $img_node = '';
+         $img_node = '';
} else {
$img_node = '-';
}

Modified: trunk/pandora_console/include/functions_ui.php
===================================================================
--- trunk/pandora_console/include/functions_ui.php   2010-09-09 05:16:36 UTC (rev 3233)
+++ trunk/pandora_console/include/functions_ui.php   2010-09-09 12:19:11 UTC (rev 3234)
@@ -276,7 +276,7 @@
return "-";
}

-   $output = '';
+   $output = '';

if ($name === true) {
$output .= ' - '.$os_name;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Pandora-commits mailing list
Pandora-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/pandora-commits

OK!
Ya lo tengo funcionando.
En mi caso usando module_exec <ruta script> es suficiente.

Hi

When I executed /sbin/ifconfig eth0 |grep "bytes:" |awk {'print $2'} |tr -d "bytes:"
I got a number.
But I have the same problem with other custom module. For example:

module_begin
module_name Notepad
module_description Monitor notepad process
module_proc notepad.exe
module_type generic_proc
module_async yes
module_name

I configured this module on client side pandora_agent.conf and also on server pandora_agent.conf. But I dont see it on web console.
How can I get any custom module (configured on client) in web console?


Thanks in advance

Ivan