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,020 Commits 34 Branches 30 Tags
Commit Graph

28020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Barbero Martin
3eba993c5c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-19 08:36:26 +02:00
artica
f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
fbsanchez
8fc438f913 Fix in item load vc-public link 2021-05-18 18:50:01 +02:00
fbsanchez
074fadda35 Fix in item load vc-public link 2021-05-18 18:49:20 +02:00
Daniel Barbero Martin
6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
José González
91d11bd4cf Controlled pandora_revent with id_agent 0 2021-05-18 16:37:05 +02:00
Daniel Rodriguez
2f6a7143f3 Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop' 
Common requirements using base url

See merge request artica/pandorafms!4137
 2021-05-18 14:33:07 +00:00
José González
5342ae077c id_agent default value 2021-05-18 15:27:45 +02:00
José González
46e0cbca70 id_agent control for pandora_revent 2021-05-18 14:52:23 +02:00
José González
e5ebc52356 Fixed missed parameter 2021-05-18 13:32:10 +02:00
fbsanchez
876e3dd191 Minor fix - linter return type in comments set to mixed 2021-05-18 13:27:56 +02:00
fbsanchez
0d50ea94db Ensure oid starts with dot - braa requriements 2021-05-18 13:27:06 +02:00
marcos
1650da0f75 cambio de fuentes cssç 2021-05-18 13:07:08 +02:00
marcos
7a2f7d7c63 cambio de fuentes cssç 2021-05-18 12:35:00 +02:00
Rafael Ameijeiras
171275200a Merge branch 'ent-7551-add-expect-dependencie-cloudinstaller' into 'develop' 
adding expect to be used with ssh modules

See merge request artica/pandorafms!4138
 2021-05-18 10:08:49 +00:00
rafael.ameijeiras
b0fbe192a0 adding expect to be used with ssh modules 2021-05-18 11:43:43 +02:00
Daniel Barbero Martin
5d70226b13 fix category, Os, tags, user_edit synch 2021-05-18 11:02:00 +02:00
marcos
ad19bfb5c8 cambio de fuentes css 2021-05-18 10:58:03 +02:00
Daniel Barbero Martin
ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
fbsanchez
9666b76fa9 Common requirements using base url 2021-05-18 10:56:40 +02:00
José González
5cdc0b8a14 Code review 2021-05-18 10:52:39 +02:00
José González
be6269fc89 Code review 2021-05-18 10:25:45 +02:00
marcos
3136ee7de7 cambio de fuentes css 2021-05-18 09:50:27 +02:00
Daniel Barbero Martin
a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
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