diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf index 9e90282e7d..5c4b8d90d8 100644 --- a/pandora_agents/pc/FreeBSD/pandora_agent.conf +++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf @@ -207,6 +207,6 @@ module_end module_plugin grep_log /var/log/auth.log Syslog sshd -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf index 94491a8855..c4ae8e3a37 100644 --- a/pandora_agents/pc/Linux/pandora_agent.conf +++ b/pandora_agents/pc/Linux/pandora_agent.conf @@ -269,7 +269,7 @@ module_plugin grep_log /var/log/syslog Syslog ssh #module_description Used memory in KB postprocessed to be in MB #module_end -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users process ip route diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index bc7dc2b2c0..fc91b88018 100644 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -164,5 +164,5 @@ module_end module_plugin grep_log /var/log/syslog Syslog ssh -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 7bf2d86d38..0794549fa4 100644 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -379,6 +379,6 @@ module_end #module_plugin grep_log /var/log/syslog Syslog ssh -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index 587157ebc7..21ab70feaf 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -272,7 +272,7 @@ module_plugin pandora_df_free module_plugin grep_log /var/log/auth.log Syslog sshd -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route # Log collection modules. Only for enterprise version, this will collect log files for forensic analysis. diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 48dcd5eae0..cd3e430712 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -269,7 +269,7 @@ module_plugin pandora_netusage # Service autodiscovery plugin module_plugin autodiscover --default -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. #module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route # Log collection modules. Only for enterprise version, this will collect log files for forensic analysis. diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index 7947d9d2e3..d3cf44f62a 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -232,6 +232,6 @@ module_end module_plugin grep_log /var/log/auth.log Syslog sshd -# Plugin for inventory on the agent (Only Enterprise) +# Plugin for invenotry on the agent. # module_plugin inventory 1 cpu ram video nic hd cdrom software diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt index 9f37940896..b129e30635 100644 --- a/pandora_console/extras/delete_files/delete_files.txt +++ b/pandora_console/extras/delete_files/delete_files.txt @@ -1685,3 +1685,10 @@ enterprise/operation/agentes/manage_transmap.php enterprise/operation/agentes/manage_transmap_creation.php enterprise/operation/agentes/manage_transmap_creation_phases_data.php enterprise/operation/agentes/transactional_map.php +enterprise/godmode/agentes/inventory_manager.php +enterprise/operation/agentes/agent_inventory.php +enterprise/godmode/modules/manage_inventory_modules.php +enterprise/godmode/modules/manage_inventory_modules_form.php +enterprise/operation/inventory/inventory.php + + diff --git a/pandora_console/godmode/agentes/inventory_manager.php b/pandora_console/godmode/agentes/inventory_manager.php index 09336ec88b..b8d8014545 100644 --- a/pandora_console/godmode/agentes/inventory_manager.php +++ b/pandora_console/godmode/agentes/inventory_manager.php @@ -211,6 +211,7 @@ $result = db_process_sql($sql); if (db_get_num_rows($sql) == 0) { echo ' '; } else { + $table = new stdClass(); $table->width = '100%'; $table->class = 'databox filters'; $table->data = []; diff --git a/pandora_console/godmode/modules/manage_inventory_modules.php b/pandora_console/godmode/modules/manage_inventory_modules.php index 0eb4807beb..cc358ccc67 100644 --- a/pandora_console/godmode/modules/manage_inventory_modules.php +++ b/pandora_console/godmode/modules/manage_inventory_modules.php @@ -87,10 +87,12 @@ if ($id_os == 0) { } $interpreter = (string) get_parameter('interpreter'); +$script_mode = (string) get_parameter('script_mode'); $code = (string) get_parameter('code'); $code = base64_encode(str_replace("\r", '', html_entity_decode($code, ENT_QUOTES))); $format = (string) get_parameter('format'); $block_mode = (int) get_parameter('block_mode', 0); +$script_path = (string) get_parameter('script_path'); // Create inventory module. if ($create_module_inventory === true) { @@ -102,6 +104,8 @@ if ($create_module_inventory === true) { 'code' => $code, 'data_format' => $format, 'block_mode' => $block_mode, + 'script_mode' => $script_mode, + 'script_path' => $script_path, ]; $result = (bool) inventory_create_inventory_module($values); @@ -128,6 +132,8 @@ if ($create_module_inventory === true) { 'code' => $code, 'data_format' => $format, 'block_mode' => $block_mode, + 'script_mode' => $script_mode, + 'script_path' => $script_path, ]; $result = inventory_update_inventory_module($id_module_inventory, $values); @@ -289,7 +295,7 @@ if ($result === false) { $data = []; $begin = false; if ($management_allowed === true) { - $data[0] = ''.$row['name'].''; + $data[0] = ''.$row['name'].''; } else { $data[0] = ''.$row['name'].''; } diff --git a/pandora_console/godmode/modules/manage_inventory_modules_form.php b/pandora_console/godmode/modules/manage_inventory_modules_form.php index 8e151ce0b5..a955979672 100644 --- a/pandora_console/godmode/modules/manage_inventory_modules_form.php +++ b/pandora_console/godmode/modules/manage_inventory_modules_form.php @@ -153,7 +153,6 @@ $table->data[7][0] .= ui_print_help_tip(__("Here is placed the script for the RE $table->data[7][1] = html_print_textarea('code', 25, 80, base64_decode($code), '', true); - echo '
'; diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new index bbd58b5cff..8127795339 100644 --- a/pandora_server/FreeBSD/pandora_server.conf.new +++ b/pandora_server/FreeBSD/pandora_server.conf.new @@ -387,11 +387,11 @@ web_threads 1 # Uncomment to perform web checks with LWP instead of CURL. #web_engine lwp -# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). +# Enable (1) or disable (0) Pandora FMS Inventory Server. inventoryserver 1 -# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +# Number of threads for the Inventory Server. inventory_threads 1 diff --git a/pandora_server/NetBSD/pandora_server.conf.new b/pandora_server/NetBSD/pandora_server.conf.new index f5c2e79275..1a7fae6877 100644 --- a/pandora_server/NetBSD/pandora_server.conf.new +++ b/pandora_server/NetBSD/pandora_server.conf.new @@ -379,11 +379,11 @@ web_threads 1 # Uncomment to perform web checks with LWP instead of CURL. #web_engine lwp -# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). +# Enable (1) or disable (0) Pandora FMS Inventory Server. inventoryserver 1 -# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +# Number of threads for the Inventory Server. inventory_threads 1 diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 8332becd62..0c74e476dc 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -466,11 +466,11 @@ web_timeout 60 # Uncomment to perform web checks with LWP instead of CURL. #web_engine lwp -# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). +# Enable (1) or disable (0) Pandora FMS Inventory Server. inventoryserver 1 -# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +# Number of threads for the Inventory Server. inventory_threads 1 diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows index efed94ed52..0a2fcdb978 100644 --- a/pandora_server/conf/pandora_server.conf.windows +++ b/pandora_server/conf/pandora_server.conf.windows @@ -384,11 +384,11 @@ web_threads 1 # Uncomment to perform web checks with LWP instead of CURL. #web_engine lwp -# Enable (1) or disable (0) Pandora FMS Inventory Server (PANDORA FMS ENTERPRISE ONLY). +# Enable (1) or disable (0) Pandora FMS Inventory Server. inventoryserver 1 -# Number of threads for the Web Server (PANDORA FMS ENTERPRISE ONLY). +# Number of threads for the Inventory Server. inventory_threads 1