tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-20 09:18:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,072 Commits 34 Branches 30 Tags
Commit Graph

4619 Commits

Author SHA1 Message Date
artica
22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Barbero Martin
933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica
f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
artica
3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica
5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica
01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Barbero Martin
5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica
f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin
73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
artica
63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
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
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 Maya
fd372d53d1 Ent 6978 umbrales inversos fallan 2021-05-17 13:00:59 +00: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
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
Ramon Novoa
439bc2405c Add SSL support for database connections. 
Ref. pandora_enterprise#4759.
 2021-05-17 13:12:42 +02: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
fbsanchez
b3ac981681 Gracefully stop pandorafms threads 2021-05-14 12:43:18 +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
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
Daniel Rodriguez
13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
Daniel Rodriguez
6aa1188d35 Merge branch 'ent-7111-acciones-alertas-snmp-no-se-guardan' into 'develop' 
Added missing fields to alert snmp actions

See merge request artica/pandorafms!3927
 2021-05-12 12:54:37 +00:00
Luis
7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
Ramon Novoa
3cfb07a36f Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:18:30 +02:00
Ramon Novoa
83822395f6 Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:01:52 +02:00
José González
90573feb1b Issue with Perl5 paths 2021-05-12 09:35:35 +02:00
Daniel Barbero Martin
ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
artica
671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
José González
5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez
fc4d3b7d23 Merge branch 'ent-7302-bug-en-macro-moduledata-x' into 'develop' 
Fixed encoding ampersand on mail alerts

See merge request artica/pandorafms!4035
 2021-05-11 09:44:15 +00:00
Daniel Barbero Martin
c19e398057 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-11 07:37:56 +02:00
artica
6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
Ramon Novoa
6939ec4d44 Unify the format of product version messages. 2021-05-10 17:58:17 +02:00
Daniel Rodriguez
847b567f5c Merge branch 'ent-7516-warnings-en-ejecuccion-de-vmware-plugin-pl' into 'develop' 
avoid warnings in old perl versions

See merge request artica/pandorafms!4114
 2021-05-10 11:06:45 +00:00
Daniel Rodriguez
c6068a8544 Merge branch 'ent-7113-warning-ejecucion-erronea-pandora_server' into 'develop' 
Fixed issue with execution without correct params

Closes pandora_enterprise#7113

See merge request artica/pandorafms!3989
 2021-05-10 08:53:21 +00:00
Daniel Barbero Martin
2240f71c0c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-10 08:40:59 +02:00
artica
dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica
fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica
68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
fbsanchez
d160737fb2 Avoid die while decoding erroneus json data 2021-05-07 14:15:16 +02:00
fbsanchez
a5c5a30bde avoid warnings in old perl versions 2021-05-07 14:01:42 +02:00