d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
e55915e1e2
Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop
See merge request artica/pandorafms!2193
Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
45bba4faa8
fix agent name input
...
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
1c7c0ebe8f
Merge branch '3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
remove special characters from agent alias string on creation and trim blank…
See merge request artica/pandorafms!2100
Former-commit-id: 2e2268eef1c2a45f8c6bc046e9e21d0101d456c0
2019-02-20 11:02:24 +01:00
63c00f00a8
Merge branch '3231-Mensaje_erroneo_al_aplicar_grupos_secundarios' into 'develop'
...
Eliminated message when secondary groups are added
See merge request artica/pandorafms!2124
Former-commit-id: 8c96030a463fa3b95ee2eabe3ee13c1852f60ffd
2019-02-19 18:09:38 +01:00
c80a1fc3dd
add tooltip to agent alias on creation
...
Former-commit-id: 8724f37e286080e58d9666fceec2e016fa741138
2019-02-19 16:25:19 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
0c99fe279f
Merge branch 'develop' into 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola
...
Former-commit-id: 2b9c06e16291022e626c42503c45776193a0c5ce
2019-02-15 15:13:45 +01:00
e4ca9b7fc8
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
...
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
2019-02-15 14:22:55 +01:00
6c9ce7e65b
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
2019-02-15 13:18:10 +01:00
40419ea587
Merge branch 'develop' into ent-3259-Errata-en-boton-de-ayuda-en-Modulos-WMI
...
Conflicts:
pandora_console/godmode/agentes/module_manager_editor_wmi.php
Former-commit-id: ec88c5b6ff36318db9a1f9ca98651bb49aa6eb9d
2019-02-13 14:55:21 +01:00
fa7f519d34
Merged from develop.
...
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
d82529438c
Fixed commit
...
Former-commit-id: 6b2f2ee955c63da4e73fa0e2bef4c10496ea42eb
2019-02-06 20:12:17 +01:00
9568cc9aba
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
...
Conflicts:
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/include/functions_config.php
Former-commit-id: 19f087050477dcc099bd31d7de62ac893de5d686
2019-02-06 18:06:49 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
2155420d71
implement custom fields for node monitor view
...
Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f
2019-01-18 11:13:29 +01:00
ff85a4a8d5
Eliminated message when secondary groups are added
...
Former-commit-id: 07a6e423a66830543126444a5b4f54c196818e63
2019-01-15 13:10:13 +01:00
4e6cf0182a
fixed error create modules network
...
Former-commit-id: 4be4cbd7e796680772faada72504ed751b91cc36
2019-01-11 12:01:48 +01:00
6f65c9876f
Added option in setup for unique main IP in agents - #1744
...
Former-commit-id: f8f9668a14818a01b811a73052e2e7e82e9a8c7a
2019-01-09 16:20:24 +01:00
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
a96606088a
Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
...
Removed Web Analysis and Log4x from data server module
See merge request artica/pandorafms!1985
Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
2019-01-04 16:52:28 +01:00
fc5d3170b5
fixed warn/err messages in module_manager_editor
...
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
17e773adcb
Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
...
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00
5b7f796510
Changed popup windows by tooltips
...
Former-commit-id: 478e63e4bf81bb663898bba1afa76c7ab02ac6d9
2018-12-28 11:45:48 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
6d8b73f72e
fix minor error module editor network
...
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
c0869b3c9e
fixed error module editor
...
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
d4061641ec
Merge branch '3061-Mensaje-de-error-al-crear-un-modulo-sin-nombre' into 'develop'
...
fixed error message
See merge request artica/pandorafms!1964
Former-commit-id: 55944da11dcd55a19e9147bc4520431dedc3a19a
2018-12-21 10:29:14 +01:00
91e90a1b26
remove special characters from agent alias string on creation and trim blank spaces from beginning and end of alias string
...
Former-commit-id: 2294ef705ac0df638bc897f56ff9e9beff8379fc
2018-12-20 13:35:57 +01:00
ac4d420173
Added hint to url address input
...
Former-commit-id: 5c51058ff8aea2e821bbb294034a538f040c46be
2018-12-20 13:08:46 +01:00
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
33603a79d8
Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop'
...
Fixed bug in SNMP Wizard
See merge request artica/pandorafms!1929
2018-11-30 13:37:07 +01:00
494b858a20
fixed errors session_start
2018-11-21 13:08:58 +01:00
8bd99e6c82
Removed Web Analysis and Log4x from data server module
2018-11-16 13:28:16 +01:00
c5a0065cba
decoded entities when retrieving module name in case SNMP module name is updated
2018-11-13 11:50:46 +01:00
5420da9f23
fixed error message
2018-11-13 09:36:20 +01:00
45b757b5db
Fixed bug in SNMP Wizard
2018-11-05 14:17:43 +01:00
f2b1c99013
fixed minor error cluster name by alias
2018-11-02 09:56:31 +01:00
74016c928f
fixed bug: failing load of post process and unit fields in plugin component in module creation
2018-10-30 10:20:31 +01:00
e03f56f0d7
Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop'
...
2429 resaltar elementos al pasar por encima o marcar
See merge request artica/pandorafms!1762
2018-10-29 09:17:54 +01:00
3c4f6d3b23
Merge branch '2580-VERSION-OPEN-Línea-divisoria' into 'develop'
...
Fixed bug in module manager
See merge request artica/pandorafms!1729
2018-10-25 13:00:59 +02:00
af2e49966b
Merge branch '2734-6444-Nombre-de-interfaces-en-SNMP-Interface-Wizard2' into 'develop'
...
Added horizontal scroll in the interfaces select
See merge request artica/pandorafms!1738
2018-10-25 11:58:33 +02:00
cab90a4fd3
Merge branch '2783-Falta-de-información-de-Module-Management-en-Last-Activity' into 'develop'
...
Added module name and agent name in actions enable and disable module - #2783
See merge request artica/pandorafms!1783
2018-10-25 11:44:42 +02:00
fbsanchez
Daniel Rodriguez
alejandro-campos
Alejandro Fraguas
Ramon Novoa
Tatiana Llorente
manuel
samucarc
Alejandro Gallardo Escobar
artica
daniel
Samuel Carcases
vgilc