tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,744 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1121 Commits

Author SHA1 Message Date
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01: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
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González b7bd28ba07 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-10 10:17:27 +00:00
Daniel Rodriguez 06a027127f Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop' 
Ent 6851 quitar marquesina de vista de eventos

See merge request artica/pandorafms!3752
 2021-03-09 16:39:26 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +00:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Jose Gonzalez f1dd050333 Solve deleted files 2021-03-09 15:19:28 +01: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
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +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
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +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
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +01:00
Daniel Rodriguez 4d84ae8b58 Merge branch 'ent-6844-quitar-vista-estadisticas-eventos' into 'develop' 
Removes event_statistics view

See merge request artica/pandorafms!3738
 2021-01-28 10:25:13 +01:00
Luis 905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
Luis Calvo a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +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 954c12646b Added task save report to disk changes to migrate 2021-01-26 16:46:45 +01:00
Luis Calvo dc3ee2d553 Added task save report to disk changes to MR 2021-01-26 16:36:13 +01:00
fbsanchez d9428ce215 WIP DBMainainer, fixed Websockets library placement 2021-01-25 13:33:02 +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
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