manuel
|
25f389b325
|
Merge branch 'develop' into 3193-Mal-unidades-de-tamaño-de-log-en-diagnostic-info
Conflicts:
pandora_console/extras/pandora_diag.php
Former-commit-id: d49e9ec693a709661bc69f2b3f4282ccb9a67123
|
2019-02-18 16:25:30 +01:00 |
Alejandro Gallardo Escobar
|
229c60c5cc
|
Merge branch 'develop' into cursed-format-change
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
|
2019-01-31 09:42:10 +01:00 |
daniel
|
d0fe6c9ecf
|
fixed mr token
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
|
2019-01-30 17:11:48 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |
fermin831
|
923c8ee0b8
|
Revert "Added tnetwork_matrix data structure"
This reverts commit 5328a0e239 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d].
Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a
|
2019-01-21 18:43:35 +01:00 |
fermin831
|
5328a0e239
|
Added tnetwork_matrix data structure
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
|
2019-01-21 17:42:41 +01:00 |
daniel
|
17b2ff2819
|
Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
fixed error migratesql
See merge request artica/pandorafms!2095
Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
|
2019-01-02 11:50:32 +01:00 |
daniel
|
ed30441f86
|
fixed error migrate 6 to 7
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
|
2018-12-28 13:42:40 +01:00 |
alejandro-campos
|
a1ba6fdf07
|
Merge branch 'develop' into 1440-Exportar-informes-pdf-en-formato-apaisado
Former-commit-id: ec3448cc0059fbf95e5ada224ca0f9082f6d693c
|
2018-12-19 19:15:43 +01:00 |
daniel
|
73d429ff67
|
fixed error migratesql
Former-commit-id: dba8e3108d2160f51aee058735a7822fd722dddb
|
2018-12-18 12:52:40 +01:00 |
manuel.montes
|
c5c5ba9403
|
Fixed bug in diagnostic info
Former-commit-id: 0318eabdf8cbf60267667ba1b4d74d8e476d0b3d
|
2018-12-12 12:21:52 +01:00 |
fermin831
|
386eeec7ef
|
Added group_recursion as tevent_rule column
Former-commit-id: fe86489eec11dd38627b8a72b9855e6675507281
|
2018-12-11 16:07:13 +01:00 |
daniel
|
a03adb1762
|
add field group filter
|
2018-12-03 18:00:41 +01:00 |
daniel
|
01a9621eb5
|
Custom fields view add new filters
|
2018-12-03 11:36:34 +01:00 |
vgilc
|
5ac947c2fd
|
Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop'
Ent 2169 rediris modificacion de comandos en alertas
See merge request artica/pandorafms!1878
|
2018-11-20 11:33:00 +01:00 |
daniel
|
4dbcecb951
|
WIP custom fields view
|
2018-11-13 15:46:44 +01:00 |
fermin831
|
d63666cbbc
|
Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/godmode/alerts/alert_actions.php
Modified files extra:
pandora_console/include/functions_alerts.php
|
2018-11-08 14:00:49 +01:00 |
daniel
|
58aa334798
|
fixed minor errors in graphs an license diag
|
2018-11-07 13:33:07 +01:00 |
alejandro-campos
|
ef90536152
|
added new field in treport table
|
2018-11-02 16:31:54 +01:00 |
daniel
|
0b0bad8a73
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
Conflicts:
pandora_console/extras/mr/22.sql
pandora_console/include/chart_generator.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_reporting.php
pandora_console/include/functions_reporting_html.php
pandora_console/include/graphs/fgraph.php
|
2018-10-25 17:43:28 +02:00 |
manuel.montes
|
2e74cd53f1
|
Changed tlayout_template name table to varchar 600
|
2018-10-24 16:50:40 +02:00 |
manuel.montes
|
9d7f063ef2
|
Changed tlayout_template name table to varchar 600
|
2018-10-24 12:39:58 +02:00 |
manuel.montes
|
f4add9a7f8
|
Changed tlayout_template name table to varchar 600
|
2018-10-24 11:49:18 +02:00 |
fermin831
|
3946124cc7
|
Inaugurate the 22 mr with an alter table in talert_commands
|
2018-10-22 09:49:06 +02:00 |
daniel
|
6bb478ea1a
|
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
|
2018-10-22 08:04:36 +02:00 |
daniel
|
a7918a1816
|
delete field flash chart php7
|
2018-10-19 11:56:49 +02:00 |
daniel
|
e299209a92
|
fixed visual console custam graph in meta
|
2018-10-18 13:24:15 +02:00 |
fermin831
|
aff2879340
|
Merge remote-tracking branch 'origin/develop' into ent-2740-servicios-favoritos
Conflicts:
pandora_console/extras/mr/21.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb_data.sql
|
2018-10-16 11:35:14 +02:00 |
fbsanchez
|
299868cfd5
|
meta_db* added to tmetaconsole_setup
|
2018-10-10 14:35:09 +02:00 |
fbsanchez
|
42caddeadd
|
Modified query to match MR requirements
|
2018-10-10 14:32:43 +02:00 |
fbsanchez
|
9b7ae31344
|
MR change
|
2018-10-09 16:09:44 +02:00 |
enriquecd
|
c1af14b90e
|
Change tlayou name table to varchar 600 - #2823
|
2018-10-05 12:25:15 +02:00 |
danielmaya
|
896ba6051b
|
fixed issue with string data in visual map
|
2018-09-26 11:00:44 +02:00 |
vgilc
|
1f0feebd1a
|
Merge branch '2324-Error-en-servidor-de-Pandora-FMS-dev' into 'develop'
Update mr and current package
See merge request artica/pandorafms!1807
|
2018-09-25 13:41:43 +02:00 |
danielmaya
|
02f1e4a83a
|
Update mr and current package
|
2018-09-25 13:37:47 +02:00 |
fermin831
|
8979890964
|
Added is_favourite to tservice table
|
2018-09-18 19:05:20 +02:00 |
fermin831
|
8196ed21df
|
New mr 21.sql commit
|
2018-09-18 18:55:53 +02:00 |
manuel.montes
|
65010d7080
|
Merge remote-tracking branch 'origin/develop' into 2497-Especificar-version-SNMP-en-tarea-de-reconocimiento-Lead-21487
Conflicts:
pandora_console/extras/mr/20.sql
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
|
2018-09-18 11:17:47 +02:00 |
vgilc
|
080cfb20ca
|
Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev'
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2018-09-17 14:44:24 +02:00 |
danielmaya
|
50a3e43bd4
|
Insert apache log model in tlog_graph_models
|
2018-09-17 12:43:51 +02:00 |
fermin831
|
c9af020d91
|
Remove unwanted git traces on 20.sql
|
2018-09-17 10:16:12 +02:00 |
manuel.montes
|
19645f0550
|
Modified trecon_task table
|
2018-09-13 18:17:28 +02:00 |
Alejandro Gallardo Escobar
|
e9752e790e
|
Added columns for a policy feature
|
2018-09-13 16:57:13 +02:00 |
manuel.montes
|
a2b3d6e07f
|
Deleted reports from cron
|
2018-09-12 13:43:23 +02:00 |
Alejandro Gallardo Escobar
|
40ff7b9042
|
Now is possible to link visual consoles from different nodes to the visual console elements
|
2018-09-10 11:25:44 +02:00 |
danielmaya
|
816b969741
|
Added table tlog_graph_models
|
2018-09-06 16:48:18 +02:00 |
Alejandro Gallardo Escobar
|
36247d391f
|
Merge branch 'develop' into ent-2588-service-like-visual-console-status
|
2018-09-04 17:25:23 +02:00 |
Alejandro Gallardo Escobar
|
22696a0fc6
|
Added new modes to calculate the status of the linked visual maps
|
2018-09-04 17:23:42 +02:00 |
danielmaya
|
19f7a5180c
|
Added default value in parent_module_id
|
2018-09-04 12:48:58 +02:00 |
danielmaya
|
5b30aa5560
|
Added source, comment and id_extra in event filter
|
2018-08-31 16:25:12 +02:00 |