fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
d8dcdb5af4
Wip command center, alerts SNMP source in mr file
2021-06-07 10:32:59 +02:00
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
e6713c2f2c
#6917 metaconsole config changes
2021-05-25 09:58:18 +00:00
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
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +02:00
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
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
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
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
55a1ea6f2a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-04 17:19:35 +02:00
34b02982e1
Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag
2021-04-30 15:01:43 +02:00
366e9a08d5
minor fix
2021-04-30 14:36:47 +02:00
6b83deacdd
Migrate old rules
2021-04-30 14:34:10 +02:00
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
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
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
2021-04-15 00:20:42 +02:00
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
2021-04-14 21:42:19 +02:00
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
3d359dab36
Fixed merge with 7161
2021-04-13 12:55:35 +02:00
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
9bbac06771
Ent 7161 cambiar opciones de skin en usuarios y grupos
2021-04-13 09:26:50 +00:00
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
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
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
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
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
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
6e0188fac1
add summary report availability graph
2021-03-09 16:32:12 +00:00
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
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
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
ad347dc953
errata fix
2021-02-26 12:48:23 +01:00
d41b189612
Extra lines after mr file
2021-02-25 13:27:00 +01:00
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
34a19b969c
missed mr file
2021-02-22 12:04:12 +01:00
39e603e908
fixed mr version and remove updates mr
2021-02-17 14:27:16 +01:00
234097320f
fixed mr version and remove updates mr
2021-02-17 13:04:59 +01:00
416bc8cad4
Minor fixes
...
and speed out of control
2021-02-16 12:33:15 +01:00
74ee4971d0
Added inUsage and outUsage, added units
2021-02-16 12:14:56 +01:00
2826f4fd89
Fixes in MR, added uniqid macro to pandora_snmp_bandwidth
2021-02-15 19:08:32 +01:00
09b5400023
MR info + bandwidth analysis in wizards
2021-02-15 18:56:42 +01:00
905f8801b7
Update 44.sql
2021-01-27 13:37:20 +01:00
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
dc3ee2d553
Added task save report to disk changes to MR
2021-01-26 16:36:13 +01:00
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
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
9c924db8dc
Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open
2021-01-18 10:29:06 +01:00
ca17e9cfcb
change in column name of ttag
2021-01-15 09:50:40 +01:00
a470658543
remove IPAM to extension
2021-01-14 14:42:18 +01:00
3f61d97e0f
Event text to Event name in alert_actions Monitoring event
2021-01-12 13:39:03 +01:00
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
dd08b7937c
Set default value for review_mode to 1 instead 0
2021-01-07 14:36:56 +01:00
f2b673b62b
merge conflict resolved
2021-01-04 09:16:14 +01:00
f03b4e59f8
several fixes in netscan custom
2020-12-18 11:40:22 +01:00
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
369002cb96
inventory alerts
2020-12-04 10:31:22 +01:00
279a4124f1
Database changes
2020-12-03 15:51:08 +01:00
f2a94b9aa5
Merge
2020-12-02 11:38:22 +01:00
eeac1ca35e
Merge
2020-12-02 11:28:46 +01:00
3a0f14e7bd
Ent 5835 9693 error al exportar csv el log view parte 2
2020-12-02 10:13:22 +01:00
7f2c00a4d6
Added lost sql files
2020-11-26 13:53:53 +01:00
dbfe52e383
Fix issues with alert fields
2020-11-26 13:39:17 +01:00
fc83121969
Changed event criticity
2020-11-26 13:22:59 +01:00
8e4c62a0e9
fixed error
2020-10-29 18:20:33 +01:00
dc15125cd8
Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo
...
Update
2020-10-15 12:27:59 +02:00
c28e2917ed
Modified database files
2020-10-15 11:29:47 +02:00
65851afe4d
Database update
2020-10-14 10:59:55 +02:00
40864eee6b
add new token to report
2020-10-07 09:34:43 +02:00
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
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
ef043a169a
Increased number of max macro data fields from 15 to 20
2020-09-25 10:47:36 +02:00
da01f9abd5
Fix alter index
2020-09-16 17:32:05 +02:00
dbb1ec6b84
Too long name fix
2020-09-16 17:19:07 +02:00
e8efd228c0
Added indexes
2020-09-16 14:33:20 +02:00
b96cade165
new options 24x7 sla,availavility reports
2020-08-31 12:33:41 +02:00
3c0ea8b08a
Solved issues with DB
2020-08-10 15:10:17 +02:00
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
c67d8bd005
Fixed little issues
2020-08-07 13:29:09 +02:00
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
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
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
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
19a8288f26
Increase the size of tserver.version.
...
Ref pandora_enterprise#4943
2020-07-09 17:47:11 +02:00
231ba795dd
MR update
2020-07-09 16:53:03 +02:00
a1bd93bac7
Add database changes
2020-07-07 11:08:44 +02:00
49888fe48f
Added change to MR
2020-07-06 09:56:15 +02:00
47a7502c6b
Added change to MR
2020-07-06 09:55:14 +02:00
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
311b259684
Backup upload
2020-06-30 12:16:51 +02:00
c07daa3199
WIP Services
2020-06-29 19:17:40 +02:00
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
efb69c18bc
Ent 5809 message delete not working
2020-06-22 13:52:54 +02:00
9bae4f8a17
MR change - minor
2020-06-19 12:14:09 +02:00
6c5484baf0
MR change smart services
2020-06-18 12:35:52 +02:00
65c733e1dd
iot metaconsole
2020-05-27 09:18:21 +02:00
23c4609981
Merge branch 'develop' into ent-1193-Comprobar-codigo-de-estado-HTTP
2020-05-19 17:13:54 +02:00
197e309129
added new module type
2020-05-04 12:22:04 +02:00
1140a4345a
added new module type
2020-05-04 12:20:50 +02:00
026562e7ee
MR changes
2020-04-30 15:00:04 +02:00
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
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
3280ad479f
Fix dashboards
2020-04-13 15:01:18 +02:00
a75964fcba
minor fix
2020-04-08 16:06:39 +02:00
762ad3106d
Improvements and fixes H&D with review
2020-04-07 18:50:56 +02:00
801624b8a2
Deleted [RT] tag for recon templates
2020-04-07 14:04:06 +02:00
d908a9f7f6
Added default modules templates for recon tasks
2020-04-02 19:12:49 +02:00
7f1d4725bd
minor fix mr
2020-03-31 17:52:20 +02:00
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
f28de6f4d0
Fixed db issue
2020-03-31 10:45:30 +02:00
acabe543c4
csv recon0
2020-03-30 19:44:44 +02:00
fa372656f4
Fixed issue with DB
2020-03-30 17:48:09 +02:00
dc55ca5eff
WIP: Changes with PEN tables
2020-03-30 17:02:34 +02:00
3a74e25068
PEN management
2020-03-27 11:41:56 +01:00
452f5253e2
merge develop
2020-03-26 14:43:57 +01:00
e48ef76f35
merge
2020-03-26 14:38:23 +01:00
709201bf23
dashboards
2020-03-26 12:29:38 +01:00
fecff8aa93
Discovery review advanced
2020-03-25 18:02:58 +01:00
e1d233453f
Update database files
2020-03-25 13:05:56 +01:00
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
e05c292d7d
show last status change of module
2020-03-23 12:47:58 +01:00
c7e6f9fd34
Added disable event in alert template
2020-03-23 11:34:37 +01:00
037564810b
Increase WUX tests field size in database
2020-03-20 14:09:06 +01:00
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
c9813afc9b
DB changes
2020-03-19 12:13:56 +01:00
f58276ddbb
Templates
2020-03-18 19:31:58 +01:00
f3da919abc
WIP multiple changes
2020-03-16 23:52:20 +01:00
ce11d89953
Frontent changes
2020-03-13 14:03:50 +01:00
4e4c1495eb
Fixed merge conflict
2020-02-20 15:07:14 +01:00
87dc92ffd9
Ent 5457 suid nodos elastic
2020-02-18 13:24:22 +01:00
be47ed178b
Added force apply in policies
2020-02-05 12:49:52 +01:00
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
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
c68f83f013
availability failover
2020-01-15 17:16:46 +01:00
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
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
2926ead13b
Fixed group change on networkmap.ACL and source group working separated
2020-01-15 12:14:37 +01:00
5eb2953810
Added port option on server configuration to be used when connecting to execution server
2020-01-14 15:43:17 +01:00
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
7204e7c0f2
Ent 4862 mas opciones en los filtros de severidad
2020-01-13 18:24:29 +01:00
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
3dbdfdb6eb
Fix Landscape reports
2019-12-11 15:07:38 +01:00
6ba4a26564
Added timeoout option to command event responses
2019-12-10 11:54:30 +01:00
5880bec88a
changes in module data formatting when printed across the application and new setup options
2019-12-05 17:41:44 +01:00
b0d5b7223e
Added report template regex to MR
2019-11-27 13:21:05 +01:00
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
c28dfd60a5
Merge remote-tracking branch 'origin/develop' into ent-EDF
2019-11-26 16:16:15 +01:00
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
cf8bae66d1
Added index in MR
2019-11-26 10:31:57 +01:00
d0aab40fa8
Update 29.sql
2019-11-25 16:56:59 +01:00
1b4b59d1c2
Rules migration DB
2019-11-25 13:36:43 +01:00
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
21bf49c218
update id_source_event
2019-11-22 13:38:08 +01:00
1565fee3f4
minor fix, errata
2019-11-22 11:59:24 +01:00
fd12c5a009
DB update, default values for Alert correlation
2019-11-22 11:57:20 +01:00
35abd12499
WIP alert correlations
2019-11-22 11:06:55 +01:00
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
de3f8b2a0f
updates
2019-11-22 10:56:30 +01:00
960326b980
Add menu omnishell
2019-11-21 18:21:46 +01:00
362837f856
updated default values for tevent_rule, new tokens for correlated alerts
2019-11-21 17:47:21 +01:00
93c4793025
add id_source_event 33.sql
2019-11-21 17:36:01 +01:00
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
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
446d6c3507
Fix windows commands
2019-11-20 12:35:55 +01:00
79a135b077
Fix errata DESC => COMMENT
2019-11-20 11:36:15 +01:00
43ecba3bbb
operator fields for event_rule
2019-11-20 10:40:52 +01:00
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
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
1b5dcc3e28
Fixed errors in remote command
2019-11-19 12:35:52 +01:00
443eb1168c
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
2019-11-18 12:48:31 +01:00
9440570548
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
2019-11-15 13:08:09 +01:00
990ad339d3
db schema
2019-11-15 09:45:49 +01:00
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
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
94d87c2a3c
Avoid welcome window on updates.
2019-11-14 14:14:50 +01:00
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
b9633933e1
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
2019-11-12 14:17:45 +01:00
0213bc675e
add changes bbdd
2019-11-08 11:28:37 +01:00
276fc82556
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
...
Conflicts:
pandora_console/extras/mr/33.sql
2019-11-05 15:39:18 +01:00
e5f24ca884
Merge develop
2019-11-05 15:27:06 +01:00
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
115c884cd4
Discovery SAP
2019-10-31 21:13:18 +01:00
7bfa076263
fixed error bbdd
2019-10-30 14:52:10 +01:00
d37410ed8c
fixed error bbdd
2019-10-30 14:43:10 +01:00
b7710a6562
fix remove mr34 to mr33
2019-10-30 08:04:13 +01:00
2bb81a839a
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
2019-10-29 17:15:19 +01:00
f3fdcb4de0
MR update
2019-10-29 16:06:34 +01:00
3056c6741a
changes bbdd mr34
2019-10-28 12:20:55 +01:00
74007ebf70
33 => 34, cleanup
2019-10-28 12:18:56 +01:00
d6681cedd1
33 => 34
2019-10-28 12:18:13 +01:00
30caad5a6c
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
2019-10-15 16:50:05 +02:00
6bf3772690
remote cmd => remote execution
2019-10-09 19:20:58 +02:00
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
20cebbe988
Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
9bf2980f01
fix minor bugs in integria integration
2019-09-23 12:48:20 +02:00
6def88472a
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
43af2269ee
Fixed default values uncompress data
2019-09-18 11:51:01 +02:00
e409b33c6c
Added changes to treport_content_template to db
2019-09-17 12:32:07 +02:00
e89efea022
Added column 'uncompressed_module' to 'treport_content'
2019-09-16 11:18:01 +02:00
aa6c105841
Update 32.sql missed ';'
2019-09-12 17:47:49 +02:00
ebcce5cad4
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
...
# Conflicts:
# pandora_console/extras/mr/32.sql
2019-09-12 11:17:44 +02:00
148cd5cce6
db updates pandora_db
2019-09-05 10:45:17 +02:00
5c535514e1
Updated MR reference
2019-09-02 15:44:48 +02:00
de47275735
Fixed mr
2019-08-30 10:34:52 +02:00
63da85798e
Change mr
2019-08-26 16:10:06 +02:00
62ec37cf59
propagate tdatabase updates
2019-08-10 03:18:45 +02:00
adbb48ab87
pandora HA review
2019-08-10 02:13:01 +02:00
12eacc1933
Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
...
# Conflicts:
# pandora_console/extras/mr/31.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-08-05 09:26:18 +02:00
7ff5e23792
Merge branch 'ent-4460-Eliminar-antigua-integracion-con-integria' into 'develop'
...
removed all deprecated references to integria from code and db data
See merge request artica/pandorafms!2626
2019-08-02 12:28:03 +02:00
a36a293f19
added changes to pandora migrate and MR
2019-07-31 17:18:52 +02:00
927b1fa37f
removed all deprecated references to integria from code and db data
2019-07-31 16:46:26 +02:00
db25d3b231
Cleared unused table
2019-07-26 21:56:37 +02:00
ce346bd604
agent deployment
2019-07-24 17:38:25 +02:00
62d8c04ab3
Agent deployment v1
2019-07-23 13:01:50 +02:00
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
17dc0b82ac
Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora
2019-07-17 17:19:58 +02:00
f0bfe6910d
WIP agent deployment
2019-07-16 20:56:47 +02:00
3bbd01026e
WIP agent deployment
2019-07-15 19:37:04 +02:00
ecaba5ebd3
fixed errorsr macros reports
2019-07-12 10:24:46 +02:00
47cc0d9d6e
WIP: Agent deployment center
2019-07-10 23:59:09 +02:00
000cdfdcfd
WIP failover
2019-07-04 12:09:08 +02:00
22734a4ea2
WIP failover
2019-07-03 17:51:47 +02:00
209681e4c2
ADD failover option availability_graph
2019-07-02 11:50:58 +02:00
0064bc0cba
fixed errors
2019-07-01 17:07:39 +02:00
5ccc16d7d6
Revert 28.sql
2019-06-27 15:04:58 +02:00
225de6b5ea
MR forgotten change
2019-06-26 19:33:42 +02:00
4754e20784
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
2019-06-26 09:52:22 +02:00
004eb11048
MR29
2019-06-25 15:24:15 +02:00
a507d28c1f
Update Aws agent names
2019-06-25 10:12:25 +02:00
180948c51c
Import previous aws account
2019-06-24 19:36:50 +02:00
e4f6a95a89
MR29 credential store
2019-06-21 23:05:21 +02:00
fb24d9bf86
Update 29.sql
2019-06-21 12:08:31 +02:00
6682bad19f
first steps credential store
2019-06-21 12:03:25 +02:00
f1110c6d56
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
2019-06-21 11:31:01 +02:00
1dc826c9ff
Added field to tevent_filter (id_source_event)
2019-06-21 11:29:51 +02:00
833248991b
Add mr 29
2019-06-07 11:24:00 +02:00
30b8872ab3
fixed mr 28
2019-05-29 17:06:25 +02:00
552467286c
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/extras/mr/28.sql
2019-05-29 11:10:31 +02:00
5966367f8f
eHorus user level login conf added in user editor
2019-05-28 13:14:42 +02:00
3736d84589
Edit ehorus user
2019-05-27 18:49:47 +02:00
588d19102f
Resolve merge conflict
2019-05-27 18:30:24 +02:00
01d96728c8
changed PK to NULL
2019-05-24 11:03:09 +02:00
4c874e152c
Merge
2019-05-23 10:43:32 +02:00
2de2d1f482
Added expiration and deleted old cache data in pandora_db
2019-05-23 10:35:03 +02:00
alejandro.campos@artica.es
Daniel Barbero Martin
Daniel Maya
fbsanchez
Luis
Jose Gonzalez
Daniel Rodriguez
José González
Marcos Alconada
Ramon Novoa
Kike
Alejandro Fraguas
Tatiana Llorente