From 2fdfe5d5b5e56481661f61c1c6c52152d65b9d7b Mon Sep 17 00:00:00 2001 From: slerena Date: Thu, 21 Sep 2006 16:30:34 +0000 Subject: [PATCH] 2006-09-21 Sancho Lerena * pandoradb.sql: Altered tagente_datos field "datos" to have DOUBLE(18,2) instead of DOUBLE (12,2). * pandora_db1.1_to1.2.sql: Altered tagente_datos field "datos" to have DOUBLE(18,2) instead of DOUBLE (12,2). git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 5 + pandora_agents/linux/pandora_agent.sh | 26 +- pandora_console/ChangeLog | 8 + .../godmode/agentes/configurar_agente.php | 6 + pandora_console/pandoradb.sql | 4 +- pandora_console/pandoradb_1.1_to_1.2.sql | 2 +- pandora_doc/ChangeLog | 17 +- pandora_server/INSTALL | 7 - pandora_server/log/pandora_server.log | 164501 --------------- 9 files changed, 63 insertions(+), 164513 deletions(-) delete mode 100644 pandora_server/log/pandora_server.log diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 25c1103725..9ca3d8efe8 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,8 @@ +2006-09-20 Sancho Lerena + + * linux/pandora_agent.sh: Inserted code for detect Linux Distro, + and get versions (ported from babel agent code). + 2006-08-30 Sancho Lerena * pandora_agent/ChangeLog: Created and added to repository diff --git a/pandora_agents/linux/pandora_agent.sh b/pandora_agents/linux/pandora_agent.sh index 1e16364be1..eed5ed2580 100755 --- a/pandora_agents/linux/pandora_agent.sh +++ b/pandora_agents/linux/pandora_agent.sh @@ -8,6 +8,7 @@ # This code is licenced under GPL 2.0 licence. # ********************************************************************** AGENT_VERSION=1.2 +AGENT_BUILD=060920 IFS=$'\n' # Begin cycle for adquire primary config tokens @@ -87,8 +88,31 @@ done # MAIN Program loop begin +# Get Linux Distro type and version + +# SUSE +if [ -f "/etc/SuSE-release" ] +then + OS_VERSION=`cat /etc/SuSE-release | grep VERSION | cut -f 3 -d " "` + LINUX_DISTRO=SUSE +else + if [ -f "/etc/lsb-release" ] + then + OS_VERSION=`cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -f 2 -d "="` + LINUX_DISTRO=UBUNTU + else + if [ -f "/etc/debian_version" ] + then + OS_VERSION=`cat /etc/debian_version` + OS_VERSION="DEBIAN $OS_VERSION" + LINUX_DISTRO=DEBIAN + else + LINUX_DISTRO=GENERIC + OS_VERSION=`uname -r` + fi + fi +fi # OS Data -OS_VERSION=`uname -r` OS_NAME=`uname -s` # Hostname diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bb86fd4523..c61208a83a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2006-09-21 Sancho Lerena + + * pandoradb.sql: Altered tagente_datos field "datos" to have + DOUBLE(18,2) instead of DOUBLE (12,2). + + * pandora_db1.1_to1.2.sql: Altered tagente_datos field "datos" to + have DOUBLE(18,2) instead of DOUBLE (12,2). + 2006-09-16 Raul Mateos * Set all timestamp values in pandoradb.sql file to 0000-00-00 00:00:00 diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 3ffe49c2e4..48be7a9aed 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -500,11 +500,15 @@ if (give_acl($id_user, 0, "AW")==1) { // ========================================================= if (isset($_POST["oid"])){ snmp_set_quick_print(1); +echo "DEBUG snmpreadwalk call() $ip_target $snmp_community
"; if (! ($snmpwalk = snmprealwalk($ip_target, $snmp_community, ""))) echo "

".$lang_label["cannot_read_snmp"]."

"; else echo "

".$lang_label["ok_read_snmp"]."

"; +echo "DEBUG $snmpwalk
"; } + + // ========================================================= // MODULE INSERT // ========================================================= @@ -917,6 +921,8 @@ else {