tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,526 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

4759 Commits

Author SHA1 Message Date
artica 14999b7b84 Auto-updated build strings. 2019-11-29 00:01:08 +01:00
artica ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
artica d2fdc0cf9d Auto-updated build strings. 2019-11-27 00:01:08 +01:00
fbsanchez bf22ff7a50 minor fixes 2019-11-26 17:08:18 +01:00
fbsanchez 69b813390d minor fix - removed trace 2019-11-26 15:49:28 +01:00
fbsanchez a4db8483d1 Discovery Applications minor fixes - SAP backend 2019-11-26 15:47:04 +01:00
fbsanchez c985f2d5f9 Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-26 10:50:51 +01:00
artica b3fa4b7b7d Auto-updated build strings. 2019-11-26 00:01:08 +01:00
fbsanchez a854809247 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 2019-11-25 09:39:25 +01:00
artica 1592773b46 Auto-updated build strings. 2019-11-25 00:01:07 +01:00
artica 44311c0438 Auto-updated build strings. 2019-11-24 00:01:07 +01:00
artica 09e6615611 Auto-updated build strings. 2019-11-23 00:01:09 +01:00
fbsanchez 4e2bd7ed55 minor fixes 2019-11-22 20:49:46 +01:00
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2019-11-22 15:49:07 +01:00
artica 561e73d524 Updated version and build strings. 2019-11-22 10:03:53 +01:00
artica b386da7da6 Auto-updated build strings. 2019-11-22 00:01:10 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 362837f856 updated default values for tevent_rule, new tokens for correlated alerts 2019-11-21 17:47:21 +01:00
artica 23e64ab781 Auto-updated build strings. 2019-11-21 00:01:18 +01:00
fbsanchez e9432aaaa5 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-20 15:51:47 +01:00
artica 12123d68df Auto-updated build strings. 2019-11-20 00:01:37 +01:00
fbsanchez 9cea131378 WIP CorrelatedAlerts 2019-11-19 23:35:29 +01:00
fbsanchez 471389a72a Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl' 
Conflicts:
   pandora_console/extras/mr/33.sql
 2019-11-19 14:11:38 +01:00
fbsanchez be1e4324d2 missed port 2019-11-19 12:02:10 +01:00
fbsanchez 0fd95647ea log_window 2019-11-19 11:56:11 +01:00
artica 04076a04b1 Auto-updated build strings. 2019-11-19 00:01:12 +01:00
fbsanchez 83e7d5a701 Minor fixes 2019-11-18 19:32:57 +01:00
José González 4cddf5a31a Merge branch 'develop' into 'ent-4930-create_event-no-anade-comentarios-evento' 
# Conflicts:
#   pandora_console/include/functions_events.php
 2019-11-18 11:02:31 +01:00
fbsanchez 1cacbbc08f fix tools 2019-11-18 10:40:02 +01:00
fbsanchez 4a05cbb544 Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 2019-11-18 10:05:47 +01:00
fbsanchez 6fb2e3af81 Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-18 10:05:40 +01:00
fbsanchez 13dd2ebc18 Merge branch 'ent-4226-mejoras-plugin-sap' of brutus.artica.lan:artica/pandorafms into ent-4226-mejoras-plugin-sap 2019-11-18 10:04:52 +01:00
fbsanchez 2f80759227 minor updates pandora sap 2019-11-18 10:04:47 +01:00
artica 73389a7164 Auto-updated build strings. 2019-11-18 00:01:07 +01:00
artica 39b449be9c Auto-updated build strings. 2019-11-17 00:01:07 +01:00
artica 727b3bde5d Auto-updated build strings. 2019-11-16 00:01:11 +01:00
fbsanchez 32466a5f0f Merge remote-tracking branch 'origin/develop' into ent-EDF 2019-11-15 16:36:06 +01:00
artica 378192a449 Auto-updated build strings. 2019-11-15 00:01:12 +01:00
fbsanchez f69b86663a Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/godmode/wizards/Wizard.main.php
 2019-11-14 21:40:35 +01:00
fbsanchez 3c87efe113 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-14 17:13:38 +01:00
Alejandro Fraguas 27bdf04735 Merge branch 'ent-4774-welcome-to-pandorafms' into 'develop' 
first changed to welcome window

See merge request artica/pandorafms!2822
 2019-11-14 16:05:22 +01:00
artica cfdb5330ae Auto-updated build strings. 2019-11-14 00:01:12 +01:00
fbsanchez b0920d93af Merge branch 'ent-4772-omnishell' into ent-EDF 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-13 18:15:19 +01:00
fbsanchez 83590146b1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 2019-11-13 17:38:24 +01:00
fbsanchez 360d0d7120 added rcmd_timeout base configuration 2019-11-13 16:41:36 +01:00
Jose Gonzalez adb6f00597 Missed line added 2019-11-13 16:34:08 +01:00
Jose Gonzalez 62fbdd36a0 Solution for lost comments in the events section modal window 2019-11-13 15:36:52 +01:00
fbsanchez 875d4430a7 Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell 2019-11-13 12:21:42 +01:00
fbsanchez b11dbc639f Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-13 12:20:29 +01:00
marcos fe45afa662 Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap 2019-11-13 12:01:36 +01:00
artica c19d760bdb Auto-updated build strings. 2019-11-13 00:01:12 +01:00
fbsanchez b9633933e1 Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/general/header.php
 2019-11-12 14:17:45 +01:00
fbsanchez 19d06dc061 Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap 2019-11-12 10:19:34 +01:00
artica 2ee4f9d88f Auto-updated build strings. 2019-11-12 00:01:09 +01:00
fbsanchez ca9d168e67 wip omnishell 2019-11-11 18:12:43 +01:00
artica c390befc2a Auto-updated build strings. 2019-11-11 00:01:07 +01:00
artica 7e275febcd Auto-updated build strings. 2019-11-10 00:01:07 +01:00
artica cba38680bd Auto-updated build strings. 2019-11-09 00:01:09 +01:00
fbsanchez 2daf473ba9 wip omnishell, command executor and directories 2019-11-08 17:07:14 +01:00
artica c8b39740a9 Auto-updated build strings. 2019-11-08 11:05:59 +01:00
fbsanchez 98237a8d34 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/general/header.php
 2019-11-06 15:36:53 +01:00
Alejandro Fraguas 37ffff12eb Merge branch '4727-macros-grupos-secundarios' into 'develop' 
4727 macros grupos secundarios

See merge request artica/pandorafms!2811
 2019-11-06 12:20:39 +01:00
Daniel Rodriguez b7d8323583 Merge branch 'ent-3687-get-agents-id-name-by-alias-api-cli' into 'develop' 
Added API and cli function get_agents_id_by_alias

See merge request artica/pandorafms!2802
 2019-11-05 17:08:32 +01:00
fbsanchez 276fc82556 Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap 
Conflicts:
	pandora_console/extras/mr/33.sql
 2019-11-05 15:39:18 +01:00
fbsanchez d3e1d34bed SAP discovery 2019-11-05 15:38:17 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
 2019-11-05 15:17:09 +01:00
Alejandro Fraguas b409dde9c0 Merge branch 'ent-4384-cli-stop-downtime-bug' into 'develop' 
fixed fixed error on stop_downtime

See merge request artica/pandorafms!2717
 2019-11-05 11:03:02 +01:00
fbsanchez 844414dc8b Discovery SAP - backend start 2019-11-04 19:52:38 +01:00
Alejandro Fraguas 777bbdd180 Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop' 
Added feature sample_agent

See merge request artica/pandorafms!2826
 2019-11-04 17:54:33 +01:00
Luis Calvo 7a20ec8e82 Fixed CLI delete data 2019-11-04 16:04:26 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
Luis Calvo 7f01f3d014 Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli 2019-10-29 10:23:46 +01:00
artica 6f3e42e732 Auto-updated build strings. 2019-10-29 00:01:13 +01:00
fbsanchez 2e629af15c Simplified log message avoid extra symbols "*" 2019-10-28 20:43:36 +01:00
fbsanchez 7accbc97c4 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:36:19 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
fbsanchez ccf971c2eb Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:18:19 +01:00
Daniel Rodriguez 08247c1952 Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop' 
changed pandora api functions to include possibility of using agent alias when...

See merge request artica/pandorafms!2819
 2019-10-28 11:25:38 +01:00
Alejandro Fraguas 405b91a2ac Merge branch 'ent-3584-no-pasa-html_encode-al-alias-de-los-broker_agents' into 'develop' 
Encode the agent alias with HTML entities.

See merge request artica/pandorafms!2836
 2019-10-28 10:01:48 +01:00
alejandro-campos b16ef248d6 minor fixes in cli and api functions 2019-10-28 09:48:52 +01:00
artica 88a56a1f22 Auto-updated build strings. 2019-10-28 00:01:08 +01:00
artica 874ac0c630 Auto-updated build strings. 2019-10-27 00:01:07 +02:00
artica 8a03486dfc Auto-updated build strings. 2019-10-26 00:01:09 +02:00
Ramon Novoa d3971a3f90 Encode the agent alias with HTML entities. 
Ref pandora_enterprise#3584
 2019-10-25 11:08:47 +02:00
artica 86fd1275be Auto-updated build strings. 2019-10-25 00:01:11 +02:00
Jose Gonzalez 742329336e Added link with visual consoles 2019-10-24 14:30:34 +02:00
alejandro-campos ee587a3117 Merge remote-tracking branch 'origin/develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-24 13:21:08 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
artica 38dfa5cf35 Auto-updated build strings. 2019-10-24 00:01:09 +02:00
artica 1470241783 Auto-updated build strings. 2019-10-23 00:01:11 +02:00
Jose Gonzalez a6d1f3a544 Another minor fix applied 2019-10-22 16:23:46 +02:00
Jose Gonzalez 305dfa441d Minor fix applied 2019-10-22 14:03:24 +02:00
Jose Gonzalez 7c39f3680e Added feature sample_agent 2019-10-22 11:54:27 +02:00
artica f99616723b Auto-updated build strings. 2019-10-22 00:01:09 +02:00
alejandro-campos 6cf08dde1e Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-21 09:43:43 +02:00
artica f72fde0fb5 Auto-updated build strings. 2019-10-21 00:01:07 +02:00
artica bb9d18b6d8 Auto-updated build strings. 2019-10-20 00:01:07 +02:00
artica 88248fd226 Auto-updated build strings. 2019-10-19 00:01:11 +02:00
Luis Calvo 4638915c70 Fixed minor bugs 2019-10-18 12:48:38 +02:00
Luis Calvo 85dff93f41 Added strict option 2019-10-18 12:22:20 +02:00
artica 22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
Alejandro Fraguas cb269789a7 Merge branch 'ent-4818-cambio-en-plugin-tools' into 'develop' 
Updated file names to avoid collision

See merge request artica/pandorafms!2816
 2019-10-17 12:14:51 +02:00
alejandro-campos 3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +02:00
artica 361f2022f4 Auto-updated build strings. 2019-10-17 00:01:10 +02:00
fbsanchez 5f2adbfb7a Updated file names to avoid collision 2019-10-16 13:40:46 +02:00
Alejandro Fraguas 2d801a0109 Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop' 
Solved an issue with uninizialized variable

See merge request artica/pandorafms!2815
 2019-10-16 12:05:48 +02:00
artica a3a456da92 Auto-updated build strings. 2019-10-16 00:01:08 +02:00
Daniel Rodriguez 68c064feee Merge branch '4673-mal-funcionamiento-use-xml-timestamp' into 'develop' 
Changed parameter of use_xml_timestamp

See merge request artica/pandorafms!2797
 2019-10-15 17:28:59 +02:00
Jose Gonzalez 7d4b75c4b3 Solved an issue with uninizialized variable 2019-10-15 17:04:08 +02:00
Daniel Rodriguez 402bd6b58f Merge branch 'ent-4778-macro-policy-no-funciona' into 'develop' 
Fixed macro _policy_ in alerts

See merge request artica/pandorafms!2792
 2019-10-15 16:17:49 +02:00
artica 6c21d57677 Auto-updated build strings. 2019-10-15 00:01:09 +02:00
Jose Gonzalez 01148749a6 Added secondarygroups macro and updated spanish, english and japanses wiki 2019-10-14 17:10:48 +02:00
Alejandro Fraguas 1cbeed7b06 Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop' 
Added a string with information of the caller of pandora_server. Modified too...

See merge request artica/pandorafms!2786
 2019-10-14 11:45:08 +02:00
artica 83b16d9d84 Auto-updated build strings. 2019-10-14 00:01:07 +02:00
artica 838fcfa3a1 Auto-updated build strings. 2019-10-13 00:01:06 +02:00
artica df2acbce96 Auto-updated build strings. 2019-10-12 00:01:10 +02:00
fbsanchez 0abbcb4150 minor fix inherited os selection remote_execution_modules 2019-10-11 13:54:00 +02:00
fbsanchez 4c6d924495 Review remote execution modules 2019-10-11 12:50:29 +02:00
artica 9a165dc9d8 Auto-updated build strings. 2019-10-11 00:01:08 +02:00
Alejandro Fraguas 41b84ccd81 Merge branch 'pulido/discovery-duplicados-alhambra' into 'develop' 
Locate instead search before create new Discovered agent

See merge request artica/pandorafms!2790
 2019-10-10 18:51:23 +02:00
fbsanchez 78643b2b99 updated field where target_os is stored 2019-10-10 17:54:10 +02:00
fbsanchez fb4f4b4046 minor error cleanup 2019-10-10 17:31:57 +02:00
fbsanchez 97f246ae60 discovery os detection 2019-10-10 17:28:02 +02:00
fbsanchez f1ec7d2339 minor fix in str comparison 2019-10-10 17:23:19 +02:00
Luis Calvo bf19fbffd3 Added API and cli function get_agents_id_by_alias 2019-10-10 14:25:17 +02:00
Kike 0433718612 Allowed several destination numbers in a single script call 2019-10-10 14:07:22 +02:00
fbsanchez 1a2ee3f00b Config - rcmd_timeout 2019-10-10 08:59:55 +02:00
artica edb3c806ce Auto-updated build strings. 2019-10-10 00:01:08 +02:00
fbsanchez 9cb2a0e1a1 NetworkServer enterprise improvement 2019-10-09 19:13:11 +02:00
fbsanchez cc58cd6515 get_agent_name_from_addr => get_agent_from_addr 2019-10-09 18:09:09 +02:00
Jose Gonzalez 43261bd3f8 Changed parameter of use_xml_timestamp 2019-10-09 15:46:44 +02:00
artica be2148ff26 Auto-updated build strings. 2019-10-09 00:01:09 +02:00
Daniel Rodriguez dd772f95d6 Merge branch 'ent-4756-conexion-servidor-nodo-a-metaconsola' into 'develop' 
encryption key prepared before being used

See merge request artica/pandorafms!2785
 2019-10-08 18:20:18 +02:00
Daniel Rodriguez 45b90d43e5 Merge branch 'ent-4744-is_numeric-no-admite-numeros-en-notacion-cientifica' into 'develop' 
is_numeric review, with fallback to looks_like_number

See merge request artica/pandorafms!2778
 2019-10-08 15:56:36 +02:00
artica 2a76b06870 Auto-updated build strings. 2019-10-08 00:01:11 +02:00
Daniel Rodriguez 588d2f60ef Merge branch 'ent-4678-No-funciona-macro-moduledata-modulename-cuando-el-tipo-de-modulo-es-string-y-no-generic-data-string' into 'develop' 
Ent 4678 no funciona macro moduledata modulename cuando el tipo de modulo es string y no generic data string

See merge request artica/pandorafms!2781
 2019-10-07 19:20:08 +02:00
fbsanchez 8b771f6a35 Minor fix 2019-10-07 17:35:20 +02:00
fbsanchez 2ac4ae3a18 Minor fix 2019-10-07 17:08:09 +02:00
fbsanchez 7ecaf11d07 Locate instead search before create new Discovered agent 2019-10-07 16:38:58 +02:00
Luis Calvo 37c0f340dc Fixed macro _policy_ in alerts 2019-10-07 15:09:46 +02:00
Jose Gonzalez 662e86c1c2 Improved solution 2019-10-07 10:31:59 +02:00
Jose Gonzalez 7bdd2a02e5 Added a string with information of the caller of pandora_server. Modified too an issue with security level messages 2019-10-07 10:02:21 +02:00
artica 745971dfa6 Auto-updated build strings. 2019-10-07 00:01:06 +02:00
artica 936ce0ee26 Auto-updated build strings. 2019-10-06 00:01:06 +02:00
artica d0dead58f0 Auto-updated build strings. 2019-10-05 00:01:09 +02:00
fbsanchez 647ce5706e encryption key prepared before being used 2019-10-04 14:53:07 +02:00
artica cc239e5e68 Auto-updated build strings. 2019-10-04 00:01:09 +02:00
artica 21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
Tatiana Llorente 5a2ca8e65f Added all string types - #4678 2019-10-02 17:37:14 +02:00
fbsanchez 8bb1e4ed2d is_numeric review, with fallback to looks_like_number 2019-10-02 11:33:43 +02:00