e8076645d0
Merge branch 'develop' into '1491-Limite-de-caracteres-direcciones-de-email-en-cron-jobs-dev'
...
# Conflicts:
# pandora_console/extras/mr/9.sql
2017-11-15 09:47:21 +01:00
776aca90d6
Merge branch 'develop' into 1505-acl-de-grupos-para-los-elementos-de-la-consola-visual-dev
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/reporting/visual_console_builder.editor.js
pandora_console/include/ajax/visual_console_builder.ajax.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/pandoradb.sql
2017-11-15 09:43:33 +01:00
b12d529578
Merge branch '1276-Cascade-protection-a-nivel-de-módulo-dev' into 'develop'
...
1276 cascade protection a nivel de módulo dev
See merge request artica/pandorafms!933
2017-11-15 09:31:05 +01:00
90b99c491a
Merge branch '1509-calculo-de-estado-en-consola-visual-mediante-el-peso-de-su-padre-dev' into 'develop'
...
Added new system of calculate status if user set a parent weight
See merge request artica/pandorafms!1043
2017-11-15 09:28:10 +01:00
e6d5adbf22
Changed MR
2017-11-14 10:38:50 +01:00
3493b9c15c
Revert "code backup"
...
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
fac066debd
Added groups acl in all visual console elements
2017-11-08 15:01:44 +01:00
c9d1fab036
Added new system of calculate status if user set a parent weight
2017-11-08 12:49:03 +01:00
baab22bb28
add queries mr8 and migrate
2017-11-07 11:44:09 +01:00
594b6e9417
Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
...
1320 exportación csv saca entities dev
See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
b9851a3a71
code backup
2017-10-31 11:51:19 +01:00
2da1e57dc1
Change pandora migrate and add mr8 changes - #654
...
Conflicts:
pandora_console/extras/mr/8.sql
2017-10-30 17:26:35 +01:00
f608c686b8
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-30 17:23:59 +01:00
8163200f54
Revert "Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'"
...
This reverts merge request !871
2017-10-30 16:11:58 +01:00
65ae5ed2eb
Merge branch '654-Cambios-en-informes-de-maximo-minimo-y-media-4480' into 'develop'
...
Graph and table mode for max, min and avg reports and template reports - #654
See merge request artica/pandorafms!871
2017-10-30 15:51:51 +01:00
49a1f7d872
Merge branch '1459-Campo-para-establecer-el-tiempo-de-autorefresco-dev' into 'develop'
...
Added time autorefresh
See merge request artica/pandorafms!945
2017-10-30 10:58:07 +01:00
7e6adb5d40
Db changes for tgraph_source field order - #1382
2017-10-24 19:02:16 +02:00
92d2179469
updated version
2017-10-24 17:11:56 +02:00
9b1cbf3c9b
Changed column in tuser_task_scheduled
2017-10-24 13:10:07 +02:00
ea51df8b20
Add show on top option to all visual console elements - #1313
2017-10-23 18:54:57 +02:00
f6e012e0fa
Added time autorefresh
2017-10-23 13:17:06 +02:00
c9ff9e77a3
Apply db changes to hide no data field event template reports - #1326
2017-10-18 18:22:00 +02:00
b641323eed
[ artica/pandora_enterprise#1462 ] Added the DB changes needed by the dashboard items slideshow feature
2017-10-18 17:29:06 +02:00
74308ae42b
Created Safe operation mode
2017-10-17 16:58:05 +02:00
1838a6b30a
Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'"
...
This reverts merge request !863
2017-10-16 16:44:16 +02:00
c86bd5cc3c
Fix pandora diag texts and delete old secitons files - #1350
2017-10-09 15:36:28 +02:00
80495ddaf7
Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'
...
create mr8 for send mail plain/text
See merge request !863
2017-10-09 10:11:07 +02:00
570a209861
Db maintenance section is now called Admin tools with only admin access permission, erase all subsection except db interface and db status - #1350
2017-10-04 19:02:45 +02:00
788265713e
Graph and table mode for max, min and avg reports an template reports - #654
2017-10-02 18:23:26 +02:00
2d673c8ac1
create mr8 for send mail plain/text
2017-09-27 13:46:29 +02:00
8ce6920e44
DB changes for visual console group elements - #1245
2017-09-07 12:11:13 +02:00
f954b92aae
fixed error in mr for WUX
2017-09-05 11:06:49 +02:00
d74a3f74b4
Merge branch 'develop' into 1056-pandora-wux-grid-server
2017-09-01 10:51:54 +02:00
6b4a15534d
Merge branch 'develop' into '1211-Falta-tabla-de-proceso-de-reseteo-de-contraseñas-en-MR'
...
# Conflicts:
# pandora_console/extras/mr/6.sql
2017-08-31 18:21:08 +02:00
afd184f466
Update 6.sql
2017-08-31 17:58:34 +02:00
2fe8849708
Added db changes to mr 6
2017-08-31 11:33:08 +02:00
b078d48918
fixed errors in wux
2017-08-30 09:47:57 +02:00
ae971ded58
Fix on migrate 6.0 to 7.0
2017-08-28 19:15:10 +02:00
2b18b1589c
Added new module type: web_analysis
2017-08-28 19:05:08 +02:00
068be133ed
Add password reset table in MR - #1211
2017-08-28 12:22:59 +02:00
f021bedb5c
Added proxy servers to events response form
2017-08-24 12:34:06 +02:00
3291526195
Added new fields to server table
2017-08-23 12:41:36 +02:00
c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
8232911713
merge develop
2017-08-22 18:39:34 +02:00
870be2c4ea
Merge branch '1191-Fallo-en-base-de-datos-para-actualizar-protección-en-cascada-dev' into 'develop'
...
Fixed issue with cascade_protection_module
See merge request !720
2017-08-18 12:34:31 +02:00
059dec7cc9
Fixed delimiter
2017-08-16 17:04:21 +02:00
bf77ea14d1
Added recover delimiter
2017-08-16 10:36:30 +02:00
47c851be95
Merge branch '1109-mysql-procedure-error-in-pandora-migrate-dev' into 'develop'
...
Added recover delimiter
See merge request !666
2017-08-14 12:25:35 +02:00
1d7d55a451
fixed errors in form wux
2017-08-09 13:27:51 +02:00
3ef3679f10
Fixed issue with cascade_protection_module
2017-08-08 10:38:30 +02:00
590bfbfe84
mr-5 add queries
2017-08-07 13:57:04 +02:00
ea06ba213b
Added registration method to reset pass
2017-08-03 13:05:57 +02:00
88879462a3
Merge branch 'develop' into '1071-Formulario-gráfica-combinada-automática-open'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2017-07-28 10:34:06 +02:00
9a791dc0a5
Merge branch '1082-some-modifications-in-change-pass-feature-dev' into 'develop'
...
Added some fixes to reset pass feature
See merge request !677
2017-07-28 10:23:31 +02:00
278330e8f6
Added some fixes to reset pass feature
2017-07-19 11:37:17 +02:00
6dba0a5040
Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
...
# Conflicts:
# pandora_console/extras/mr/4.sql
2017-07-18 12:24:49 +02:00
f0e43e252c
New feature: Add groups to policies
2017-07-18 12:06:57 +02:00
d594b98cc3
Added recover delimiter
2017-07-18 11:48:59 +02:00
4aa04cfef0
Set texport_server table name field varchar 600 - #1015
2017-07-17 16:19:38 +02:00
66ad86a302
Merge branch '1015-Aumentar-tamaño-del-campo-nombre-en-tabla-texport_server_data' into 'develop'
...
Change tserver_export_data to varchar 600 - #1015
See merge request !600
2017-07-17 15:41:45 +02:00
1ea465b7d4
Added db changes to package 708
2017-07-17 10:46:26 +02:00
e6e993538b
Add historical db check to reports template SQL items - #853
2017-07-03 10:38:04 +02:00
342db3c4fb
Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071
2017-06-29 17:33:29 +02:00
7e383262bb
Change tserver_export_data to varchar 600 - #1015
2017-06-20 13:56:20 +02:00
035829ce91
Replaced procedures with prepared statements.
...
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
2017-06-15 15:43:00 +02:00
d2d56b4b89
Add a missing MR.
2017-06-15 13:47:20 +02:00
7c3ef317b0
Revert "Add a missing MR."
...
This reverts commit 16b0da1515
2017-06-15 10:50:31 +02:00
16b0da1515
Add a missing MR.
2017-06-15 10:33:30 +02:00
c78711ba6f
Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop'
...
539 encrypt agent custom fields in pandora console dev
See merge request !520
2017-06-14 11:42:51 +02:00
7a9f63f212
Added change to db
2017-06-01 14:30:34 +02:00
4d46470e96
Added target_ip to policy_modules table
2017-06-01 14:24:24 +02:00
efd28c0513
Added Enrique Camargo db changes to mr number 2
2017-06-01 11:28:24 +02:00
2216f7ecb9
Add token to Sql query report items for use historical database - #853
2017-05-31 12:42:43 +02:00
47862600a4
Added los querys to migrate
2017-05-30 15:33:16 +02:00
1e0af6ec26
Added field to db
2017-05-29 11:58:42 +02:00
a4636f3435
Added changes in db
2017-05-29 11:55:04 +02:00
0f9a2cf2f8
New feature: Graphic grouping. added mr
2017-05-23 17:17:40 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
37757f7ace
Merge branch 'develop' into '596-default_event_filter_by_user'
...
# Conflicts:
# pandora_console/godmode/users/configure_user.php
2017-05-23 09:48:37 +02:00
2e3f6ad700
Added change to mr
2017-05-10 15:21:42 +02:00
de650b9ef2
Added change to mr (enriquecd)
2017-04-25 16:26:45 +02:00
bd5cda07c4
deleted 1.sql
2017-04-25 10:28:46 +02:00
82530c9b59
Added external query to mr
2017-04-20 16:18:37 +02:00
c3ccb00b2a
new file.
2017-04-20 13:36:03 +02:00
29ad608ddb
Added ; to query transaction
2017-04-18 11:41:51 +02:00
97abef62c4
Added db field to mr
2017-04-18 11:39:46 +02:00
bf368a155b
Drop addcol procedure if not exists
2017-04-17 13:25:36 +02:00
4178343313
Added procedure to avoid migrate fail in tbackup
2017-03-30 17:11:49 +02:00
13620b1489
fixed custom logo login
2017-03-27 12:01:31 +02:00
644eeaa7aa
delete file
2017-03-23 16:51:00 +01:00
d006c81eb0
delete files.
2017-03-23 15:53:44 +01:00
173141c90a
add news field trecorn-task migrate
2017-03-22 16:31:34 +01:00
b00ddd9beb
new file.
2017-03-22 11:29:28 +01:00
5cf45a08ec
new file
2017-03-22 11:10:09 +01:00
2b7e5de6a1
new file
2017-03-22 11:03:38 +01:00
be188dcf68
new file
2017-03-22 10:47:51 +01:00
7c94400e7b
MR
2017-03-22 10:29:10 +01:00
0b564c2866
new file
2017-03-21 13:43:01 +01:00
2994a9f8a1
new file.
2017-03-21 13:32:08 +01:00
e34ec2109a
Fixed problem with extension backup. Add new column in migrate sql.
2017-03-21 13:15:45 +01:00
c23767c5d7
new mr file.
2017-03-21 13:11:17 +01:00
d6fb515034
new file.
2017-03-21 12:23:46 +01:00
d5a70bc15e
Deleted files.
2017-03-21 12:04:05 +01:00
cb1cd58d83
new file
2017-03-17 11:36:10 +01:00
317b5cfb04
Fixed the migration to pandora 7
2017-03-16 19:03:15 +01:00
37fd8f8851
new sql mr
2017-03-16 12:23:25 +01:00
5d09cfdef3
new file
2017-03-16 12:03:29 +01:00
e7fa5d1f00
New file
2017-03-16 11:15:36 +01:00
309ed42a8f
New mr.
2017-03-15 17:20:16 +01:00
def9172bb9
Deleted files.
2017-03-15 17:04:40 +01:00
a094f67dd9
New file.
2017-03-15 15:50:36 +01:00
025b8329ea
Deleted oracle and postgre files.
2017-03-15 10:34:25 +01:00
a85298d432
new file
2017-03-14 17:11:47 +01:00
26339b39f0
delete file
2017-03-14 16:57:51 +01:00
01945c3cb5
new mr
2017-03-14 16:56:00 +01:00
32f984020b
new mr
...
o
2017-03-14 16:51:38 +01:00
cc39f6d1a8
New file.
2017-03-14 16:46:21 +01:00
fd4b62f604
Delete files
2017-03-14 15:47:11 +01:00
f18f2e1068
New file.
2017-03-14 12:11:16 +01:00
f49d7f3eec
New file.
2017-03-14 10:21:38 +01:00
9e7c6612be
Merge branch 'develop' into feature#new-iface-names
2017-03-10 10:32:40 +01:00
68803706d4
Add querys to remove from DB graph availability widget. Gitlab: #470
2017-03-08 13:53:24 +01:00
469c276512
Added file.
2017-03-08 13:26:06 +01:00
dff80fed84
Add a new Recon module that will be used by the Satellite Server too.
2017-03-08 13:20:00 +01:00
bbab12f50e
added file.
2017-03-08 13:12:31 +01:00
ef0f55e2c2
added file.
2017-03-08 11:44:49 +01:00
631a4d0777
fixed minor error in table metaconsole_agent
2017-03-06 16:19:03 +01:00
8bab8bbada
add checkbox alias_as_name recon task
2017-03-06 16:10:07 +01:00
c25595f64b
add new checkbox for alias
2017-03-06 15:22:01 +01:00
eea926255b
Added new files.
2017-03-06 13:44:41 +01:00
bcf1fc2e1b
Merge db system. Ticket #444
2017-03-03 10:27:52 +01:00
17015c4afc
Fixed syntax error.
2017-03-03 16:05:58 +09:00
217cffbf05
Merge um packages system. Ticket #439
2017-03-02 15:45:27 +01:00
45ea30e5b3
fixed nome agent for alias agent
2017-02-24 13:59:03 +01:00
58617c00aa
Merge branch 'develop' into feature/alias_friendly_name
2017-02-20 18:52:18 +01:00
651e7ea8e6
Changed migration file name. Ticket #297
2017-02-20 12:35:52 +01:00
545dad643c
XMerge branch 'develop' into feature/alias_friendly_name
2017-02-20 12:04:43 +01:00
f9eb762951
Changed license url and update url. Ticket #299
2017-02-20 10:32:07 +01:00
f02827d235
Changed field type in db to get negative numbers. Ticket #120
2017-02-17 12:43:12 +01:00
c8c79e6fec
Add session_time column to tusuario table - #61
2017-02-16 17:33:17 +01:00
d39b108c1f
Merge branch 'develop' into feature/alias_freandly_name
...
Conflicts:
pandora_agents/unix/pandora_agent
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
pandora_console/godmode/agentes/agent_manager.php
pandora_console/godmode/agentes/modificar_agente.php
pandora_console/godmode/agentes/planned_downtime.editor.php
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/godmode/massive/massive_edit_modules.php
pandora_console/include/class/Tree.class.php
pandora_console/include/functions_graph.php
pandora_console/include/functions_treeview.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/pandoradb.sql
2017-02-16 16:05:21 +01:00
165b59656e
Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7'
...
# Conflicts:
# pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
2017-02-15 15:49:16 +01:00
de392d26ad
Update the Update Manager URLs.
2017-02-15 15:41:54 +01:00
584427de06
Added changes to finish rr feature. Ticket #169
2017-02-14 09:36:11 +01:00
5b7f4a5139
Merge branch 'develop' into feature/rolling_release
...
Conflicts:
pandora_console/general/header.php
pandora_console/include/functions.php
pandora_console/index.php
pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
46e1d41ce0
Fixed netflow filter. Ticket #207
2017-02-09 12:55:11 +01:00
1f1023db92
Added new fields to alert macros (snmp as well). Ticket #233
2017-02-07 10:41:48 +01:00
3e0b0f231b
Added more fields to alert macro fields. Ticket #233
2017-02-06 16:20:39 +01:00
08f4f9524b
Add titem, tmap, trel_item tables to migration 6 - 6.1 script - #34
2017-01-31 15:39:06 +01:00
3c8bc86ab7
Added cascade protection by module (agent, massive and api). Ticket #187
2017-01-25 13:59:14 +01:00
d16aa71c53
Added missing ';'.
2017-01-17 16:14:17 +09:00
6447189606
Improve visual console - #110
2017-01-16 13:31:56 +01:00
4e1dcc5aba
add new field in tgraph
2016-12-27 13:35:18 +01:00
c3d1ba7aa6
Fixed problems with cron interval qhen type of module is a data server. Ticket: #4242
2016-12-22 12:13:53 +01:00
01217fe3b2
Add support to link modules via XML data files.
2016-12-14 12:59:31 +01:00
eadb6b2360
Create the eHorusID custom field by default.
2016-12-12 12:07:58 +01:00
534b7eb05a
Visual console improvements - Update database - #110
2016-11-16 18:55:36 +01:00
9523557145
Add remote agent filter in manage agent, add remote field in database #4121
2016-11-02 16:58:53 +01:00
e974516b77
New value to transactional agents in db table
2016-10-27 12:50:50 +02:00
e410237cb7
New networkmaps (New data to relations db)
2016-10-19 10:29:40 +02:00
be89ec1c9b
Merge branch 'develop' into feature/data_precision
2016-10-19 09:50:41 +02:00
fd1d09a2f2
New networkmaps (Added changes to db)
2016-10-19 09:44:21 +02:00
a100241b71
Data precision... (Changes in migrate)
2016-10-19 09:31:45 +02:00
d5d1727fe7
add new field for modules
2016-10-14 10:16:21 +02:00
18bfa9e2ac
add column and update alias
2016-10-06 16:39:44 +02:00
58f0ccae77
Added default event filter. Ticket #3930 .
2016-08-31 11:13:37 +02:00
af0d5b868d
Links updated. Ticket #3997 .
2016-08-24 12:29:02 +02:00
e32c606fb0
Added new date filters. Ticket #3946 .
2016-08-19 11:23:09 +02:00
318175b2dc
Fixed link to module library. Ticket #3953 .
2016-08-17 11:43:46 +02:00
798fa8e952
Merge branch 'handle-unknown-properly' of https://github.com/uchida/pandorafms into uchida-handle-unknown-properly
2016-07-28 12:50:58 +02:00
cf2915ec73
Added dir estructure to minor release system.
2016-07-20 10:54:08 +02:00
e9e5520ea9
Exclude disabled agents scheduled stops. Ticket #3878 .
2016-07-04 15:46:56 +02:00
da7d8d0773
fixed change url update manager. Ticket #3809 .
2016-06-15 11:10:57 +02:00
aa4e07cb13
change url update manager. Tciket #3809 .
2016-06-13 15:27:36 +02:00
8c30cbd756
Added AUTODISABLE mode to agents Tickets #3497
2016-06-03 11:58:13 +02:00
225aef21ad
BIG_OPERATION_STEP, SMALL_OPERATION_STEP of pandora_db.pl to be configured through the Console. TICKET #3558 .
2016-05-27 16:37:58 +09:00
1da312b8a5
use last_known_status/known_status column to handle unknown properly
2016-04-22 16:36:26 +09:00
61280b2ad9
Updated migrate sql script to add integria alert changes TICKETS #3091
2016-04-04 13:57:30 +02:00
5e848da19a
Revert "Updated migrate sql script to add integria alert changes TICKETS #3091"
...
This reverts commit baf2497d99
2016-04-04 13:51:21 +02:00
baf2497d99
Updated migrate sql script to add integria alert changes TICKETS #3091
2016-04-04 13:30:47 +02:00
582b4abb35
Changed column type of 'tagente_estado.status_changes' to unsigned.
...
(Fixed ff_threshold evaluation.)
Because of column type difference bettween 'tagente_estado.status_changes'
and 'tagente_modulo.min_ff_event', it didn't work correctly with over 127.
2016-04-01 12:46:47 +09:00
f397b657f1
Added new server_keepalive column to have individual keepalive TICKETS #3273
2016-03-15 16:02:27 +01:00
e2ad075152
Added a new feature to the alert template.
...
It allows to reset minimum number of alert when the alert status is not
continuously.
2016-03-09 11:33:01 +09:00
8d54a6762a
Added the 'automatic custom graphs' in the template reports in metaconsole.
2016-02-02 14:55:03 +01:00
03ba93c9ca
Fixed pandora diag in oracle version. Ticket#2906
2015-10-19 19:44:26 +02:00
53b11ffafe
Fixed sql migrate
2015-10-15 11:09:32 +02:00
9e70e398fb
Add line tu update url update manager
2015-10-15 09:23:00 +02:00
c8cff22acb
Fixed an SQL error in the migration script.
2015-10-14 17:03:25 +02:00
063c89008a
Add new columns for a new features.
2015-10-08 10:37:13 +02:00
9863da5aa5
Added columns for future 6.x features and fixed an error.
2015-10-08 10:21:43 +02:00
2d36697db8
Fixed module relationships. Ticket#2766
2015-10-07 14:01:49 +02:00
7d6f03c3c8
Fixed problems with save event filters and dont save agent and module. Tiquet: #2794
2015-09-30 09:26:19 +02:00
a6ac8c02f8
Fixed sql error in migration. Ticket #2708
2015-09-09 09:50:20 +02:00
9cff84f800
Fixed error in actualizate db_build_version in oracle db and minor error in mysql db. Ticket#2663
2015-09-07 10:36:06 +02:00
ef06e98693
Fixed problems with querys when db engine is Oracle
2015-09-04 11:35:47 +02:00
6658104e84
Fixed some networks components (about mysql plugin) in the installation SQL. TICKET: #2485
2015-08-17 13:39:06 +02:00
a1d1cc5eb9
Now diagnostic info have a new data, 'db_scheme_first_version' and show the first pandora db scheme version.
2015-07-22 11:24:50 +02:00
cbc27d103d
Now the value 'db_scheme_version' show the correct bd version (only mysql). Ticket#2430
2015-07-22 10:42:47 +02:00
58891bf50a
Moved a table to fix an error and added the change to the migrate and the oracle and postgres files
2015-07-02 12:05:02 +02:00
440687c0d7
Merge branch 'develop' of https://github.com/pandorafms/pandorafms into develop
2015-06-26 11:46:58 +02:00
vgilc
Arturo Gonzalez
danielmaya
daniel
enriquecd
nramon
Alejandro Gallardo Escobar
Enrique Camargo
fbsanchez
fermin831
m-lopez-f
Junichi Satoh
Hirofumi Kosaka
Akihiro Uchida
mdtrooper
Alejandro Gallardo Escobar