alejandro.campos@artica.es
39920692ef
Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional
2022-12-09 12:49:04 +01:00
artica
f2ad934c92
Auto-updated build strings.
2022-12-09 01:00:14 +01:00
artica
7cba39d358
Auto-updated build strings.
2022-12-08 01:00:15 +01:00
artica
4f194134cc
Auto-updated build strings.
2022-12-07 01:00:41 +01:00
artica
0f9977acca
Auto-updated build strings.
2022-12-06 01:00:13 +01:00
Rafael Ameijeiras
e3c46ab7d6
Merge branch 'ent-9968-proceso-snmptrapd-se-muere-a-los-pocos-segundos-de-iniciarse-en-v766' into 'develop'
...
Control the destructor of the SNMPServer when running parallel queries.
See merge request artica/pandorafms!5312
2022-12-05 12:29:46 +00:00
artica
d91ba1b4e1
Auto-updated build strings.
2022-12-05 01:00:14 +01:00
artica
c9f1cd6566
Auto-updated build strings.
2022-12-04 01:00:15 +01:00
artica
30a4e4af3a
Auto-updated build strings.
2022-12-03 01:00:16 +01:00
Ramon Novoa
ca8bc2d29a
Control the destructor of the SNMPServer when running parallel queries.
2022-12-02 11:46:06 +01:00
KANAYAMA Akihiro
028176e58d
Fixed const UNKNOWN_DUPLEX
...
Changed the condition to switch x86 or x64
Added conditions in sub prepare_tree when snmp_get returns empty array
Fixed "Calculate summary" to sum up each value
Adjusted indents
2022-12-02 16:20:21 +09:00
artica
0eead22fdf
Auto-updated build strings.
2022-12-02 01:00:15 +01:00
artica
7f694195e9
Auto-updated build strings.
2022-12-01 01:00:49 +01:00
artica
a91546f51b
Auto-updated build strings.
2022-11-30 01:00:15 +01:00
artica
ab2a00b248
Auto-updated build strings.
2022-11-29 13:19:26 +01:00
artica
58ecdbd18e
Updated version and build strings.
2022-11-29 13:18:16 +01:00
artica
64101bc837
Auto-updated build strings.
2022-11-29 01:00:19 +01:00
SHIMIZU Hiroki
d6af3c7121
On pandora_server/util/plugin/pandora_snmp_bandwidth.pl
...
fixed typo (bandwith -> bandwidth)
added new condition to determine if SNMP has a 64-bit counter
fixed a bug that bandwidth utilization was not output when bandwidth utilization was 0%
2022-11-28 11:40:45 +09:00
artica
c8df0dec0c
Auto-updated build strings.
2022-11-28 01:00:16 +01:00
artica
ca566d6d9b
Auto-updated build strings.
2022-11-27 01:00:16 +01:00
artica
f047f8bb14
Auto-updated build strings.
2022-11-26 01:00:19 +01:00
artica
a276816bde
Auto-updated build strings.
2022-11-25 01:00:18 +01:00
artica
38259c9f8d
Auto-updated build strings.
2022-11-24 01:00:20 +01:00
Jimmy Olano
f21ae033fc
Merge branch 'ent-9678-14393-macros-_time_down_human_-_time_down_seconds_-no-funcionan-bien' into 'develop'
...
Ent 9678 14393 macros time down human time down seconds no funcionan bien
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9678
See merge request artica/pandorafms!5213
2022-11-23 18:12:08 +00:00
alejandro.campos@artica.es
cdddc07b86
changed mr
2022-11-23 12:22:19 +01:00
artica
2ef560d1a9
Auto-updated build strings.
2022-11-23 01:00:20 +01:00
Daniel Rodriguez
189afcd68a
Merge branch 'ent-9513-14183-snmp_storm_protection-no-funciona-correctamente' into 'develop'
...
Ent 9513 14183 snmp storm protection no funciona correctamente
See merge request artica/pandorafms!5247
2022-11-22 14:01:34 +00:00
artica
542de85ba0
Auto-updated build strings.
2022-11-22 01:00:42 +01:00
artica
a48e677b80
Auto-updated build strings.
2022-11-21 01:00:24 +01:00
artica
30768ca654
Auto-updated build strings.
2022-11-20 01:00:32 +01:00
artica
ffacefa06e
Auto-updated build strings.
2022-11-19 01:00:45 +01:00
artica
616efb0f7d
Auto-updated build strings.
2022-11-18 01:00:19 +01:00
artica
b6055908ae
Auto-updated build strings.
2022-11-17 01:00:19 +01:00
Daniel Rodriguez
9eb3bfb35d
Merge branch 'ent-9786-Warnings-en-pandora-server-error' into 'develop'
...
fixed minor issues
See merge request artica/pandorafms!5270
2022-11-16 11:23:26 +00:00
alejandro.campos@artica.es
0af20e03e2
fixed minor issues
2022-11-16 09:41:27 +01:00
artica
a225b1dd61
Auto-updated build strings.
2022-11-16 01:01:07 +01:00
artica
2e7d5aa336
Auto-updated build strings.
2022-11-15 01:00:22 +01:00
Daniel Rodriguez
335d895aa3
Merge branch 'ent-9742-correlacion-de-eventos-no-funciona-con-eventos-de-nodo' into 'develop'
...
Ent 9742 correlacion de eventos no funciona con eventos de nodo
See merge request artica/pandorafms!5253
2022-11-14 11:07:51 +00:00
Ramon Novoa
fbc1c5056b
Ignore disabled nodes.
2022-11-14 09:16:54 +01:00
artica
4ecc5b9912
Auto-updated build strings.
2022-11-14 01:00:18 +01:00
artica
283f062646
Auto-updated build strings.
2022-11-13 01:00:18 +01:00
artica
24ee24be32
Auto-updated build strings.
2022-11-12 01:00:23 +01:00
alejandro.campos@artica.es
6a173664d4
Removed transactional server
2022-11-11 12:09:03 +01:00
artica
a8bb6706ca
Auto-updated build strings.
2022-11-11 01:00:22 +01:00
artica
240bab48ec
Auto-updated build strings.
2022-11-10 01:00:19 +01:00
artica
dfe35f2819
Auto-updated build strings.
2022-11-09 01:00:21 +01:00
artica
94ba216f81
Updated version and build strings.
2022-11-08 13:01:55 +01:00
artica
778501d4bf
Auto-updated build strings.
2022-11-08 01:00:31 +01:00
Ramon Novoa
891787ae63
Merge remote-tracking branch 'origin/develop' into ent-9742-correlacion-de-eventos-no-funciona-con-eventos-de-nodo
2022-11-07 20:52:33 +01:00
Ramon Novoa
2a8782b73e
Add support for parallel queries.
2022-11-07 20:52:12 +01:00
Daniel Rodriguez
d989c68469
Merge branch 'ent-9470-bug-omnishell_client-pl-al-definir-timeouts' into 'develop'
...
Ent 9470 bug omnishell client pl al definir timeouts
See merge request artica/pandorafms!5243
2022-11-07 16:14:24 +00:00
Daniel Rodriguez
7646f0629b
Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop'
...
multiple external alert policies pandora_enterprise#8733
See merge request artica/pandorafms!5205
2022-11-07 12:44:23 +00:00
artica
883b2067db
Auto-updated build strings.
2022-11-07 01:00:19 +01:00
artica
f05015ab16
Auto-updated build strings.
2022-11-06 01:00:18 +01:00
artica
5c7862c4e1
Auto-updated build strings.
2022-11-05 01:00:22 +01:00
Daniel Barbero
65ac6b38fb
fixed CLI add comments pandora_enterprise#9721
2022-11-04 12:36:44 +01:00
edu.corral
341fe37def
ent 7914 status scaling based on time
2022-11-04 12:13:38 +01:00
artica
dce2b3f915
Auto-updated build strings.
2022-11-04 01:00:24 +01:00
Daniel Rodriguez
635533d763
Merge branch 'ent-9184-Notificaciones-sincronización-de-traps' into 'develop'
...
Added feature for create event and notify where snmptrapd is stuck
See merge request artica/pandorafms!5186
2022-11-03 16:40:46 +00:00
José González
d1305c4812
Update pandora_server/lib/PandoraFMS/Core.pm
2022-11-03 15:49:05 +00:00
Daniel Maya
fdb4540fd0
#9513 Fixed storm_protection with snmp_lock
2022-11-03 16:17:12 +01:00
jose.gonzalez@pandorafms.com
b3cac09d0c
Mistake solved
2022-11-03 14:25:05 +01:00
Daniel Rodriguez
cd0839d688
Merge branch 'ent-9521-Problema-conexión-Mysql-SSL-Azure' into 'develop'
...
Ent 9521 problema conexión mysql ssl azure
See merge request artica/pandorafms!5164
2022-11-03 11:55:08 +00:00
jose.gonzalez@pandorafms.com
db09df249a
Fix
2022-11-03 12:29:37 +01:00
Ramon Novoa
de9d556702
Minor style corrections.
2022-11-03 11:18:09 +01:00
artica
08f0d416cd
Auto-updated build strings.
2022-11-03 01:00:24 +01:00
jose.gonzalez@pandorafms.com
4d2ef83366
Fix
2022-11-02 15:58:24 +01:00
jose.gonzalez@pandorafms.com
eb2d4e5de7
Fix
2022-11-02 15:41:05 +01:00
jose.gonzalez@pandorafms.com
1d04f777e2
Fix mistake
2022-11-02 15:18:33 +01:00
edu.corral
6a9e30ae6d
ent 7914 status scaling
2022-11-02 12:53:14 +01:00
jose.gonzalez@pandorafms.com
071764bfd3
Fix and added control when snmptraps are not filled
2022-11-02 11:19:44 +01:00
artica
42db6497aa
Auto-updated build strings.
2022-11-02 01:00:18 +01:00
artica
91795a3078
Auto-updated build strings.
2022-11-01 01:00:24 +01:00
Daniel Maya
8971dba9c5
#9447 uncomment
2022-10-31 17:16:08 +01:00
Daniel Maya
f4693b3cba
#9447 Added check_value
2022-10-31 16:59:38 +01:00
Daniel Rodriguez
65048966bf
Merge branch 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas' into 'develop'
...
implemented option to skip inoperative interfaces on demand
See merge request artica/pandorafms!5149
2022-10-31 15:55:29 +00:00
Daniel Barbero
331219ba16
Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
...
Conflicts:
pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Daniel Rodriguez
7baed1dffd
Merge branch 'ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves' into 'develop'
...
Ent 9712 pandora db no se ejecuta cuando pasan politicas pero si al reves
See merge request artica/pandorafms!5234
2022-10-31 11:56:42 +00:00
Daniel Rodriguez
a1210c7814
Merge branch 'ent-9233-Historico-de-traps' into 'develop'
...
implemented trap history
See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Daniel Rodriguez
92b99d0154
Merge branch 'ent-9659-optimizacion-pandora_db' into 'develop'
...
Query performance improvements in pandora_db.
See merge request artica/pandorafms!5211
2022-10-31 10:54:31 +00:00
Alejandro Campos
0889bcf142
Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
...
# Conflicts:
# pandora_console/extras/mr/58.sql
2022-10-31 10:46:44 +00:00
Ramon Novoa
a7331c5603
Merge branch 'ent-test-pandoradb-lock' into ent-9712-pandora_db-no-se-ejecuta-cuando-pasan-politicas-pero-si-al-reves
2022-10-31 10:52:58 +01:00
Ramon Novoa
5cd601b999
Improve the locking mechanism of pandora_db.
2022-10-31 10:16:17 +01:00
artica
1288a3c00b
Auto-updated build strings.
2022-10-31 01:00:17 +01:00
artica
c1290bd7d0
Auto-updated build strings.
2022-10-30 01:00:19 +02:00
artica
0eb3c12cd9
Auto-updated build strings.
2022-10-29 01:00:22 +02:00
jose.gonzalez@pandorafms.com
70aef3220a
Fix
2022-10-28 10:06:38 +02:00
Jimmy Olano
4594fb17e2
Merge branch 'ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos' into 'develop'
...
synch cli with nodes pandora_enterprise#9500
pandora_enterprise#9500
See merge request artica/pandorafms!5198
2022-10-28 01:30:22 +00:00
artica
0da1247d68
Auto-updated build strings.
2022-10-28 01:00:26 +02:00
Ramon Novoa
edc7507a55
Merge remote-tracking branch 'origin/develop' into ent-test-compile-omnishell
2022-10-27 11:51:53 +02:00
Alejandro Campos
9322e5b720
Merge branch 'develop' into 'ent-9376-Discovery-SNMP-Host-Filtro-por-interfaces-no-operativas'
...
# Conflicts:
# pandora_console/extras/mr/58.sql
2022-10-27 09:50:24 +00:00
Ramon Novoa
3e73a52df1
Add pandora_agent_exec.exe to the win32 agent.
2022-10-27 11:47:46 +02:00
Daniel Maya
548308405c
#9447 WIP
2022-10-27 09:40:33 +02:00
artica
bf6f5479e8
Auto-updated build strings.
2022-10-27 01:00:24 +02:00
Daniel Rodriguez
c98c58c157
Merge branch 'ent-9377-14016-inestabilidad-y-borrado-incorrecto-netflow' into 'develop'
...
Fix pandoradb deleting old netflow data
See merge request artica/pandorafms!5055
2022-10-26 12:39:50 +00:00
artica
b1c35e7385
Auto-updated build strings.
2022-10-26 01:00:24 +02:00
Ramon Novoa
9916ba85aa
Add support for warning status escalation to critical.
2022-10-25 20:45:48 +02:00
Daniel Maya
f9b2c9a243
#9678 Fixed _time_down_human_ and _time_down_seconds_
2022-10-25 13:27:49 +02:00
Ramon Novoa
d493eaea12
Query performance improvements in pandora_db.
2022-10-25 12:35:22 +02:00
Diego Muñoz-Reja
a8902fed18
Merge branch 'ent-9316-bug-relacionado-con-los-permisos-en-ruta-de-log-tentacle' into 'develop'
...
Update copies of the Tentacle Server. Small fixes.
See merge request artica/pandorafms!5187
2022-10-25 09:26:47 +00:00
artica
ce4fc25209
Auto-updated build strings.
2022-10-25 01:00:22 +02:00
artica
204d711b30
Auto-updated build strings.
2022-10-24 01:00:19 +02:00
artica
bd0f136dc0
Auto-updated build strings.
2022-10-23 01:00:17 +02:00
artica
4118f7656b
Auto-updated build strings.
2022-10-22 01:00:24 +02:00
artica
e31699eed7
Auto-updated build strings.
2022-10-21 01:00:25 +02:00
Daniel Barbero
688597a006
multiple external alert policies pandora_enterprise#8733
2022-10-20 16:42:26 +02:00
artica
61b3bc724a
Auto-updated build strings.
2022-10-20 01:00:21 +02:00
Ramon Novoa
478fcddd32
Fix the Omnishell timeout implementation.
2022-10-19 19:09:49 +02:00
artica
95c485db38
Auto-updated build strings.
2022-10-19 01:00:22 +02:00
Daniel Barbero
82a3fc1063
Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos
...
Conflicts:
pandora_server/util/pandora_manage.pl
2022-10-18 16:22:53 +02:00
Daniel Barbero
e79394c235
synch cli with nodes pandora_enterprise#9500
2022-10-18 16:14:35 +02:00
Jimmy Olano
9d912c2a6d
Merge branch 'ent-8956-derivado-del-trabajo-q-a-762-lts-cli-perl-al-crear-usuario-inserta-entidades-html-en' into 'develop'
...
Ent 8956 derivado del trabajo q a 762 lts cli perl al crear usuario inserta entidades html en
#8956
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8956
See merge request artica/pandorafms!5163
2022-10-18 13:35:09 +00:00
Daniel Barbero
4b3376057c
Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos
2022-10-18 13:41:25 +02:00
Jimmy Olano
0612bb05db
Merge branch 'ent-9098-13503-creacion-llamada-insert_gis_data-cli' into 'develop'
...
Ent 9098 13503 creacion llamada insert gis data cli
#9098
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9098
See merge request artica/pandorafms!5132
2022-10-18 11:26:51 +00:00
Daniel Barbero
697abced4e
synch cli with nodes pandora_enterprise#9500
2022-10-18 12:49:51 +02:00
Daniel Barbero
15b07a9a09
Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos
2022-10-18 08:01:32 +02:00
artica
ed8b6678cd
Auto-updated build strings.
2022-10-18 01:00:21 +02:00
Daniel Barbero
c6783f9a10
synch cli with nodes pandora_enterprise#9500
2022-10-17 16:04:45 +02:00
Jimmy Olano
164ccb0631
Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop'
...
fixed agent/module widget pandora_enterprise#9519
pandora_enterprise#9519
See merge request artica/pandorafms!5118
2022-10-17 13:25:21 +02:00
artica
b79b7e5d57
Auto-updated build strings.
2022-10-17 01:00:17 +02:00
artica
92f0e4b709
Auto-updated build strings.
2022-10-16 01:00:17 +02:00
artica
b31240a3cc
Auto-updated build strings.
2022-10-15 01:00:23 +02:00
Jimmy Olano
9c413b355d
Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop'
...
remove tmetaconsole_history token pandora_enterprise#9579
pandora_enterprise#9579
See merge request artica/pandorafms!5161
2022-10-14 08:33:26 +00:00
artica
f871654e60
Auto-updated build strings.
2022-10-14 01:00:23 +02:00
Jimmy Olano
4c8f7745b6
Merge branch 'ent-9396-derivado-del-trabajo-q-a-764-fe-de-errata-en-la-ayuda-de-la-cli-pfms-agent_update_custom_fields' into 'develop'
...
Ent 9396 derivado del trabajo q a 764 fe de errata en la ayuda de la cli pfms agent update custom fields
#9396
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9396
See merge request artica/pandorafms!5125
2022-10-13 16:23:25 +00:00
artica
b98b0f3ab3
Auto-updated build strings.
2022-10-13 01:00:17 +02:00
artica
ccd578690b
Auto-updated build strings.
2022-10-12 01:00:22 +02:00
Ramon Novoa
83a669b1bc
Update copies of the Tentacle Server. Small fixes.
2022-10-11 11:48:02 +02:00
edu.corral
2262754eaf
ent 9098 insert_gis_data
2022-10-11 11:46:02 +02:00
José González
c726904ec1
Fix
2022-10-11 11:12:02 +02:00
José González
c6ce58d5f9
Added feature for create event and notify where snmptrampd is stuck
2022-10-11 11:02:42 +02:00
artica
e5bdceee78
Auto-updated build strings.
2022-10-11 01:00:22 +02:00
artica
7a2f8fdef0
Auto-updated build strings.
2022-10-10 01:00:16 +02:00
artica
771fa9e099
Auto-updated build strings.
2022-10-09 01:00:17 +02:00
artica
92aa05ddb4
Auto-updated build strings.
2022-10-08 01:00:20 +02:00
artica
4e665b180f
Auto-updated build strings.
2022-10-07 01:00:20 +02:00
artica
fa3f224325
Auto-updated build strings.
2022-10-06 01:00:20 +02:00
Alejandro Sánchez
99e0aa3e36
Merge branch '9458-plugin-sybase-version-alternativa-al-actual' into 'develop'
...
changed single quotes to double quotes in the variable of the transfer_xml...
See merge request artica/pandorafms!5136
2022-10-05 09:37:21 +00:00
artica
29e49f9ae0
Auto-updated build strings.
2022-10-05 01:00:20 +02:00
artica
a313678dca
Auto-updated build strings.
2022-10-04 01:00:17 +02:00
edu.corral
63349973e8
ent 8956 cli create user
2022-10-03 09:34:35 +02:00
artica
42434b16a9
Auto-updated build strings.
2022-10-03 01:00:16 +02:00
artica
9ca27ab588
Auto-updated build strings.
2022-10-02 01:00:16 +02:00
artica
b1e499f336
Auto-updated build strings.
2022-10-01 01:00:17 +02:00
artica
07de764545
Updated version and build strings.
2022-09-30 12:00:00 +02:00
Daniel Rodriguez
4230ab68bb
Merge branch 'ent-9170-sistema-de-procesamiento-paralelo-para-el-buffer-de-xmls' into 'develop'
...
Add support for smart queuing to the DataServer.
See merge request artica/pandorafms!5156
2022-09-30 09:55:55 +00:00
edu.corral
f367e852d1
ent 8956 cli create user comment entities
2022-09-30 11:06:28 +02:00
José González
8501e516e8
Minor fix
2022-09-30 11:04:36 +02:00
José González
769a902b85
Fix mistake
2022-09-30 11:03:33 +02:00
Ramon Novoa
45a4a4084d
Add support for smart queuing to the DataServer.
...
The DataServer now supports smart queuing, which processes recent
XML data files very fast at the expense of buffered data files.
2022-09-30 11:03:18 +02:00
José González
4b1fd315c5
Added token in pandora_server conf file
2022-09-30 10:35:47 +02:00
Daniel Barbero
4609e141ee
remove tmetaconsole_history token pandora_enterprise#9579
2022-09-30 08:56:19 +02:00
artica
af7cbc5901
Auto-updated build strings.
2022-09-30 01:00:20 +02:00
Daniel Rodriguez
637fae3e8d
Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
...
Ent 8898 anida mapas de red no actualizan bien
See merge request artica/pandorafms!5143
2022-09-29 12:36:37 +00:00
artica
2855e6ac48
Auto-updated build strings.
2022-09-29 01:00:21 +02:00
Daniel Rodriguez
969dd19c4d
Merge branch 'ent-fix-goliat-lwp-get-content' into 'develop'
...
fix GoliatLWP's get_content
See merge request artica/pandorafms!5066
2022-09-28 14:35:16 +00:00
alejandro.campos@artica.es
042362991d
implemented option to skip inoperative interfaces on demand
2022-09-28 15:34:45 +02:00
artica
dde27c12b1
Auto-updated build strings.
2022-09-28 01:00:20 +02:00
Diego Muñoz-Reja
35ee6936d6
Merge branch 'ent-9124-paradas-planificadas-no-se-borran-de-db' into 'develop'
...
Delete old data from tplanned_downtime.
See merge request artica/pandorafms!5091
2022-09-27 14:11:39 +00:00
Jimmy Olano
84d9b272c3
Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop'
...
implemented alert commands and actions to send report by email
Ref pandora_enterprise#8217
See merge request artica/pandorafms!5104
2022-09-27 12:26:24 +00:00
Daniel Rodriguez
5d0a40f790
Merge branch 'ent-8359-casque-de-web-server-cuando-no-hay-memoria' into 'develop'
...
Improved error detection when calling curl.
See merge request artica/pandorafms!5146
2022-09-27 10:49:41 +00:00
artica
fa8386194c
Auto-updated build strings.
2022-09-27 01:00:21 +02:00
Daniel Maya
67c8a945bf
resolved conflict
2022-09-26 11:08:18 +02:00
Daniel Rodriguez
e5cd925925
Merge branch 'ent-9167-cepsa-error-modulo-plugin-server-masivas-y-actualizar-modulo' into 'develop'
...
Ent 9167 cepsa error modulo plugin server masivas y actualizar modulo
See merge request artica/pandorafms!5101
2022-09-26 08:41:26 +00:00
artica
4db9df6df5
Auto-updated build strings.
2022-09-26 01:00:17 +02:00
artica
d7b4a8f248
Auto-updated build strings.
2022-09-25 01:00:16 +02:00
artica
0ce954af56
Auto-updated build strings.
2022-09-24 01:00:20 +02:00
Ramon Novoa
6c506e9dd0
Improved error detection when calling curl.
...
Ref. pandora_enterprise#8359.
2022-09-23 11:36:44 +02:00
Alejandro Campos
9301b46f41
Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes'
...
# Conflicts:
# pandora_console/extras/mr/57.sql
2022-09-23 06:41:57 +00:00
artica
d14bcfe616
Auto-updated build strings.
2022-09-23 01:00:20 +02:00
Diego Muñoz-Reja
0488eec00d
Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop'
...
Historic string data separated from normal data
See merge request artica/pandorafms!5093
2022-09-22 14:47:23 +00:00
alejandro
938ebb6de7
changed single quotes to double quotes in the variable of the transfer_xml function of plugintools, to fix a bug, which prevented sending the file
2022-09-22 12:39:45 +02:00
artica
b7bef2dd58
Auto-updated build strings.
2022-09-22 01:00:20 +02:00
edu.corral
1e590728aa
ent 9098 gis cli
2022-09-21 17:41:09 +02:00
Daniel Rodriguez
fe7948294e
Merge branch 'ent-8506-hostalive-umbral-inverso' into 'develop'
...
Ent 8506 hostalive umbral inverso
See merge request artica/pandorafms!5113
2022-09-21 13:36:01 +00:00
artica
4c8b907590
Auto-updated build strings.
2022-09-21 01:00:21 +02:00
alejandro.campos@artica.es
9343796ae1
traps history
2022-09-20 17:26:29 +02:00
alejandro.campos@artica.es
230494ffca
traps history
2022-09-20 16:03:13 +02:00
edu.corral
ace3603b13
ent 9396 agent_update_custom_fields help
2022-09-20 14:31:48 +02:00
artica
9ae4c7ca67
Auto-updated build strings.
2022-09-20 01:00:21 +02:00
Diego Muñoz-Reja
43a3cf4cac
Merge branch 'ent-9432-no-funciona-safe-operation-mode' into 'develop'
...
Ent 9432 no funciona safe operation mode
See merge request artica/pandorafms!5096
2022-09-19 15:27:14 +00:00
alejandro.campos@artica.es
91194155b0
implemented trap history
2022-09-19 11:15:22 +02:00
artica
4a7b11395a
Auto-updated build strings.
2022-09-19 01:00:16 +02:00
artica
30395efe83
Auto-updated build strings.
2022-09-18 01:00:16 +02:00
artica
185498ac5b
Auto-updated build strings.
2022-09-17 01:00:19 +02:00
artica
e7d13c5e36
Auto-updated build strings.
2022-09-16 01:00:19 +02:00
Ramon Novoa
5df6eb8cac
Fix the interpretation of inverse intervals.
2022-09-15 18:04:44 +02:00
Ramon Novoa
f79fb05318
Revert "Ent 6978 umbrales inversos fallan"
...
This reverts commit fd372d53d1
.
2022-09-15 13:19:23 +02:00
artica
d9f48426dd
Auto-updated build strings.
2022-09-15 01:00:19 +02:00
Calvo
da0dad0148
WIP:Move inventory to open
2022-09-14 18:12:39 +02:00
artica
628c5e8bf7
Auto-updated build strings.
2022-09-14 01:00:19 +02:00
Calvo
067b7a821f
WIP:Move inventory to open
2022-09-13 12:31:09 +02:00
alejandro.campos@artica.es
d1cc2458b6
implemented alert commands and actions to send report by email
2022-09-13 12:16:53 +02:00
artica
e76e9e94de
Auto-updated build strings.
2022-09-13 01:00:19 +02:00
Daniel Maya
193ef3171c
#9167 Fixed macros
2022-09-12 13:54:23 +02:00
Daniel Maya
19998daf63
#9432 Fixed safe operation mode
2022-09-12 09:22:08 +02:00
artica
06be85e044
Auto-updated build strings.
2022-09-12 01:00:17 +02:00
artica
9adbaf1cd1
Auto-updated build strings.
2022-09-11 01:00:17 +02:00
artica
f630b4efe6
Auto-updated build strings.
2022-09-10 01:00:18 +02:00
artica
c927188b27
Auto-updated build strings.
2022-09-09 01:00:19 +02:00