Commit Graph

5279 Commits

Author SHA1 Message Date
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
Daniel Rodriguez 1134113cf3 Merge branch 'ent-6468-fallo-plantillas-automaticas-discovery' into 'develop'
OID naming compatibility when starts with "." or not

See merge request artica/pandorafms!3522
2020-10-13 15:48:59 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
fbsanchez 02c4fe30a3 OID naming compatibility when starts with "." or not 2020-10-09 14:50:37 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
Daniel Rodriguez 2b5eb00e6a Merge branch 'ent-6199-error-de-encoding-en-plugintools-pm' into 'develop'
Added encoding lib to prevent errors with PAR Packer

See merge request artica/pandorafms!3391
2020-10-08 15:04:19 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
Daniel Rodriguez 9f4397a760 Merge branch 'ent-6373-10641-eventos-de-going-to-normal-cada-5-minutos' into 'develop'
FF keep counters fix

See merge request artica/pandorafms!3489
2020-10-07 16:04:43 +02:00
Daniel Rodriguez f83737b01f Merge branch 'ent-6433-server-does-not-have-access-to-the-api' into 'develop'
Ent 6433 server does not have access to the api

Closes pandora_enterprise#6433

See merge request artica/pandorafms!3503
2020-10-07 14:55:46 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
Jose Gonzalez 6459c6aa73 Update the correct file 2020-10-05 15:15:10 +02:00
Jose Gonzalez 0da066954b Modified localhost for 127.0.0.1 for ACL control 2020-10-05 15:12:18 +02:00
Jose Gonzalez e8e20b933c Testing 2020-10-05 12:53:49 +02:00
Jose Gonzalez 50dd166cb3 Testing 2020-10-05 11:48:06 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
Daniel Rodriguez e9ec50c81f Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop'
pandora_db only runs on the master server.

See merge request artica/pandorafms!3477
2020-10-02 12:26:38 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
fbsanchez 308598ba8d minor fix 2020-10-01 16:23:00 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00
artica 43b02efa4e Auto-updated build strings. 2020-10-01 01:00:20 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
Daniel Rodriguez ccbbd7909b Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop'
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc

See merge request artica/pandorafms!3475
2020-09-30 10:25:32 +02:00
artica 1a2f14a35b Auto-updated build strings. 2020-09-30 01:00:21 +02:00
fbsanchez d5c0b23b3c FF keep counters fix 2020-09-29 12:30:56 +02:00
artica f9dfa8bbc3 Auto-updated build strings. 2020-09-29 01:00:20 +02:00
artica fe4916c0c3 Auto-updated build strings. 2020-09-28 01:00:14 +02:00
artica 0cbec13ec6 Auto-updated build strings. 2020-09-27 01:00:17 +02:00
artica bc7b0ae798 Auto-updated build strings. 2020-09-26 01:00:19 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
artica 6854c13aec Auto-updated build strings. 2020-09-25 01:00:51 +02:00
artica ba598d6d80 Auto-updated build strings. 2020-09-24 01:00:24 +02:00
artica 0b6d87e317 Auto-updated build strings. 2020-09-23 01:00:23 +02:00
Ramon Novoa 262655516e pandora_db only runs on the master server.
Ref. pandora_enterprise#6315
2020-09-22 12:17:29 +02:00
artica 6a525deeea Auto-updated build strings. 2020-09-22 01:00:23 +02:00
fbsanchez e265c03925 Fix WMIServer, use default if not exists 2020-09-21 18:12:54 +02:00
artica 89714f3fd1 Auto-updated build strings. 2020-09-21 01:00:14 +02:00
artica 76a5be406f Auto-updated build strings. 2020-09-20 01:00:17 +02:00
artica 36121333e5 Auto-updated build strings. 2020-09-19 01:00:21 +02:00
artica 53da45e3c1 Auto-updated build strings. 2020-09-18 01:00:23 +02:00
fbsanchez 5c511bb88e Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-09-17 16:57:56 +02:00
Daniel Rodriguez c10dd5a77b Merge branch 'ent-6129-9761-macros-en-alertas-de-correlacion-de-eventos-no-funcionan' into 'develop'
minor fix - error messages

See merge request artica/pandorafms!3440
2020-09-17 15:26:09 +02:00
Daniel Rodriguez e2d4622505 Merge branch 'ent-6076-aadcm-plugin-de-oracle-metrica-duplicada' into 'develop'
PluginTools minor updates

See merge request artica/pandorafms!3443
2020-09-17 15:12:14 +02:00
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +02:00