tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,300 Commits 34 Branches 30 Tags
Commit Graph

28300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artica
739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Barbero Martin
4c12c6e770 fix profiles and user synch 2021-05-17 17:57:08 +02:00
Daniel Rodriguez
b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
Daniel Rodriguez
7244100737 Merge branch 'ent-6978-umbrales-inversos-fallan' into 'develop' 
Ent 6978 umbrales inversos fallan

See merge request artica/pandorafms!3949
 2021-05-17 13:00:59 +00:00
Daniel Maya
fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00:00
fbsanchez
4f7ec16467 avoid maintenance warning 2021-05-17 14:37:01 +02:00
alejandro.campos@artica.es
663d1dcf75 minor fix 2021-05-17 13:43:20 +02:00
Ramon Novoa
ecdd28fe0a Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:37:36 +02:00
Ramon Novoa
c3d81b7d4b Revert "Do not enforce SSL." 
This reverts commit 6b0aa45ebc77be5dd54524e50c3c215c1729b030.
 2021-05-17 13:36:58 +02:00
José González
7617330e93 Added agent regex to console task template send email 2021-05-17 13:31:46 +02:00
Ramon Novoa
6b0aa45ebc Do not enforce SSL. 
Enforcing SSL (mysql_ssl_optional=0) does not work with the version of
DBD::mysql used to generate Pandora FMS binaries.
 2021-05-17 13:21:16 +02:00
Daniel Rodriguez
9d6d84ab6b Merge branch 'ent-5321-9399-error-agente-ssl-proxy-mode' into 'develop' 
Ent 5321 9399 error agente ssl proxy mode

See merge request artica/pandorafms!4124
 2021-05-17 11:20:44 +00:00
Ramon Novoa
439bc2405c Add SSL support for database connections. 
Ref. pandora_enterprise#4759.
 2021-05-17 13:12:42 +02:00
marcos
3061eef783 cambio de fuentes css 2021-05-17 13:05:31 +02:00
fbsanchez
818186ff28 DB updates - syncqueue 2021-05-17 12:57:15 +02:00
marcos
8d885772f3 cambio de fuentes css 2021-05-17 12:50:04 +02:00
Daniel Barbero Martin
bc6a838ebb WIP command center, fix view synch queue 2021-05-17 12:35:29 +02:00
Daniel Rodriguez
a6f41ede3d Merge branch 'ent-7521-Dynamic-Threshold-max-desactivado-por-error' into 'develop' 
Fixed issue with undesired deactivate dynamic threshold max field

Closes pandora_enterprise#7521

See merge request artica/pandorafms!4130
 2021-05-17 08:07:11 +00:00
Daniel Rodriguez
8b704cb2c1 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas-2' into 'develop' 
new bell orange

See merge request artica/pandorafms!4131
 2021-05-17 08:06:37 +00:00
Daniel Barbero Martin
1526dac01d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-17 08:35:52 +02:00
artica
d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica
8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica
bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
alejandro.campos@artica.es
1c1e25e712 Added new item type in reports 2021-05-14 14:54:09 +02:00
fbsanchez
b70a056dc5 Avoid offline components to be marked as failed 2021-05-14 13:07:56 +02:00
marcos
507faa52e1 cambio de fuentes css 2021-05-14 12:44:33 +02:00
fbsanchez
b3ac981681 Gracefully stop pandorafms threads 2021-05-14 12:43:18 +02:00
marcos
9cde309222 new bell orange 2021-05-14 11:58:08 +02:00
marcos
660c7292a5 cambio de fuentes css 2021-05-14 11:53:46 +02:00
Daniel Rodriguez
203310d13b Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop' 
remove vamos a ver

See merge request artica/pandorafms!4126
 2021-05-14 09:39:07 +00:00
Daniel Rodriguez
823eb96d47 Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas' into 'develop' 
changed bell orange

See merge request artica/pandorafms!4127
 2021-05-14 09:38:47 +00:00
Daniel Rodriguez
5b2c340163 Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' 
Create interface views

See merge request artica/pandorafms!4023
 2021-05-14 09:37:48 +00:00
José González
998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +02:00
alejandro.campos@artica.es
2c065d6f38 visual fix 2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es
86447e2a0b visual fix 2021-05-14 10:10:42 +02:00
Daniel Barbero Martin
3f509ebd09 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-14 08:36:58 +02:00
artica
9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
José González
0633ac24b9 Fixed issues with https calls 2021-05-13 16:43:18 +02:00
alejandro.campos@artica.es
1a194e1644 minor change 2021-05-13 14:10:42 +02:00
alejandro.campos@artica.es
b52f971262 minor change 2021-05-13 14:06:54 +02:00
alejandro.campos@artica.es
172afc9070 minor change 2021-05-13 13:40:09 +02:00
Alejandro Campos
caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es
9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez
3a76d6e680 Merge branch 'ent-7156-eliminar-agente-desde-meta-no-borra-ficheros' into 'develop' 
Added comments header and improve code

Closes pandora_enterprise#7156

See merge request artica/pandorafms!3986
 2021-05-13 11:14:44 +00:00
marcos
40cfe62e96 changed bell orange 2021-05-13 13:14:16 +02:00
marcos
d711d71392 remove vamos a ver 2021-05-13 13:09:42 +02:00
marcos
f82efa439f cambio de fuentes css 2021-05-13 13:07:51 +02:00
Daniel Maya
a869e0749c #7505 fixed fixed Hirearchy 2021-05-13 10:11:58 +02:00
Daniel Barbero Martin
5b376568a4 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/47.sql
 2021-05-13 08:25:59 +02:00
artica
afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00