Daniel Barbero Martin
c02abbc508
alert template schedule pandora_enterprise#3943
2022-01-31 13:45:44 +01:00
fbsanchez
46d995a983
Added index to service elements (modules)
2022-01-10 11:24:32 +01:00
Daniel Rodriguez
02dfea8e58
Merge branch 'ent-8304-correccion-en-comportamiento-al-aplicar-politicas' into 'develop'
...
Fix db lock stopping policy apply
See merge request artica/pandorafms!4589
2021-12-27 12:46:17 +00:00
fbsanchez
1053062f72
Update pandora_console/extras/mr/51.sql
2021-12-16 11:48:03 +00:00
Daniel Barbero Martin
935c7f6937
fixed MR
2021-12-16 11:45:42 +01:00
Calvo
0bad3761a7
Fix db lock stopping policy apply
2021-12-16 10:26:45 +01:00
Daniel Barbero Martin
b4131431af
fixed mr
2021-12-15 09:55:03 +01:00
fbsanchez
f852df2f1c
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
Daniel Barbero Martin
b55679cbfd
Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites
2021-12-10 08:18:46 +01:00
Daniel Barbero Martin
b97ecda12b
db changes
2021-12-09 16:19:05 +01:00
fbsanchez
5c25fa8406
mr updates and a pretty icon
2021-12-09 15:07:35 +01:00
fbsanchez
cb6184a943
mr fix
2021-12-09 14:02:06 +01:00
fbsanchez
2cbfca2cdd
mr rev + timap_sites
2021-12-09 13:51:20 +01:00
fbsanchez
a94f6be37e
force db_process_sql
2021-12-03 12:59:50 +01:00
fbsanchez
3e7a81ea33
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
fbsanchez
00d79b553c
missing in merge mr
2021-12-02 14:46:31 +01:00
Daniel Rodriguez
69590afef6
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
...
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
fbsanchez
cad0c6cea6
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
Daniel Rodriguez
345cbcf5ba
Merge branch 'ent-8123-Autenticacion-remota-en-entornos-centralizados' into 'develop'
...
fix setup centraliced active directory
See merge request artica/pandorafms!4540
2021-11-30 14:44:48 +00:00
Daniel Barbero Martin
347769299b
outocreate remote user centralized node
2021-11-30 14:23:19 +01:00
alejandro.campos@artica.es
73cde9ee48
db changes
2021-11-29 14:58:34 +01:00
fbsanchez
68c2400b9c
fix
2021-11-29 10:32:54 +01:00
fbsanchez
9c17625c77
ncm2
2021-11-26 18:11:34 +01:00
fbsanchez
ba8087f49b
ncm2 with schedules
2021-11-24 22:01:21 +01:00
Calvo
5464a73a12
Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor
2021-11-24 13:28:36 +01:00
Calvo
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
fbsanchez
cbbfc337df
errata fix
2021-11-23 14:33:59 +01:00
fbsanchez
a9485024f4
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-23 14:29:23 +01:00
fbsanchez
41dcc95d5a
db changes
2021-11-23 14:26:11 +01:00
José González
b8d884008b
Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
...
# Conflicts:
# pandora_console/extras/mr/51.sql
2021-11-22 11:44:06 +00:00
Jose Gonzalez
3f395f03dc
Added sql file
2021-11-22 12:33:31 +01:00
fbsanchez
582cb9a082
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
Daniel Barbero Martin
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
fbsanchez
9ff3c8eee1
wip ncm2
2021-11-15 18:58:57 +01:00
fbsanchez
a96d5d68e3
MR updates for NCMv2
2021-11-10 17:13:17 +01:00
José González
bdc4d0a8b1
Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
...
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez
c0abe5edb9
Fix merge
2021-11-04 16:00:05 +01:00
Daniel Barbero Martin
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
25268ec9b4
color
2021-11-02 17:49:45 +01:00
fbsanchez
08d4323941
set deployment_timeout per agent installation file
2021-11-02 17:37:47 +01:00
fbsanchez
a5bf72cca0
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
fbsanchez
5ae3bbc4fe
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-25 10:28:31 +02:00
fbsanchez
796a7125e1
Errata fix
2021-10-21 14:33:44 +02:00
Calvo
a03e46ecea
Fix parameters in cron_task_generate_report_by_template
2021-10-21 12:25:39 +02:00
fbsanchez
df863c6057
minor fix NCM test script
2021-10-21 12:20:12 +02:00
fbsanchez
303d6632e1
NCM
2021-10-21 11:28:14 +02:00
fbsanchez
bb8dbc9332
NCM
2021-10-21 02:17:17 +02:00
Calvo
9f71a9ba81
Fix mr 48 breaking tasks
2021-10-18 16:05:37 +02:00
fbsanchez
6c0e2d23de
updates
2021-10-15 13:39:23 +02:00
fbsanchez
75949691f3
fix mr
2021-10-14 21:22:21 +02:00
fbsanchez
6a537e58f4
Fix
2021-10-14 21:09:14 +02:00
fbsanchez
79174d512d
Added tncm_vendor and model to manage targetrs
2021-10-14 20:44:05 +02:00
fbsanchez
96250dcfa0
WIP NCM
2021-10-13 22:47:31 +02:00
Daniel Maya
e986005cc0
#8090 Added auto_adjust in tlayout_template
2021-10-13 17:23:34 +02:00
fbsanchez
d2f5a04583
WIP NCM
2021-10-11 20:42:43 +02:00
fbsanchez
ef42348807
compat mysql 5.1 exceeded key
2021-10-08 16:02:06 +02:00
fbsanchez
fa35e6054c
Fixes
2021-10-08 15:30:17 +02:00
fbsanchez
1cb2f77945
WIP NCM
2021-10-08 15:12:23 +02:00
fbsanchez
6781e513c8
NCM WIP
2021-10-06 19:52:46 +02:00
Jose Gonzalez
a70d48514e
Fix Barivion name in license and readme
2021-10-06 13:33:25 +02:00
fbsanchez
b8dc85a0dd
wip
2021-10-05 16:42:24 +02:00
fbsanchez
31f329a833
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
...
Conflicts:
pandora_console/vendor/composer/autoload_classmap.php
pandora_console/vendor/composer/autoload_static.php
2021-10-05 10:57:00 +02:00
fbsanchez
e11d8f3766
minor schema update
2021-10-04 19:43:57 +02:00
Jose Gonzalez
6deaee84ac
Merge
2021-10-04 10:00:15 +02:00
fbsanchez
be95b5ffd0
updates
2021-10-01 13:56:21 +02:00
alejandro.campos@artica.es
277fcd51ca
minor changes
2021-09-30 16:02:14 +02:00
fbsanchez
e237d7dd07
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/mr/50.sql
2021-09-30 12:24:19 +02:00
fbsanchez
18b1a1e14e
Schema update to avoid using JSON columns until internal CICD is updated
2021-09-30 11:18:13 +02:00
Jose Gonzalez
8696d21a42
Fixed any minor bugs
2021-09-29 17:03:13 +02:00
fbsanchez
d683e192b5
Moved changes for CorrelationServer schema to MR50
2021-09-29 13:43:08 +02:00
alejandro.campos@artica.es
fc6fb36293
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-29 13:29:20 +02:00
fbsanchez
15c2bdf17b
WIP NCM
2021-09-28 18:53:22 +02:00
alejandro.campos@artica.es
631edabdf9
added changes to mr
2021-09-24 11:42:40 +02:00
fbsanchez
12ddb4d792
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
2021-09-23 16:23:38 +02:00
Alejandro Campos
ca46285a0e
Merge branch 'develop' into 'ent-3407-Informes-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/50.sql
2021-09-23 13:33:02 +00:00
Daniel Maya
f3923326bc
resolved conflict
2021-09-22 11:08:37 +02:00
alejandro.campos@artica.es
fc959f0bc6
created report for ipam networks
2021-09-21 15:59:14 +02:00
Daniel Rodriguez
ce40b36923
Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
...
Ent 7582 anadir selector horas eventos
Closes pandora_enterprise#7582
See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
alejandro.campos@artica.es
ae2dc6a0b6
moved to mr 49
2021-09-13 14:54:33 +02:00
Daniel Maya
10f1894b82
#7982 Added id_template_fields and id_template_conditions
2021-09-10 09:46:00 +02:00
fbsanchez
34adf6e9e2
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
2021-09-08 21:21:45 +02:00
Calvo
de0352f81c
MR changes
2021-09-01 09:35:31 +02:00
Calvo
d5910e8a3a
Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman
2021-09-01 09:14:39 +02:00
fbsanchez
f0791cbd4f
WIP CorrelationServer
2021-08-27 15:07:14 +02:00
Daniel Rodriguez
fe30b9c785
Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
...
implemented capacity to handle string data for event data
See merge request artica/pandorafms!4184
2021-08-17 12:19:54 +00:00
Daniel Rodriguez
7673e40613
Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop'
...
fixed font reference
See merge request artica/pandorafms!4238
2021-08-11 07:12:13 +00:00
Alejandro Campos
ff93169049
Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
...
# Conflicts:
# pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
Daniel Maya
a5f9e74b50
#7881 Fixed snmp alert
2021-08-05 15:53:44 +02:00
Calvo
befd3dcf15
Fix mr database name in update
2021-07-22 17:08:25 +02:00
fbsanchez
e4a08855e5
Exclude LOAD section from MR until UMC-756 is deployed
2021-07-21 18:09:20 +02:00
fbsanchez
f71ae73c84
Load procedures (or complex queries) in UMC
2021-07-21 17:31:03 +02:00
fbsanchez
0cec3afba0
Deactivated nodes if not unified
2021-07-19 13:47:43 +02:00
Calvo
3880cf09ea
Fix german language misspell
2021-07-14 18:48:41 +02:00
fbsanchez
ae9dbd9b8e
Fixed query - duplicated
2021-07-13 13:17:13 +02:00
fbsanchez
84c7e6172a
Query updated
2021-07-13 13:14:48 +02:00
fbsanchez
9b31906bdf
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
Daniel Maya
a4203aaee2
Ent 7272 nuevos elementos consola visual odómetro
2021-07-12 10:27:10 +00:00
fbsanchez
554a32b567
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-07-09 14:40:44 +02:00
vgilc
04c402bc03
Merge branch 'ent-7772-agentes-con-id-grupo-inexistente-entornos-metaconsola' into 'develop'
...
remove any agent belonging to a non-existent group
See merge request artica/pandorafms!4256
2021-07-06 09:29:14 +00:00
fbsanchez
e6acc2c28b
restore centralised mode for all
2021-07-05 21:20:49 +02:00
José González
9e49ed8efa
MR file for this feature
2021-07-05 17:43:17 +02:00
fbsanchez
f52d389327
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
vgilc
159920a05d
Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
...
Add the AlertServer to the repo.
See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
Ramon Novoa
f8bcd1660f
Add the AlertServer to the repo.
...
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
fbsanchez
2a964b52f1
remove any agent belonging to a non-existent group
2021-07-01 16:11:09 +02:00
fbsanchez
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
Daniel Maya
b37bbcd944
Ent 7143 autoajuste de la consola visual
2021-06-29 10:02:13 +00:00
fbsanchez
c64b972564
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 10:51:55 +02:00
Luis
f74b74675a
Removed new wiki url from talert_templates and actions from mr and added to migrate
2021-06-28 09:58:29 +00:00
alejandro.campos@artica.es
548c0c3013
fixed font reference
2021-06-28 11:27:41 +02:00
alejandro.campos@artica.es
7fa398b027
fixed font reference
2021-06-28 11:25:22 +02:00
fbsanchez
4c2ac234b8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
Luis
497ecb329d
Changed new wiki url on helps
2021-06-24 12:31:15 +00:00
fbsanchez
faa9fee273
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
pandora_agents/unix/Darwin/dmg/resources/text/license.html
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/48.sql
2021-06-21 17:33:45 +02:00
Luis
ebceaebb58
Ent 7253 opcion formato envio informes templates
2021-06-21 13:41:14 +00:00
fbsanchez
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +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 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
alejandro.campos@artica.es
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
Daniel Barbero Martin
d8dcdb5af4
Wip command center, alerts SNMP source in mr file
2021-06-07 10:32:59 +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
Daniel Maya
e6713c2f2c
#6917 metaconsole config changes
2021-05-25 09:58:18 +00: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
fbsanchez
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +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
Luis
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
Daniel Barbero Martin
55a1ea6f2a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-04 17:19:35 +02:00
fbsanchez
34b02982e1
Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag
2021-04-30 15:01:43 +02:00
fbsanchez
366e9a08d5
minor fix
2021-04-30 14:36:47 +02:00
fbsanchez
6b83deacdd
Migrate old rules
2021-04-30 14:34:10 +02:00
Daniel Barbero Martin
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
fbsanchez
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
fbsanchez
50f580c112
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-19 14:35:59 +02:00
fbsanchez
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
fbsanchez
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-15 00:20:42 +02:00
fbsanchez
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-14 21:42:19 +02:00
fbsanchez
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
Jose Gonzalez
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
Daniel Rodriguez
751d7ec3cf
Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop'
...
Ent 7161 cambiar opciones de skin en usuarios y grupos
See merge request artica/pandorafms!3972
2021-04-13 09:26:50 +00:00
Daniel Maya
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
José González
4a028b2ee3
Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
...
# Conflicts:
# pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
Daniel Maya
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
Jose Gonzalez
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
fbsanchez
1ac6ed35cf
Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name
...
Conflicts:
pandora_console/extras/mr/46.sql
2021-04-07 10:23:33 +02:00
Luis
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
Daniel Rodriguez
3eaff54b73
Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop'
...
Ent 6232 nt incluir metricas en el wizard de interfaces snmp
See merge request artica/pandorafms!3935
2021-03-18 16:02:56 +00:00
alejandro.campos@artica.es
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
daniel
6e0188fac1
add summary report availability graph
2021-03-09 16:32:12 +00:00
Alejandro Campos
d4054f15d0
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
...
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
fbsanchez
c5b2b90476
Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus
...
Conflicts:
pandora_console/extras/mr/45.sql
2021-03-02 09:48:33 +01:00
Daniel Maya
208c0d10e8
Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas
2021-03-01 10:35:28 +00:00
fbsanchez
ad347dc953
errata fix
2021-02-26 12:48:23 +01:00
fbsanchez
d41b189612
Extra lines after mr file
2021-02-25 13:27:00 +01:00
alejandro.campos@artica.es
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
fbsanchez
34a19b969c
missed mr file
2021-02-22 12:04:12 +01:00
Daniel Barbero Martin
39e603e908
fixed mr version and remove updates mr
2021-02-17 14:27:16 +01:00
Daniel Barbero Martin
234097320f
fixed mr version and remove updates mr
2021-02-17 13:04:59 +01:00
fbsanchez
416bc8cad4
Minor fixes
...
and speed out of control
2021-02-16 12:33:15 +01:00
fbsanchez
74ee4971d0
Added inUsage and outUsage, added units
2021-02-16 12:14:56 +01:00
fbsanchez
2826f4fd89
Fixes in MR, added uniqid macro to pandora_snmp_bandwidth
2021-02-15 19:08:32 +01:00
fbsanchez
09b5400023
MR info + bandwidth analysis in wizards
2021-02-15 18:56:42 +01:00
Luis
905f8801b7
Update 44.sql
2021-01-27 13:37:20 +01:00
Luis Calvo
f2addc837a
Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task
2021-01-27 09:25:12 +01:00
Luis Calvo
dc3ee2d553
Added task save report to disk changes to MR
2021-01-26 16:36:13 +01:00
Jose Gonzalez
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
Daniel Rodriguez
9b92c5ff34
Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop'
...
Ent 6932 tags no entran en base de datos
See merge request artica/pandorafms!3776
2021-01-25 10:15:29 +01:00
alejandro-campos
9c924db8dc
Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open
2021-01-18 10:29:06 +01:00
Daniel Maya
ca17e9cfcb
change in column name of ttag
2021-01-15 09:50:40 +01:00
daniel
a470658543
remove IPAM to extension
2021-01-14 14:42:18 +01:00
fbsanchez
3f61d97e0f
Event text to Event name in alert_actions Monitoring event
2021-01-12 13:39:03 +01:00
Daniel Rodriguez
7bbecceacc
Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop'
...
Ent 6779 cambio label en campo de alertas snmp
See merge request artica/pandorafms!3661
2021-01-11 14:58:14 +01:00
fbsanchez
dd08b7937c
Set default value for review_mode to 1 instead 0
2021-01-07 14:36:56 +01:00
Daniel Maya
f2b673b62b
merge conflict resolved
2021-01-04 09:16:14 +01:00
alejandro-campos
f03b4e59f8
several fixes in netscan custom
2020-12-18 11:40:22 +01:00
Daniel Rodriguez
22159a6d69
Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop'
...
Ent 6800 campos no se guaerdan plantillas
Closes pandora_enterprise#6800
See merge request artica/pandorafms!3693
2020-12-17 17:00:07 +01:00
Daniel Maya
369002cb96
inventory alerts
2020-12-04 10:31:22 +01:00
Jose Gonzalez
279a4124f1
Database changes
2020-12-03 15:51:08 +01:00
Jose Gonzalez
f2a94b9aa5
Merge
2020-12-02 11:38:22 +01:00
Jose Gonzalez
eeac1ca35e
Merge
2020-12-02 11:28:46 +01:00
Daniel Maya
3a0f14e7bd
Ent 5835 9693 error al exportar csv el log view parte 2
2020-12-02 10:13:22 +01:00
Jose Gonzalez
7f2c00a4d6
Added lost sql files
2020-11-26 13:53:53 +01:00
Jose Gonzalez
dbfe52e383
Fix issues with alert fields
2020-11-26 13:39:17 +01:00
Daniel Maya
fc83121969
Changed event criticity
2020-11-26 13:22:59 +01:00
Marcos Alconada
8e4c62a0e9
fixed error
2020-10-29 18:20:33 +01:00
Jose Gonzalez
dc15125cd8
Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo
...
Update
2020-10-15 12:27:59 +02:00
Jose Gonzalez
c28e2917ed
Modified database files
2020-10-15 11:29:47 +02:00
Jose Gonzalez
65851afe4d
Database update
2020-10-14 10:59:55 +02:00
daniel
40864eee6b
add new token to report
2020-10-07 09:34:43 +02:00
daniel
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
José González
0d8e2d5021
Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier'
...
# Conflicts:
# pandora_console/extras/mr/42.sql
Solved conflicts.
2020-09-25 11:27:41 +02:00
Luis
ef043a169a
Increased number of max macro data fields from 15 to 20
2020-09-25 10:47:36 +02:00
Jose Gonzalez
da01f9abd5
Fix alter index
2020-09-16 17:32:05 +02:00
Jose Gonzalez
dbb1ec6b84
Too long name fix
2020-09-16 17:19:07 +02:00
Jose Gonzalez
e8efd228c0
Added indexes
2020-09-16 14:33:20 +02:00
daniel
b96cade165
new options 24x7 sla,availavility reports
2020-08-31 12:33:41 +02:00
Jose Gonzalez
3c0ea8b08a
Solved issues with DB
2020-08-10 15:10:17 +02:00
Jose Gonzalez
7300ccd185
Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola
2020-08-07 13:29:25 +02:00
Jose Gonzalez
c67d8bd005
Fixed little issues
2020-08-07 13:29:09 +02:00
José González
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
Daniel Rodriguez
1f2e0e2d80
Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop'
...
Increase the size of tserver.version.
See merge request artica/pandorafms!3368
2020-07-27 12:17:27 +02:00
Alejandro Campos
0d3d4d7d6f
Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
2020-07-15 09:30:35 +02:00
José González
f3d1a80252
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
Ramon Novoa
19a8288f26
Increase the size of tserver.version.
...
Ref pandora_enterprise#4943
2020-07-09 17:47:11 +02:00
fbsanchez
231ba795dd
MR update
2020-07-09 16:53:03 +02:00
Jose Gonzalez
a1bd93bac7
Add database changes
2020-07-07 11:08:44 +02:00
alejandro-campos
49888fe48f
Added change to MR
2020-07-06 09:56:15 +02:00
alejandro-campos
47a7502c6b
Added change to MR
2020-07-06 09:55:14 +02:00
fbsanchez
faaf14bfd4
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González
311b259684
Backup upload
2020-06-30 12:16:51 +02:00
fbsanchez
c07daa3199
WIP Services
2020-06-29 19:17:40 +02:00
fbsanchez
94a7b625fb
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
2020-06-22 14:06:13 +02:00
Luis
efb69c18bc
Ent 5809 message delete not working
2020-06-22 13:52:54 +02:00
fbsanchez
9bae4f8a17
MR change - minor
2020-06-19 12:14:09 +02:00
fbsanchez
6c5484baf0
MR change smart services
2020-06-18 12:35:52 +02:00
daniel
65c733e1dd
iot metaconsole
2020-05-27 09:18:21 +02:00
alejandro-campos
23c4609981
Merge branch 'develop' into ent-1193-Comprobar-codigo-de-estado-HTTP
2020-05-19 17:13:54 +02:00
alejandro-campos
197e309129
added new module type
2020-05-04 12:22:04 +02:00
alejandro-campos
1140a4345a
added new module type
2020-05-04 12:20:50 +02:00
fbsanchez
026562e7ee
MR changes
2020-04-30 15:00:04 +02:00
fbsanchez
7024863fd7
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
...
Conflicts:
pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
fbsanchez
36daf76cc5
Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
...
Conflicts:
pandora_console/extras/mr/37.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
Daniel Barbero Martin
3280ad479f
Fix dashboards
2020-04-13 15:01:18 +02:00
fbsanchez
a75964fcba
minor fix
2020-04-08 16:06:39 +02:00
fbsanchez
762ad3106d
Improvements and fixes H&D with review
2020-04-07 18:50:56 +02:00
Kike
801624b8a2
Deleted [RT] tag for recon templates
2020-04-07 14:04:06 +02:00
Kike
d908a9f7f6
Added default modules templates for recon tasks
2020-04-02 19:12:49 +02:00
fbsanchez
7f1d4725bd
minor fix mr
2020-03-31 17:52:20 +02:00
Jose Gonzalez
6cad02635e
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-31 10:45:37 +02:00
Jose Gonzalez
f28de6f4d0
Fixed db issue
2020-03-31 10:45:30 +02:00
fbsanchez
acabe543c4
csv recon0
2020-03-30 19:44:44 +02:00
Jose Gonzalez
fa372656f4
Fixed issue with DB
2020-03-30 17:48:09 +02:00
Jose Gonzalez
dc55ca5eff
WIP: Changes with PEN tables
2020-03-30 17:02:34 +02:00
fbsanchez
3a74e25068
PEN management
2020-03-27 11:41:56 +01:00
fbsanchez
452f5253e2
merge develop
2020-03-26 14:43:57 +01:00
fbsanchez
e48ef76f35
merge
2020-03-26 14:38:23 +01:00
daniel
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
fbsanchez
fecff8aa93
Discovery review advanced
2020-03-25 18:02:58 +01:00
Jose Gonzalez
e1d233453f
Update database files
2020-03-25 13:05:56 +01:00
Alejandro Campos
b56076044b
Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
...
# Conflicts:
# pandora_console/extras/mr/37.sql
2020-03-24 13:55:57 +01:00
alejandro-campos
e05c292d7d
show last status change of module
2020-03-23 12:47:58 +01:00
Daniel Maya
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
Kike
037564810b
Increase WUX tests field size in database
2020-03-20 14:09:06 +01:00
Jose Gonzalez
451cdf2ca1
Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps
2020-03-19 12:14:05 +01:00
Jose Gonzalez
c9813afc9b
DB changes
2020-03-19 12:13:56 +01:00
fbsanchez
f58276ddbb
Templates
2020-03-18 19:31:58 +01:00
fbsanchez
f3da919abc
WIP multiple changes
2020-03-16 23:52:20 +01:00
fbsanchez
ce11d89953
Frontent changes
2020-03-13 14:03:50 +01:00
Daniel Maya
4e4c1495eb
Fixed merge conflict
2020-02-20 15:07:14 +01:00
Daniel Maya
87dc92ffd9
Ent 5457 suid nodos elastic
2020-02-18 13:24:22 +01:00
Daniel Maya
be47ed178b
Added force apply in policies
2020-02-05 12:49:52 +01:00
Daniel Rodriguez
28392b71ef
Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop'
...
availability failover
See merge request artica/pandorafms!3015
2020-01-27 10:48:50 +01:00
Alejandro Campos
e7769b8bf4
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Maya
c68f83f013
availability failover
2020-01-15 17:16:46 +01:00
Alejandro Campos
c389769602
Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 17:12:32 +01:00
Alejandro Campos
6dbe75169f
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-15 14:37:00 +01:00
Luis
2926ead13b
Fixed group change on networkmap.ACL and source group working separated
2020-01-15 12:14:37 +01:00
alejandro-campos
5eb2953810
Added port option on server configuration to be used when connecting to execution server
2020-01-14 15:43:17 +01:00
Alejandro Campos
dcd2aae3c5
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/extras/mr/35.sql
2020-01-14 10:28:55 +01:00
Daniel Maya
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
Alejandro Campos
0468c85a4d
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
...
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
daniel
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
Luis
6ba4a26564
Added timeoout option to command event responses
2019-12-10 11:54:30 +01:00
alejandro-campos
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
Luis
b0d5b7223e
Added report template regex to MR
2019-11-27 13:21:05 +01:00
Alejandro Fraguas
ed0ad76e61
Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop'
...
Add new search for id source event in metaconsole
See merge request artica/pandorafms!2438
2019-11-27 10:14:35 +01:00
fbsanchez
c28dfd60a5
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-26 16:16:15 +01:00
fbsanchez
c985f2d5f9
Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-26 10:50:51 +01:00
Daniel Maya
cf8bae66d1
Added index in MR
2019-11-26 10:31:57 +01:00
Marcos Alconada
d0aab40fa8
Update 29.sql
2019-11-25 16:56:59 +01:00
fbsanchez
1b4b59d1c2
Rules migration DB
2019-11-25 13:36:43 +01:00
fbsanchez
5423e78d62
Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/agentes/configurar_agente.php
pandora_console/godmode/wizards/Wizard.main.php
pandora_console/include/functions_agents.php
pandora_console/include/styles/alert.css
pandora_console/pandoradb.sql
pandora_server/lib/PandoraFMS/Recon/Base.pm
2019-11-22 15:49:07 +01:00
marcos
21bf49c218
update id_source_event
2019-11-22 13:38:08 +01:00
fbsanchez
1565fee3f4
minor fix, errata
2019-11-22 11:59:24 +01:00
fbsanchez
fd12c5a009
DB update, default values for Alert correlation
2019-11-22 11:57:20 +01:00
Daniel Barbero
35abd12499
WIP alert correlations
2019-11-22 11:06:55 +01:00
marcos
ab1a64a2e6
Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este
2019-11-22 10:56:36 +01:00
marcos
de3f8b2a0f
updates
2019-11-22 10:56:30 +01:00
daniel
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
fbsanchez
362837f856
updated default values for tevent_rule, new tokens for correlated alerts
2019-11-21 17:47:21 +01:00
marcos
93c4793025
add id_source_event 33.sql
2019-11-21 17:36:01 +01:00
Marcos Alconada
34cdcdfd6e
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
...
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
fbsanchez
3b636a12ce
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-11-20 15:53:00 +01:00
fbsanchez
446d6c3507
Fix windows commands
2019-11-20 12:35:55 +01:00
fbsanchez
79a135b077
Fix errata DESC => COMMENT
2019-11-20 11:36:15 +01:00
fbsanchez
43ecba3bbb
operator fields for event_rule
2019-11-20 10:40:52 +01:00
Daniel Barbero Martin
9db7bd37f2
Merge remote-tracking branch 'origin/ent-4769-modulos-ssh-php-perl' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-20 10:12:23 +01:00
fbsanchez
471389a72a
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-19 14:11:38 +01:00
Daniel Barbero Martin
1b5dcc3e28
Fixed errors in remote command
2019-11-19 12:35:52 +01:00
fbsanchez
443eb1168c
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
2019-11-18 12:48:31 +01:00
fbsanchez
9440570548
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
2019-11-15 13:08:09 +01:00
fbsanchez
990ad339d3
db schema
2019-11-15 09:45:49 +01:00
fbsanchez
f69b86663a
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
2019-11-14 21:40:35 +01:00
fbsanchez
3c87efe113
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 17:13:38 +01:00
fbsanchez
94d87c2a3c
Avoid welcome window on updates.
2019-11-14 14:14:50 +01:00
Daniel Barbero Martin
c17acefc49
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-14 12:22:11 +01:00