Commit Graph

5224 Commits

Author SHA1 Message Date
artica 8748bd9e72 Auto-updated build strings. 2020-06-24 01:00:18 +02:00
alejandro-campos cec16d01b8 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-23 09:56:21 +02:00
Alejandro Campos a81e4acbb7 Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'
# Conflicts:
#   pandora_console/include/functions_config.php
2020-06-23 09:28:21 +02:00
alejandro-campos 6520ad2107 Added setup token 2020-06-23 09:21:15 +02:00
artica 682f4eebf9 Auto-updated build strings. 2020-06-23 01:00:17 +02:00
Daniel Maya ff8a41ae68 Fixed data compaction in proc modules 2020-06-22 17:33:21 +02:00
artica 6103e55287 Auto-updated build strings. 2020-06-22 01:00:13 +02:00
artica f601d43bb7 Auto-updated build strings. 2020-06-21 01:00:13 +02:00
artica 112f2cc25c Auto-updated build strings. 2020-06-20 01:00:19 +02:00
alejandro-campos d64ff918d6 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:22:28 +02:00
alejandro-campos 1243968872 Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion 2020-06-19 12:12:52 +02:00
artica 9beb1ce22f Auto-updated build strings. 2020-06-19 01:00:15 +02:00
artica c6c9b63338 Auto-updated build strings. 2020-06-18 01:00:14 +02:00
fbsanchez 630f2e42d8 PluginTools new fields registration min/max_warning/critical_forced and str_warning/critical_forced 2020-06-17 13:17:22 +02:00
fbsanchez 3a2c2f1c38 Forced thresholds ENT 2020-06-17 13:14:22 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
artica 5d01c0976b Auto-updated build strings. 2020-06-17 01:00:15 +02:00
fbsanchez 6ec436e2a4 Metaconsole cleanup 2020-06-16 14:24:40 +02:00
artica 90cc854ea5 Auto-updated build strings. 2020-06-16 01:00:16 +02:00
artica 81d9f6f16b Auto-updated build strings. 2020-06-15 01:00:13 +02:00
artica 350c2caeb9 Auto-updated build strings. 2020-06-14 01:00:14 +02:00
artica 7b12d6c4c4 Auto-updated build strings. 2020-06-13 01:00:44 +02:00
Alejandro Fraguas 116f102d0a Merge branch 'ent-5763-cambio-comportamiento-por-defecto-de-use_xml_timestamp' into 'develop'
Update default value for use_xml_timestamp

See merge request artica/pandorafms!3243
2020-06-12 13:26:31 +02:00
artica e6aee8582d Auto-updated build strings. 2020-06-12 01:00:19 +02:00
fbsanchez b4219472f2 Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-11 14:55:36 +02:00
fbsanchez 057fcea724 DB2 discovery 2020-06-11 14:53:34 +02:00
Junichi Satoh e75de8a1a5 Fixed handling of Japanese encoding by policy. 2020-06-11 18:06:16 +09:00
artica 9a65b61e25 Auto-updated build strings. 2020-06-11 01:00:18 +02:00
Jose Gonzalez 94d628095d Added option for get the agent status 2020-06-10 08:35:01 +02:00
artica 899ba9ae2e Auto-updated build strings. 2020-06-10 01:00:19 +02:00
Kevin c446a86074 added audit and web_socket logs to logrotate 2020-06-09 13:39:02 +02:00
artica a30f73d6c2 Auto-updated build strings. 2020-06-09 01:00:18 +02:00
Jose Gonzalez 7c3f30a277 Get the name of policy in tpolicies 2020-06-08 16:44:09 +02:00
alejandro-campos ab61cf1fc5 changed console and audit log locations 2020-06-08 10:48:48 +02:00
artica 9a7035d014 Auto-updated build strings. 2020-06-08 01:00:14 +02:00
artica 78e8ef2711 Auto-updated build strings. 2020-06-07 01:00:15 +02:00
artica cc83ae35df Auto-updated build strings. 2020-06-06 01:00:17 +02:00
Jose Gonzalez 4e75219371 Added missing _id_module_ macro in Plugin server 2020-06-05 11:09:40 +02:00
artica c8d8b1a312 Auto-updated build strings. 2020-06-05 01:00:17 +02:00
artica 0bd255924f Auto-updated build strings. 2020-06-04 01:00:16 +02:00
marcos e270776a01 create new api/cli function to set event on progress 2020-06-03 15:56:19 +02:00
artica 865e17d3f8 Auto-updated build strings. 2020-06-03 01:00:14 +02:00
artica c127ed84f0 Updated version and build strings. 2020-06-02 18:19:16 +02:00
artica 5055a5d41b Auto-updated build strings. 2020-06-02 01:00:11 +02:00
Daniel Rodriguez df1fe544a1 Merge branch 'ent-5756-pantallas-de-configuracion-del-cluster' into 'develop'
Ent 5756 pantallas de configuracion del cluster

See merge request artica/pandorafms!3205
2020-06-01 09:47:25 +02:00
artica 979aa76271 Auto-updated build strings. 2020-06-01 01:00:13 +02:00
artica ab4e2bc8b1 Auto-updated build strings. 2020-05-31 01:00:14 +02:00
artica 969d4a36c1 Auto-updated build strings. 2020-05-30 01:00:19 +02:00
fbsanchez b3cf532c16 Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster 2020-05-29 12:30:49 +02:00
artica 55496dbf4c Auto-updated build strings. 2020-05-29 01:00:17 +02:00
Daniel Rodriguez b09ff78a87 Merge branch 'ent-5723-control-de-sesiones-selenium' into 'develop'
Cleanup old SEL GRID sessions

See merge request artica/pandorafms!3181
2020-05-28 08:27:05 +02:00
artica cc09361598 Auto-updated build strings. 2020-05-28 01:00:15 +02:00
artica 7c4e4bb7e1 Auto-updated build strings. 2020-05-27 01:00:18 +02:00
fbsanchez 2481bcc669 Update default value for use_xml_timestamp 2020-05-26 13:56:39 +02:00
artica e3803ac934 Auto-updated build strings. 2020-05-26 01:00:17 +02:00
Daniel Rodriguez bab85bcc5e Merge branch 'ent-5744-pandora_ux-pl-con-pandorafms-webdriver' into 'develop'
added missing function read_file

See merge request artica/pandorafms!3193
2020-05-25 18:18:28 +02:00
Luis 9541d3b56d Ent 5553 dangerous behaviour dataserver lifo enabled 2020-05-25 16:08:37 +02:00
artica b595548eee Auto-updated build strings. 2020-05-25 01:00:14 +02:00
artica 980582968b Auto-updated build strings. 2020-05-24 01:00:15 +02:00
artica 4e4fe147d3 Auto-updated build strings. 2020-05-23 01:00:17 +02:00
artica 289e56d8df Auto-updated build strings. 2020-05-22 01:00:15 +02:00
fbsanchez b0e8287c61 Wip cluster view 2020-05-21 19:28:24 +02:00
artica 44991d0b46 Auto-updated build strings. 2020-05-21 01:00:16 +02:00
artica 09ea6fdb97 Auto-updated build strings. 2020-05-20 01:00:16 +02:00
marcos 621e0ee9d9 fixed error mysqldump 2020-05-19 11:52:11 +02:00
marcos 13b78ae450 Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-19 09:33:17 +02:00
artica d2c2ae7502 Auto-updated build strings. 2020-05-19 01:00:16 +02:00
marcos fc5c5fd60d Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-18 10:28:32 +02:00
artica e8dd2b13c7 Auto-updated build strings. 2020-05-18 01:00:13 +02:00
artica eece9281e2 Auto-updated build strings. 2020-05-17 01:00:13 +02:00
artica 71cb3e0164 Auto-updated build strings. 2020-05-16 01:00:14 +02:00
artica 277a610709 Auto-updated build strings. 2020-05-15 01:00:15 +02:00
Alejandro Fraguas 5f598c2dcc Merge branch 'ent-5236-docker-centos-7' into 'develop'
Docker centos7

See merge request artica/pandorafms!3136
2020-05-14 16:07:18 +02:00
Alejandro Fraguas aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
2020-05-14 10:32:43 +02:00
artica 44b5f2671e Auto-updated build strings. 2020-05-14 01:00:51 +02:00
fbsanchez 206970d143 fixes 2020-05-13 17:06:18 +02:00
fbsanchez ee51814650 fixes 2020-05-13 17:02:07 +02:00
fbsanchez bd6b57e8c3 Improvements in log details v10 2020-05-13 16:43:20 +02:00
fbsanchez 6bbb9d5d9b minor fix 2020-05-13 12:43:47 +02:00
fbsanchez 694d82e522 avoid div by 0 error while scanning networks with no hosts 2020-05-13 12:37:08 +02:00
artica 9fc993519b Auto-updated build strings. 2020-05-13 01:00:20 +02:00
marcos 7938bfcd3e Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-12 09:21:35 +02:00
artica 3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
marcos 7f282c668d Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-11 16:19:29 +02:00
Alejandro Fraguas f2c0a62cec Merge branch 'ent-1096-integracion-cmdb' into 'develop'
CMDB integration needs

See merge request artica/pandorafms!3045
2020-05-11 13:58:50 +02:00
artica 8514cdc378 Auto-updated build strings. 2020-05-11 01:00:15 +02:00
artica 87445c28ef Auto-updated build strings. 2020-05-10 01:00:15 +02:00
artica 3c01526ea9 Auto-updated build strings. 2020-05-09 01:00:24 +02:00
artica 36d15f3de5 Auto-updated build strings. 2020-05-08 01:00:18 +02:00
artica bc3e21af6d Auto-updated build strings. 2020-05-07 01:00:17 +02:00
artica 5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +02:00
artica b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
fbsanchez 4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez 54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-05-04 09:52:15 +02:00
artica 12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica 7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica 848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
fbsanchez 55392bac47 weird json 2020-04-30 18:11:50 +02:00
fbsanchez eaf10f7d6e weird json 2020-04-30 18:07:52 +02:00
fbsanchez c7f0181209 fix 2020-04-30 16:53:45 +02:00
fbsanchez 7ad06596ff Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d 2020-04-30 16:26:47 +02:00
fbsanchez da92cb53f8 rcmd h&d 2020-04-30 16:25:00 +02:00
fbsanchez e9bd646983 added missing function read_file 2020-04-30 15:19:19 +02:00
fbsanchez 900e25eef1 WIP rcmd in H&D 2020-04-30 15:00:25 +02:00
artica 8a019bd8f4 Auto-updated build strings. 2020-04-30 01:00:16 +02:00
artica 456848485e Auto-updated build strings. 2020-04-29 01:00:16 +02:00
fbsanchez dfa31d5227 updates 2020-04-28 13:26:57 +02:00
fbsanchez 2bfee57a67 perl multilib json workaround 2020-04-28 12:46:13 +02:00
fbsanchez 3ad1b5f2e3 trace if failed to encode json (summary) 2020-04-28 12:19:46 +02:00
fbsanchez 744bac6736 avoid problems while encoding json 2020-04-28 11:21:33 +02:00
fbsanchez 8d73339887 Windows environment spaces in binary file names 2020-04-28 10:37:09 +02:00
artica d644714fcb Auto-updated build strings. 2020-04-28 01:00:18 +02:00
artica a986ed0a48 Auto-updated build strings. 2020-04-27 01:00:15 +02:00
artica bf0596e978 Auto-updated build strings. 2020-04-26 01:00:15 +02:00
artica 202816e309 Auto-updated build strings. 2020-04-25 01:00:18 +02:00
artica eb9b116311 Auto-updated build strings. 2020-04-24 01:00:16 +02:00
artica 1b641b81fb Auto-updated build strings. 2020-04-23 01:00:15 +02:00
fbsanchez 19f7280c86 Cleanup old SEL GRID sessions 2020-04-22 16:09:12 +02:00
artica 91d1832f8f Updated version and build strings. 2020-04-22 12:42:47 +02:00
artica 60f4f21297 Auto-updated build strings. 2020-04-22 01:00:15 +02:00
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00
artica 2e44631253 Auto-updated build strings. 2020-04-19 01:00:15 +02:00
artica 04ecb0afa5 Auto-updated build strings. 2020-04-18 01:00:19 +02:00
artica 719762105d Auto-updated build strings. 2020-04-17 01:00:19 +02:00
Alejandro Fraguas fdced83e63 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution

See merge request artica/pandorafms!3167
2020-04-16 18:23:31 +02:00
fbsanchez b3ed5dab63 Update new ips detected 2020-04-16 14:29:35 +02:00
fbsanchez fa0b5760a9 simplified agents 2020-04-16 14:06:41 +02:00
fbsanchez 0614c4b6ce fix alias 2020-04-16 13:08:56 +02:00
fbsanchez f84760e448 Avoid candidates without label (indirect related) 2020-04-16 12:54:47 +02:00
fbsanchez f9c3d480ca Avoid empty references 2020-04-16 12:50:44 +02:00
fbsanchez bcb969c3af Fixes name resolution 2020-04-16 12:39:55 +02:00
Daniel Rodriguez eb379ddfa9 Merge branch 'ent-5565-9761-Macros-en-alertas-de-correlacion-de-eventos-no-funcionan' into 'develop'
fixed macros for alert of correlated events

See merge request artica/pandorafms!3161
2020-04-16 09:50:07 +02:00
artica 1b028be67f Auto-updated build strings. 2020-04-16 01:00:14 +02:00
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
alejandro-campos 03db071ce4 fixed macros for alert of correlated events 2020-04-14 16:53:43 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
fbsanchez 36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
fbsanchez 0282dae05a Tools.pm definition retrieved from 5575 2020-04-14 09:57:01 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
fbsanchez 1057f76e5e undo changes, maintain classic ATF calculation 2020-04-13 17:50:18 +02:00
fbsanchez cf67dda2eb prioritize AFT relationships 2020-04-13 17:26:49 +02:00
fbsanchez f6746ba9d8 parent calculation 2020-04-13 17:16:47 +02:00
fbsanchez 189d85d659 minor fix 2020-04-13 15:30:13 +02:00
fbsanchez 7395410831 fix parent-connection 2020-04-13 15:04:03 +02:00
fbsanchez 9c74306e95 minor change 2020-04-13 14:11:43 +02:00
fbsanchez 32538e659a Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-13 10:36:47 +02:00
artica 8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica 8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica 017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica 6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 8a0215dcc9 minor fixes 2020-04-08 14:14:03 +02:00
fbsanchez bb11403c4b Fixes - default module 2020-04-08 13:01:11 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez ce5868bbc4 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 10:03:51 +02:00
artica 987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
fbsanchez f88dceb4ec Some missing functions 2020-04-07 19:03:10 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
marcos 0f28a9c5b4 add message if mysqldump is not instaled 2020-04-07 16:37:20 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2020-04-07 12:55:27 +02:00
Daniel Rodriguez 18622f4d0a Merge branch 'ent-5517-9676-correlacion-nueva-hace-que-salten-mil-alertas-en-poco-tiempo' into 'develop'
Minor change

See merge request artica/pandorafms!3125
2020-04-07 10:58:47 +02:00
artica 77b267c596 Auto-updated build strings. 2020-04-07 01:00:15 +02:00
fbsanchez 890cfe68aa multiple fixes 2020-04-06 18:04:53 +02:00
fbsanchez eb64fd8758 minor fixes 2020-04-06 16:10:37 +02:00
fbsanchez 5205e0e06f minor update 2020-04-06 12:05:03 +02:00
fbsanchez 2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
fbsanchez 72f026f152 Minor fixes, group and review while exceeded license 2020-04-06 11:04:53 +02:00
artica a8043e98f9 Auto-updated build strings. 2020-04-06 01:00:14 +02:00
artica e013e26892 Auto-updated build strings. 2020-04-05 01:00:14 +02:00
artica d18dbc10e7 Auto-updated build strings. 2020-04-04 01:00:20 +02:00
Daniel Rodriguez a901e91274 Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop'
Ent 5652 grafica de modulo en los email gigante

See merge request artica/pandorafms!3135
2020-04-03 12:28:28 +02:00
artica 297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
fbsanchez 79378994b4 schema minor fixes 2020-04-02 17:56:17 +02:00
fbsanchez 32cdb3d1cf Docker centos7 2020-04-02 17:08:52 +02:00
Daniel Maya 9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Daniel Rodriguez 1c596ea8af Merge branch 'ent-5640-9818-Alertas-SNMP-no-inserta-grupo-en-creacion-de-eventos' into 'develop'
Ent 5640 9818 alertas snmp no inserta grupo en creacion de eventos

See merge request artica/pandorafms!3127
2020-04-02 14:33:00 +02:00
artica e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
fbsanchez bb1ad4d2a9 Updates sat. compatibility 2020-04-01 18:16:57 +02:00
fbsanchez e249233205 minor fixes 2020-04-01 16:43:04 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
Daniel Maya 3f8948bc21 Added id_group in snmp alert 2020-03-31 15:26:41 +02:00
fbsanchez fec4f37cf4 Minor change 2020-03-31 12:02:53 +02:00
fbsanchez 3ad3a07d93 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:02:52 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
fbsanchez c556bf3ba8 License validation 2020-03-30 15:03:22 +02:00
fbsanchez 86dfcd162b Update 2020-03-30 14:28:10 +02:00
Daniel Rodriguez ea631afb52 Merge branch 'ent-5463-modificar-la-obtencion-de-logs-desde-la-consola-elastic' into 'develop'
Deleted logstash

See merge request artica/pandorafms!3123
2020-03-30 14:10:31 +02:00
fbsanchez a7c783242d Remaining stuff 2020-03-30 12:51:52 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
Daniel Maya b68f4d15e5 Deleted logstash 2020-03-27 14:36:42 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
fbsanchez 452f5253e2 merge develop 2020-03-26 14:43:57 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
fbsanchez e923c9f5e0 minor fixes 2020-03-26 14:33:56 +01:00