tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-16 07:18:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
29,719 Commits 34 Branches 30 Tags
Commit Graph

29719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
alejandro.campos@artica.es
ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Jose Gonzalez
a69666aad9 Added Event class 2021-04-15 12:00:32 +02:00
Jose Gonzalez
ff177c544d Modified and adapted Event class 2021-04-15 12:00:00 +02:00
marcos
24099644be remove log 2021-04-15 11:22:24 +02:00
fbsanchez
2e45e0bde4 Fixes in table tevent_rule definition 2021-04-15 10:35:21 +02:00
Daniel Barbero Martin
c28ea4cc9a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 08:40:58 +02:00
artica
fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
fbsanchez
21d72f41f9 Revert "Revert "Update tevent_rule schema"" 
This reverts commit 2b05cde214c4cd3ebbdf4192aea0358f1a0d6528.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-15 00:20:42 +02:00
fbsanchez
114f23f474 Added event_server_cache_ttl 2021-04-14 22:36:56 +02:00
fbsanchez
2b05cde214 Revert "Update tevent_rule schema" 
This reverts commit a80e50b7301858ff5e98a3a5c5e705a30731a8a8.

 Changes to be committed:
	modified:   pandora_console/extras/mr/46.sql
	modified:   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	modified:   pandora_console/pandoradb.sql
 2021-04-14 21:42:19 +02:00
fbsanchez
a80e50b730 Update tevent_rule schema 2021-04-14 21:39:58 +02:00
Daniel Rodriguez
a93a3b7967 Merge branch 'ent-6933-fix-inconsistency-in-alerts-group-profiles-revised' into 'develop' 
Fixed and improved alert functions.

See merge request artica/pandorafms!3957
 2021-04-14 13:15:29 +00:00
marcos
48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
Jose Gonzalez
f684cef491 Changed audit log for event and refactor 2021-04-14 12:16:28 +02:00
marcos
b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez
daf44e6a42 Merge branch 'ent-fix-improve-cli-profile' into 'develop' 
Fixed and improved profile related CLIs.

See merge request artica/pandorafms!4029
 2021-04-14 09:56:07 +00:00
Daniel Rodriguez
1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
fbsanchez
3dc49bea23 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-14 09:38:44 +02:00
Calvo
3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
Daniel Barbero Martin
1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +02:00
Junichi Satoh
56ff245675 Fixed the order of arguments in 'create_profile' as the same as comment in pandora_manage.pl and documentation, and fixed 'profile_name' was not encoded. 
Plus, added new cli, 'update_profile'.
 2021-04-14 11:07:13 +09:00
artica
46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00