Daniel Rodriguez
a2eb62150c
Merge branch 'ent-7508-Macro-timestamp-en-alertas-unknown-no-funciona' into 'develop'
...
fixed bug in unknown alerts
See merge request artica/pandorafms!4179
2021-06-21 10:15:15 +00:00
Daniel Rodriguez
7b7265baa5
Merge branch 'ent-7179-cli-update-agent-duplica-referencias-ip' into 'develop'
...
Fixed CLI update_agent adding duplicate agent address references
See merge request artica/pandorafms!4010
2021-06-21 09:30:17 +00:00
Daniel Rodriguez
acfa36b380
Merge branch 'ent-7286-Líneas-en-pandora-server-error-con-check_string' into 'develop'
...
Ent 7286 líneas en pandora server error con check string
See merge request artica/pandorafms!4208
2021-06-21 09:09:52 +00:00
fbsanchez
d22cdf027c
Empty variables also translates macros
2021-06-21 10:06:03 +02:00
fbsanchez
6d67a03b78
Merge remote-tracking branch 'origin/develop' into ent-7559-11881-limitacion-en-macro-_snmp_fx_
2021-06-21 10:03:46 +02:00
artica
447d463518
Auto-updated build strings.
2021-06-21 01:00:36 +02:00
artica
dd5e7e550d
Auto-updated build strings.
2021-06-20 01:00:37 +02:00
artica
682a977ef1
Auto-updated build strings.
2021-06-19 01:00:49 +02:00
Daniel Barbero Martin
1e183c2b60
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-18 08:49:57 +02:00
artica
0c1918eb3c
Auto-updated build strings.
2021-06-18 01:00:44 +02:00
Ramon Novoa
8d5acc0d74
Improvements to the SNMP Console.
...
Add several improvements to the SNMP Console:
- Source-based locking.
- Server-specific 'threshold'.
- Other small improvements.
Ref. pandora_enterprise#7635.
2021-06-17 18:59:10 +02:00
Daniel Barbero Martin
50c7394e7d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-17 08:23:46 +02:00
artica
e5cbcd070b
Auto-updated build strings.
2021-06-17 01:00:42 +02:00
Daniel Barbero Martin
841842da59
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/pandoradb_data.sql
2021-06-16 08:46:21 +02:00
artica
90905d72f5
Auto-updated build strings.
2021-06-16 01:00:23 +02:00
Daniel Maya
38ad3574f3
scape meta characters
2021-06-15 15:57:13 +02:00
Daniel Rodriguez
9fcde88ebf
Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop'
...
pandora_ha enterprise components fixed
See merge request artica/pandorafms!4202
2021-06-15 13:11:21 +00:00
fbsanchez
c009451d62
Fulfill all variables FX from SNMPTRAP alerts
2021-06-15 13:06:23 +02:00
Daniel Barbero Martin
9e6f3f7b46
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-15 10:35:50 +02:00
artica
2f0cebe979
Auto-updated build strings.
2021-06-15 01:00:51 +02:00
fbsanchez
7e5a082e22
pandora_ha enterprise components fixed
2021-06-14 19:29:24 +02:00
fbsanchez
04a9b10904
Pandora HA verified
2021-06-14 19:18:45 +02:00
fbsanchez
94cd4c96dd
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
Daniel Rodriguez
08011d60b2
Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
...
Embebed UMC in Pandora FMS
See merge request artica/pandorafms!3894
2021-06-14 11:56:43 +00:00
fbsanchez
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Daniel Rodriguez
42f5727b18
Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop'
...
Avoid die while decoding erroneus json data
See merge request artica/pandorafms!4116
2021-06-14 11:39:41 +00:00
Daniel Barbero Martin
a7c1c49636
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-14 08:42:31 +02:00
artica
595fabb232
Auto-updated build strings.
2021-06-14 01:00:18 +02:00
artica
e7a204d6d8
Auto-updated build strings.
2021-06-13 01:00:16 +02:00
artica
8272eb4f5b
Auto-updated build strings.
2021-06-12 01:00:21 +02:00
fbsanchez
86f2beb587
Agent collection synchronization aysnc some improvements
2021-06-11 13:55:18 +02:00
Daniel Barbero Martin
75b889875e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-11 08:41:23 +02:00
artica
876e776d29
Auto-updated build strings.
2021-06-11 01:00:09 +02:00
fbsanchez
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
fbsanchez
f6f0d35a5f
Collections Async synchronization Meta <=> Nodes
2021-06-10 21:36:54 +02:00
artica
ace916bc8e
Updated version and build strings.
2021-06-10 17:12:11 +02:00
Marcos Alconada
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
Daniel Barbero Martin
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02:00
artica
5ad364cc4a
Auto-updated build strings.
2021-06-10 01:00:20 +02:00
Daniel Rodriguez
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
Daniel Barbero Martin
e54fde338d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-09 08:22:04 +02:00
artica
2953870e4f
Auto-updated build strings.
2021-06-09 01:00:20 +02:00
alejandro.campos@artica.es
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
Daniel Rodriguez
4fa8e5cf29
Merge branch 'ent-7617-macro-address-no-funciona-en-modulos-de-red' into 'develop'
...
Fixed macro address on network server modules
See merge request artica/pandorafms!4170
2021-06-08 10:53:15 +00:00
Luis
72cb359133
Fixed macro address on network server modules
2021-06-08 10:53:15 +00:00
Daniel Barbero Martin
df2f72cce3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-08 08:22:16 +02:00
artica
a63a4efb71
Auto-updated build strings.
2021-06-08 01:00:20 +02:00
alejandro.campos@artica.es
eb87406e58
fixed bug in unknown alerts
2021-06-07 15:22:20 +02:00
Daniel Barbero Martin
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
artica
bc6b4acd8b
Auto-updated build strings.
2021-06-07 01:00:19 +02:00
artica
656105cdf0
Auto-updated build strings.
2021-06-06 01:00:14 +02:00
artica
2513693ada
Auto-updated build strings.
2021-06-05 01:00:19 +02:00
Daniel Barbero Martin
ca59034cf3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-04 08:13:20 +02:00
artica
8976ec4b6e
Auto-updated build strings.
2021-06-04 01:00:19 +02:00
fbsanchez
423a46af8c
Avoid mark as crashed satellite_server
2021-06-03 10:29:49 +02:00
Daniel Barbero Martin
030a4fed6a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-03 08:15:30 +02:00
artica
e1ae9d7908
Auto-updated build strings.
2021-06-03 01:00:17 +02:00
Daniel Barbero Martin
18f414ce5b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 08:09:32 +02:00
artica
2a5b5591a3
Auto-updated build strings.
2021-06-02 01:00:45 +02:00
Daniel Barbero Martin
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
artica
b0e3b0aa24
Auto-updated build strings.
2021-06-01 01:00:09 +02:00
Daniel Barbero Martin
33618af381
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-31 08:40:09 +02:00
artica
ff3eb72420
Auto-updated build strings.
2021-05-31 01:00:34 +02:00
artica
20d3399d39
Auto-updated build strings.
2021-05-30 01:00:20 +02:00
artica
ec8ffea249
Auto-updated build strings.
2021-05-29 01:00:10 +02:00
Daniel Barbero Martin
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
artica
059b14dbf6
Auto-updated build strings.
2021-05-28 01:00:43 +02:00
Daniel Barbero Martin
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
artica
9103f671e2
Auto-updated build strings.
2021-05-27 01:00:43 +02:00
Daniel Barbero Martin
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
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
03e857ffc8
Wip command center
2021-05-20 17:36:01 +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 Rodriguez
22fa755fc3
Merge branch 'ent-7527-problemas-pandora_revent' into 'develop'
...
Fixed issues with https calls
Closes pandora_enterprise#7527
See merge request artica/pandorafms!4128
2021-05-19 16:02:34 +00:00
José González
e0ec645613
Fixed issue with last hash symbol
2021-05-19 15:22:24 +02:00
José González
45b5ab4589
Added separator control
2021-05-19 12:40:06 +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
José González
5342ae077c
id_agent default value
2021-05-18 15:27:45 +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
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 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 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 6b0aa45ebc
.
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
b70a056dc5
Avoid offline components to be marked as failed
2021-05-14 13:07:56 +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
José González
0633ac24b9
Fixed issues with https calls
2021-05-13 16:43:18 +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 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
16c40c3ed4
Merge branch '7027-log-rotate-para-el-log-de-snmpd-de-las-traps' into 'develop'
...
Add a comment regarding snmp_logfile.
See merge request artica/pandorafms!4122
2021-05-12 15:56:45 +00: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
Ramon Novoa
47c73518bd
Add a comment regarding snmp_logfile.
...
There's an entry for pandora_snmptrap.log in
/etc/logrotate.d/pandora_server which should be updated if snmp_logfile
is changed in pandora_server.conf. Ref. pandora_enterprise#7027.
2021-05-11 17:40:15 +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
Daniel Barbero Martin
77693b6c6d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-07 08:33:56 +02:00
artica
454e6120e4
Auto-updated build strings.
2021-05-07 01:00:44 +02:00
Daniel Barbero Martin
d5dcc5bf69
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-06 08:30:30 +02:00
artica
6c87f65367
Auto-updated build strings.
2021-05-06 01:00:44 +02:00
fbsanchez
735df105d3
Mute some license checks while initializing enterprise component (pandora-ha)
2021-05-05 12:40:56 +02:00
artica
20466ec0d1
Auto-updated build strings.
2021-05-05 01:00:40 +02:00
artica
f0f7244d84
Auto-updated build strings.
2021-05-04 01:00:33 +02:00
artica
5461a4391c
Auto-updated build strings.
2021-05-03 01:00:36 +02:00
artica
2494aad730
Auto-updated build strings.
2021-05-02 01:00:30 +02:00
artica
13483e6952
Auto-updated build strings.
2021-05-01 01:00:31 +02:00
artica
c95b629776
Auto-updated build strings.
2021-04-30 01:00:41 +02:00
Daniel Rodriguez
4951552d1d
Merge branch 'ent-7413-filtro-log-agent-alertas-correladas-logs-no-funciona-correctamente' into 'develop'
...
Fix locating agent while correlating logs
See merge request artica/pandorafms!4074
2021-04-29 12:05:10 +00:00
artica
8407c5353f
Auto-updated build strings.
2021-04-29 01:00:46 +02:00
Daniel Rodriguez
2930306767
Merge branch 'ent-7381-comportamiento-extraño-cron-modulos' into 'develop'
...
Improved business logic for cron
See merge request artica/pandorafms!4080
2021-04-28 15:24:47 +00:00
Daniel Rodriguez
9b90039fe2
Merge branch 'ent-7414-rear-eventos-por-cli-metaconsola' into 'develop'
...
fixed error with meta create vent cli
See merge request artica/pandorafms!4079
2021-04-28 14:19:21 +00:00