Commit Graph

8311 Commits

Author SHA1 Message Date
mdtrooper 3464ea6572 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-16 12:25:53 +02:00
mdtrooper a8bd44c058 Added the feature show the combined graph in the agent graph tabs. TICKET #1277 2014-09-16 12:25:40 +02:00
Ramon Novoa 6cfd5dc5b5 Prevent inc modules from becoming unknown after a count reset. 2014-09-16 12:19:42 +02:00
Ramon Novoa bf78b13110 Changed UDP server commands to match those of the Windows agent. 2014-09-16 12:19:42 +02:00
artica 51cf261d72 Auto-updated build strings. 2014-09-16 09:46:20 +02:00
Sancho Lerena 871d79728f We're approaching to 5.1 SP1 release. 2014-09-15 15:46:27 +02:00
mdtrooper 2869103292 In the function 'agents_get_modules' improved/fixed the filter of kind 'x IN (N,M,O..)' 2014-09-15 15:27:48 +02:00
mdtrooper 88acb1d38b Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-15 11:45:23 +02:00
mdtrooper 9bdfdb263c Added the field timeout in edition massive modules. TICKET #932 2014-09-15 11:45:05 +02:00
Ramon Novoa 51dba4f48a Removed references to the ChangeLog. 2014-09-15 11:34:30 +02:00
Junichi Satoh 74621cbb15 Set group to 'Servers' as the same as linux configuration file. 2014-09-13 13:53:38 +09:00
Junichi Satoh 5a0c7ad9ea Fixed 'FF timeout' field is not shown when creating a data module from
the console.
2014-09-13 08:53:56 +09:00
Vanessa Gil 1f4f1942c0 Fixed mysql error. Ticket #1273
pandora_console/include/functions_treeview.php
2014-09-12 09:56:39 +02:00
Sancho Lerena f0d62fed3e Modified default group to avoid condition where agent and server
does not define default group. Server is the default group,
added IO Wait module.
2014-09-11 19:41:14 +02:00
mdtrooper cad2e62813 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-11 17:50:55 +02:00
mdtrooper 05ba19fa46 Added font styles for 4 and 6pt for the labels 2014-09-11 17:50:42 +02:00
Alejandro Gallardo Escobar 036f871e22 Added the file structure "pandora_console/attachment/collections" 2014-09-11 12:27:55 +02:00
Sancho Lerena 189c594c74 Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop 2014-09-11 12:10:48 +02:00
Sancho Lerena 964b580f10 Added missing collections directory to Unix agent structure
Added default (commented) token for log collection in Unix agent.
2014-09-11 12:10:17 +02:00
mdtrooper acb75b2ed4 Fixed the link to visualmaps in the linked items. 2014-09-11 11:55:46 +02:00
Vanessa Gil e09815c447 Moved tooltip. Ticket #1254
pandora_console/include/styles/pandora.css
2014-09-11 09:59:50 +02:00
mdtrooper afcab1836f Fixed PHP warning. 2014-09-10 18:21:45 +02:00
mdtrooper 875a65d633 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-10 18:11:34 +02:00
Vanessa Gil 0a7dad3aa1 Fixed bug:Error to assign server plugins using templates. Ticket #1161
pandora_console/godmode/agentes/agent_template.php
2014-09-10 18:05:33 +02:00
Ramon Novoa 8a6afbb8f3 Fixed the master server query.
The master server should only take modules from servers of the same type.
2014-09-10 18:05:33 +02:00
Ramon Novoa a7c0010ec5 Added constants for server types. 2014-09-10 18:05:33 +02:00
mdtrooper 5093927c62 Fixed the english message of my last commit. Thanks Sancho. 2014-09-10 18:04:59 +02:00
Vanessa Gil 3e9c5684a7 Fixed bug:Error to assign server plugins using templates. Ticket #1161
pandora_console/godmode/agentes/agent_template.php
2014-09-10 17:08:48 +02:00
Ramon Novoa 12190834a0 Fixed the master server query.
The master server should only take modules from servers of the same type.
2014-09-10 16:51:45 +02:00
Ramon Novoa 37aa4cc88c Added constants for server types. 2014-09-10 16:51:45 +02:00
mdtrooper df0a246760 Fixed the templates with equal min and max as 0. TICKETS #1245 2014-09-10 16:33:19 +02:00
mdtrooper 633cc6e73e Fixes the javascript for the macros in module plugins. TICKETS #1258 2014-09-10 16:12:59 +02:00
mdtrooper 757ad9a58d Uploaded constants about the collection status. 2014-09-10 16:11:36 +02:00
mdtrooper fe2a53eb46 Fixed PHP warnings. 2014-09-10 15:37:31 +02:00
mdtrooper 2a3f51c68c Fixed the height of dinamic map. TICKETS #1246 2014-09-10 13:31:05 +02:00
mdtrooper 394929100a Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-10 13:09:10 +02:00
mdtrooper 1191c80e64 Fixed the PHP warnings. 2014-09-10 13:09:04 +02:00
Junichi Satoh 6a0b7c1a46 Added missing macros to alert macros help. 2014-09-10 19:34:04 +09:00
mdtrooper 5b59a92881 Fixed the check a empty dir for the graphviz directory 2014-09-10 12:28:13 +02:00
Junichi Satoh 2544d44dbc Added new text to the ipam help. 2014-09-10 14:06:41 +09:00
Alejandro Gallardo Escobar a60f20e788 Removed the ChangeLog files :D 2014-09-09 17:41:42 +02:00
mdtrooper 1db206598f Added text into the ipam help about the unassigned addresses 2014-09-09 17:13:07 +02:00
mdtrooper 6d22779d92 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-09 15:22:48 +02:00
mdtrooper 21bc1b52a4 Added function 'db_get_fields' and the code for mysql 2014-09-09 15:22:31 +02:00
Ramon Novoa e925a221ed Force nmap to use seconds as the timeout unit. 2014-09-09 13:06:42 +02:00
Ramon Novoa 0656960395 Added support for on-demand macros to the Plug-in Server. 2014-09-09 11:03:07 +02:00
Sancho Lerena 54acaba824 Added missing macros to helpfiles 2014-09-09 09:35:08 +02:00
mdtrooper 0bf9ce2d34 Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2014-09-08 15:26:19 +02:00
mdtrooper 952efb4b55 Cleaned source code style, only for to test the github webhooks 2014-09-08 15:26:04 +02:00
Vanessa Gil 7c470bc30d Commented autocreate_group parameter in config file.
pandora_server/NetBSD/pandora_server.conf.new
2014-09-08 15:20:48 +02:00