18506 Commits

Author SHA1 Message Date
vgilc
6bd1768335 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos3' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1638
2018-07-26 17:15:30 +02:00
vgilc
9e8481537b Merge branch 'develop' into '2248-5730-Añadir-elementos-a-la-vista-de-eventos3'
# Conflicts:
#   pandora_console/godmode/events/custom_events.php
2018-07-26 17:08:15 +02:00
vgilc
33cee703e3 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos2' into 'develop'
fix bug in metaconsole view events

See merge request artica/pandorafms!1636
2018-07-26 16:59:35 +02:00
samucarc
3593d2b762 Fixed tags in module bulk operations 2018-07-26 16:49:02 +02:00
manuel.montes
4b23824eb4 fix bug in metaconsole view events 2018-07-26 15:41:52 +02:00
danielmaya
a38e93b1c1 Fixed node connection in visual_map 2018-07-26 15:39:38 +02:00
manuel.montes
a476d008ac fix bug in metaconsole view events 2018-07-26 15:30:49 +02:00
vgilc
ab900f1e54 Merge branch '2076-Mejoras_en_gestion_de_politicas_desde_Metaconsola_3' into 'develop'
fixed errors in policies metaconsole

See merge request artica/pandorafms!1635
2018-07-26 15:09:28 +02:00
daniel
3985316a9b fixed errors in policies metaconsole 2018-07-26 12:41:09 +02:00
alejandro-campos
c70475cd38 Added new funcionality to cluster alert configuration: update alert 2018-07-26 10:24:45 +02:00
artica
fb73a0b8b2 Auto-updated build strings. 2018-07-26 00:01:30 +02:00
samucarc
202f72d1c3 Fixed fields list in manage events-custom fields 2018-07-25 17:23:13 +02:00
samucarc
2b11d8cd7c Added title in custom reports 2018-07-25 13:48:02 +02:00
vgilc
5bfeac1b87 Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop'
Added DB changes to support ProvisioningServer 2

See merge request artica/pandorafms!1587
2018-07-25 11:21:51 +02:00
artica
b0434e7f1d Auto-updated build strings. 2018-07-25 00:01:26 +02:00
fbsanchez
05bee8c856 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-24 18:43:45 +02:00
fbsanchez
ae6d7139b4 is_management_allowed fix 2018-07-24 18:24:03 +02:00
fbsanchez
581cf7c5a0 Added management_allowed 2018-07-24 17:55:33 +02:00
artica
7748fcf5ce Updated version and build strings. 2018-07-24 17:45:16 +02:00
vgilc
bb655488a5 Merge branch '2076-Mejoras_en_gestion_de_politicas_desde_Metaconsola' into 'develop'
fixed error pandoradb metapolicies

See merge request artica/pandorafms!1630
2018-07-24 16:03:12 +02:00
samucarc
ad7610d7f1 Removed html entities in the audit views 2018-07-24 15:02:11 +02:00
daniel
65ff6b260c fixed error pandoradb metapolicies 2018-07-24 13:12:46 +02:00
alejandro-campos
e4b74cffc8 fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied 2018-07-24 13:04:31 +02:00
artica
33dd9d5886 Auto-updated build strings. 2018-07-24 00:01:28 +02:00
fbsanchez
ba676e13e3 Added autoconfiguration menu 2018-07-23 20:11:35 +02:00
fbsanchez
079b2437b6 Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes 2018-07-23 18:06:02 +02:00
vgilc
a5c1caab1f Merge branch '2229-Gestion_de_politicas_desde_API' into 'develop'
add functions api for policies node

See merge request artica/pandorafms!1626
2018-07-23 17:31:09 +02:00
daniel
9236285a98 remove functions api to api enterprise because policies is enterprise 2018-07-23 17:04:07 +02:00
manuel.montes
f1938a0fdb Agent filtering by alias 2018-07-23 11:52:17 +02:00
vgilc
44ad0c31d5 Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop'
Add items to the view events

See merge request artica/pandorafms!1623
2018-07-23 11:22:23 +02:00
daniel
f05ba656e1 add functions api for policies node 2018-07-23 08:59:08 +02:00
artica
63cc7aab9c Auto-updated build strings. 2018-07-23 00:01:23 +02:00
artica
435d44a1ca Auto-updated build strings. 2018-07-22 00:01:23 +02:00
artica
f67616a807 Auto-updated build strings. 2018-07-21 00:01:27 +02:00
vgilc
749a19eec5 Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop'
Fixed question mark hel header meta

See merge request artica/pandorafms!1625
2018-07-20 14:43:42 +02:00
fermin831
3c99242508 Improved metaconsole sync (added centralized management) 2018-07-20 14:10:31 +02:00
Ramon Novoa
d102a588eb Add module data and status information to events. 2018-07-20 13:50:56 +02:00
fermin831
cb0351de99 Fixed question mark hel header meta 2018-07-20 12:29:34 +02:00
Ramon Novoa
34639ac5c4 Do not update tagente_estado when processing out-of-order data.
Ref pandora_enterprise#6120.
2018-07-20 10:41:16 +02:00
artica
0557ecb508 Auto-updated build strings. 2018-07-20 00:01:30 +02:00
manuel.montes
b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
vgilc
0873d7dd1d Merge branch '0000-minor-fix-migrate-logs' into 'develop'
Minor fix migrate_logs.pl no ticket

See merge request artica/pandorafms!1622
2018-07-19 16:45:29 +02:00
fbsanchez
82f3678fdd Minor fix migrate_logs.pl no ticket 2018-07-19 16:38:15 +02:00
vgilc
99773177dd Merge branch 'ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola' into 'develop'
Resolve "[UE] Mejoras en gestion de politicas desde Metaconsola"

See merge request artica/pandorafms!1604
2018-07-19 14:22:40 +02:00
alejandro-campos
b5c378d589 fixed bug in meta alert view: action field (other than default) not showing 2018-07-19 13:55:16 +02:00
fermin831
e762b7322c Fixed detection disabled on serialized ajax get groups and clean call in metaconsole 2018-07-19 13:49:51 +02:00
fermin831
2d45c0b39f Added serialized to groups ajax calls 2018-07-19 11:02:20 +02:00
danielmaya
c09a91b284 Added server-name in tautoconfig_rules 2018-07-19 08:35:33 +02:00
artica
a21892855a Auto-updated build strings. 2018-07-19 00:01:32 +02:00
fermin831
58d092ec03 Delete unwanted column 2018-07-18 19:21:58 +02:00