30041 Commits

Author SHA1 Message Date
marcos
3ab970ced9 fixed visual error on tm 2021-04-20 12:41:21 +02:00
Daniel Maya
a05c5cf555 #6618 Added random name css 2021-04-20 11:46:33 +02:00
alejandro.campos@artica.es
c3313848bd Added new field in api call 2021-04-20 11:36:26 +02:00
fbsanchez
c601bde472 Dump autoload updated 2021-04-20 11:10:38 +02:00
fbsanchez
36df48c621 Some improvements in Group class 2021-04-20 11:09:07 +02:00
vgilc
d380e2cd45 Merge branch 'ent-7320-11651-creacion-masiva-de-xml-incorrectos-con-servidor-develop' into 'develop'
Ent 7320 11651 creacion masiva de xml incorrectos con servidor develop

See merge request artica/pandorafms!4038
2021-04-20 08:55:21 +00:00
vgilc
3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop'
reviewing correlated alerts

See merge request artica/pandorafms!4024
2021-04-20 07:56:04 +00:00
vgilc
a990689e59 Merge branch 'ent-7268-Falla-sincronizacion-de-inventario-Integria-Pandora' into 'develop'
changed request protocol

See merge request artica/pandorafms!4033
2021-04-20 07:31:13 +00:00
vgilc
55677850a6 Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop'
fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
2021-04-20 07:30:11 +00:00
Daniel Barbero Martin
b8b9fa561f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-20 08:07:21 +02:00
artica
20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
fbsanchez
7275bdd061 Allow transfer_xml direct file paths in pluginTools 2021-04-19 18:11:34 +02:00
Rafael Ameijeiras
13b517718f Merge branch 'ent-7057-installer-agent-cloud' into 'develop'
adding support for Amazon linux rpm based distro

See merge request artica/pandorafms!4037
2021-04-19 15:44:32 +00:00
rafael.ameijeiras
afc221bbea adding support for Amazon linux rpm based distro 2021-04-19 17:42:02 +02:00
artica
3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
fbsanchez
0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez
50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos
4655668ca4 fixeed visual error vc legacy mode 2021-04-19 14:16:30 +02:00
marcos
6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez
71af7103d1 Merge branch 'ent-7267-Fallo-al-meter-comentario-en-ticket-desde-pandora-integracion-integria-pandora' into 'develop'
fixed bug on integria api calls

See merge request artica/pandorafms!4034
2021-04-19 07:19:15 +00:00
Daniel Rodriguez
59ec6c850d Merge branch 'ent-6387-limitar-agentes-por-grupo' into 'develop'
Added control for max agents in groups

Closes pandora_enterprise#6387

See merge request artica/pandorafms!3800
2021-04-19 07:17:56 +00:00
Daniel Barbero Martin
0966d3d662 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-19 08:42:46 +02:00
artica
08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica
1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica
9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
Calvo
256d4333c6 Fixed encoding ampersand on mail alerts 2021-04-16 15:36:12 +02:00
alejandro.campos@artica.es
2732c6db1c fixed bug in api call 2021-04-16 11:22:29 +02:00
alejandro.campos@artica.es
3ff361977c check page load protocol on integria setup 2021-04-16 10:02:34 +02:00
Jose Gonzalez
8e503086a2 Event type changed 2021-04-16 09:51:11 +02:00
Rafael Ameijeiras
6a8126e601 Merge branch 'ent-7057-installer-agent-cloud' into 'develop'
agent installer cloud v1

See merge request artica/pandorafms!3856
2021-04-16 07:43:59 +00:00
rafael.ameijeiras
40055c595a change, print message 2021-04-16 09:40:03 +02:00
Jose Gonzalez
494666244d Fixed stupid bug 2021-04-16 09:10:38 +02:00
Daniel Barbero Martin
004b73f63d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-16 08:29:11 +02:00
artica
f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
Jose Gonzalez
0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez
93d70da822 Modified function 2021-04-15 21:20:34 +02:00
Ramon Novoa
4d1a0d9ef4 Merge remote-tracking branch 'origin/develop' into ent-5620-nuevo-compilador-para-backend 2021-04-15 18:16:41 +02:00
Ramon Novoa
8edaad4e5a Push /usr/lib/perl5 to the back of the module search path.
When /usr/lib/perl5 is added to the front of the module search path it
takes precedence over libraries distributed with binary versions of
Pandora FMS. This can be fixed by pushing it to the back instead.
2021-04-15 17:56:02 +02:00
Daniel Barbero Martin
741ec6a144 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 17:41:56 +02:00
Daniel Rodriguez
8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop'
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
2021-04-15 14:53:32 +00:00
Jose Gonzalez
a6936f16d5 Cleaned event create control for centralized management 2021-04-15 15:50:10 +02:00
fbsanchez
3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Jose Gonzalez
3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Daniel Rodriguez
5fbd209a73 Merge branch 'ent-1516-dias-de-la-semana-aparecen-siempre-en-ingles' into 'develop'
fixed error with weeckly days sla

See merge request artica/pandorafms!3951
2021-04-15 12:37:38 +00:00
Marcos Alconada
798c1d060f fixed error with weeckly days sla 2021-04-15 12:37:38 +00:00
Daniel Rodriguez
4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop'
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
2021-04-15 12:36:58 +00:00
marcos
e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
alejandro.campos@artica.es
8021b53763 fixed bug on integria api calls 2021-04-15 13:46:28 +02:00
Daniel Rodriguez
a2f5fd4325 Merge branch 'ent-7306-ventana-modal-con-errores-visuales-en-alerts-command' into 'develop'
minnor error fixed

See merge request artica/pandorafms!4032
2021-04-15 10:33:31 +00:00
Marcos Alconada
317bf0da3d minnor error fixed 2021-04-15 10:33:31 +00:00