Commit Graph

915 Commits

Author SHA1 Message Date
enriquecd 8fce51a816 Filter clusters by groups - #1868 2018-02-28 14:32:35 +01:00
enriquecd b51dc73cd6 Change cluster view design - #1877 2018-02-14 18:37:27 +01:00
enriquecd c889776f44 Add visual animation to popup modal windows - #1781 2018-02-08 16:51:58 +01:00
fbsanchez 571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
	pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
vgilc 0f01fcbd20 Merge branch 'Gráficas-generadas-en-Dynamic-dev' into 'develop'
Added type graph selection in container graph

See merge request artica/pandorafms!1113
2018-02-06 09:55:36 +01:00
danielmaya aea9d6ae36 resolved conflicts with containers and added mr12 2018-02-06 09:21:07 +01:00
enriquecd 47f0a90cab Show not init monitors - #1748 2018-02-02 14:10:03 +01:00
vgilc 5a198404b7 Merge branch '1525-Imagenes-WUX-no-salen-bien-en-histórico-4776-pelayo' into 'develop'
Fix history data dialog for base 64 images on modules view - #1525

See merge request artica/pandorafms!1107
2018-01-29 12:55:14 +01:00
daniel e2ee8a555d add fullscale container graph 2018-01-03 15:53:49 +01:00
vgilc 9a96103164 Merge branch '1257-Traducciones-consola-open' into 'develop'
Change texts in pandora - #1257

See merge request artica/pandorafms!1062
2017-12-14 15:56:54 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
danielmaya 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
vgilc 019829685c Merge branch '1564-Error-al-crear-módulos-SNMPv3-desde-snmpwalk-dev' into 'develop'
Fixed creating network components by snmpwalk

See merge request artica/pandorafms!1065
2017-11-29 16:15:21 +01:00
vgilc 3a5b8928ac Merge branch 'ent-1035-busqueda-libre-en-visor-de-datos' into 'develop'
Added free search values to data table

See merge request artica/pandorafms!992
2017-11-29 16:10:46 +01:00
vgilc e2680696ee Merge branch 'visual-console-agent-link-bug' into 'develop'
Bug en enlace de agente en Consolas visuales

See merge request artica/pandorafms!952
2017-11-29 14:10:51 +01:00
vgilc 89c08ede12 Merge branch '1351-AND-filters-added-to-snmp-filters-(so-much-wow)-dev' into 'develop'
1351 and filters added to snmp filters (so much wow) dev

See merge request artica/pandorafms!978
2017-11-29 14:07:58 +01:00
Alejandro Gallardo Escobar f49cef9ca4 Merge branch 'develop' into visual-console-agent-link-bug
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-29 14:00:44 +01:00
fermin831 fdd168007b Fixed tree view on public dashboards 2017-11-23 18:38:22 +01:00
danielmaya 897d7bf258 Added type graph selection in container graph 2017-11-23 18:01:32 +01:00
vgilc 62ffb46763 Merge branch '1471-fallo-enlace-publico-dashboards' into 'develop'
Fixed public dashboard permissions

See merge request artica/pandorafms!1004
2017-11-23 09:03:07 +01:00
enriquecd 0581e6420d Fix history data dialog for base 64 images on modules view - #1525 2017-11-21 17:58:24 +01:00
fermin831 0f814c0b63 Added public dashboard authentication to some components 2017-11-21 16:59:49 +01:00
Arturo Gonzalez 76576899f9 Added acl group to visual console status elements 2017-11-16 10:37:46 +01:00
Arturo Gonzalez bcc6672cdf Merge branch 'develop' into 1612-se-borran-elementos-al-mover-un-item-en-consola-visual-dev
Conflicts:
	pandora_console/include/ajax/visual_console_builder.ajax.php
2017-11-16 08:09:05 +01:00
Arturo Gonzalez 1a4597874a Fixed move function 2017-11-16 08:06:52 +01:00
enriquecd 8fa2acfd2a Merge branch 'develop' into 1313-Poder-elegir-posición-en-consola-visual-4517-2
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/pandoradb.sql
2017-11-15 17:35:51 +01:00
Arturo Gonzalez 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
vgilc 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
danielmaya 31d1f80a12 Fixed creating network components by snmpwalk 2017-11-14 13:31:39 +01:00
enriquecd 089a0f94ea Change texts in pandora - #1257 2017-11-14 11:37:49 +01:00
Arturo Gonzalez 274c551671 Added height to bars graph 2017-11-14 08:50:12 +01:00
Arturo Gonzalez 49df1e448a Added changes from donut graph 2017-11-13 09:59:00 +01:00
Arturo Gonzalez 110945bccf Added the last change to load string modules 2017-11-13 09:35:24 +01:00
Arturo Gonzalez eb39d25c4b Added field to get string modules 2017-11-10 15:03:52 +01:00
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
Arturo Gonzalez fac066debd Added groups acl in all visual console elements 2017-11-08 15:01:44 +01:00
Arturo Gonzalez c9d1fab036 Added new system of calculate status if user set a parent weight 2017-11-08 12:49:03 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
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
2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
vgilc 601d67fc7e Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714' into 'develop'
fixed errors in fullscale graph and normal graph

See merge request artica/pandorafms!1025
2017-11-07 11:50:23 +01:00
vgilc 7e6cc539e8 Merge branch '1396-problems-with-percentile-items-in-visual-console-dev' into 'develop'
Fixed problems with unit

See merge request artica/pandorafms!1027
2017-11-07 11:23:02 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +01:00
Arturo Gonzalez 94a9bcb85b Modified simple value 2017-11-07 10:26:26 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
danielmaya 7c78cd2a34 Fixed password entities in snmp walk 2017-11-03 13:18:00 +01:00
fermin831 24e93d0cd6 Fixed style code 2017-11-02 18:11:54 +01:00
fermin831 443163515d Added checkbox to free search on agents data view 2017-11-02 15:51:37 +01:00
fermin831 92c7eb59f5 Fixed public dashboard permissions 2017-10-31 19:48:56 +01:00
fermin831 2adf951121 Added free search values to data table 2017-10-30 15:45:31 +01:00
Arturo Gonzalez 9145811d29 Added final lost code 2017-10-27 10:40:58 +02:00
Arturo Gonzalez 139db28eca Added lost code 2017-10-26 16:13:27 +02:00
Arturo Gonzalez 802cb3ef5e Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 14:41:07 +02:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00
Arturo Gonzalez 704511aa56 Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 13:40:01 +02:00
vgilc e8a14b6981 Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
1416 new h and v bar charts in visual console dev

See merge request artica/pandorafms!956
2017-10-26 13:30:52 +02:00
vgilc 0f50c3ff82 Merge branch '1429-new-options-in-agent-graphs-section-dev' into 'develop'
Added new item to choose between line and area. Changed radio button to select.

See merge request artica/pandorafms!886
2017-10-26 13:28:24 +02:00
Arturo Gonzalez 91a39ab01e Added visual upgrades to filter view 2017-10-26 11:03:08 +02:00
daniel 4ef0c6cd5f fixed errors visual console 2017-10-24 18:14:57 +02:00
enriquecd ea51df8b20 Add show on top option to all visual console elements - #1313 2017-10-23 18:54:57 +02:00
Arturo Gonzalez 92633f21b4 Added element to view 2017-10-23 16:19:11 +02:00
Arturo Gonzalez 9b01919342 Fixed function to get string type 2017-10-23 14:58:02 +02:00
vgilc 9de7f7591d Merge branch '1478-Problemas_varios_en_consolas_visuales' into 'develop'
1478 problemas varios en consolas visuales

See merge request artica/pandorafms!944
2017-10-23 11:06:51 +02:00
Arturo Gonzalez 05bbdecdd8 Added item to editor 2017-10-23 08:32:41 +02:00
daniel fc5fce8f5e fixed multiple error static_graph meta 2017-10-20 11:08:45 +02:00
Alejandro Gallardo Escobar d5646e80b7 [artica/pandora_enterprise#1390] Fixed the error which caused the agent link status changed when moving a visual console item 2017-10-19 13:35:35 +02:00
Arturo Gonzalez 1d3a082e5c Added item to editor 2017-10-19 12:22:01 +02:00
Arturo Gonzalez 90e12d66c2 Added item form and code in js 2017-10-19 10:52:19 +02:00
Arturo Gonzalez ddbe2a298c Adapts donut graph to meta 2017-10-18 16:29:51 +02:00
Arturo Gonzalez 0f2d6d17be Added change about linked visualmaps 2017-10-18 15:13:26 +02:00
Arturo Gonzalez f6fca4e46d Added donut to node visual consoles 2017-10-18 11:40:40 +02:00
Arturo Gonzalez d18dded93a Added a lot of code to add donut graph to visual console. Print donut in progress. 2017-10-17 10:54:08 +02:00
Arturo Gonzalez 7410d66192 Bubble item and percentile bar item are new. Fixed some visual errors 2017-10-06 14:04:20 +02:00
Arturo Gonzalez 01df63b179 Fixed minor errors and init d3 function 2017-10-05 13:33:34 +02:00
Arturo Gonzalez 675426c3e0 Added the new item. Only to db and js creation and update. 2017-10-05 13:10:19 +02:00
vgilc 79f6c7fb49 Merge branch '1250-Salida-de-comandos-como-capturas' into 'develop'
Fix data 64 images in dialog for command_snapshot config token - #1250

See merge request !844
2017-10-05 12:27:32 +02:00
Arturo Gonzalez 4ab4533fca Added new item to choose between line and area. Changed radio button to select. 2017-10-05 10:48:14 +02:00
enriquecd 00eba72a99 Fix data 64 images in dialog for command_snapshot config token - #1250 2017-09-22 10:56:52 +02:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
vgilc da0294b872 Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop'
Add show_statistics option for group item - #1245

See merge request !766
2017-09-11 09:45:45 +02:00
Arturo Gonzalez ad2cf22fa4 Added new format to string data 2017-09-05 17:33:38 +02:00
daniel f0862e1c5b fixed minor errors in WUX 2017-09-04 12:09:19 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
enriquecd f6c6e2a6ba Add show_statistics option for group item - #1245 2017-08-31 15:09:04 +02:00
Arturo Gonzalez 976581e983 Adjust timeout in events response commands 2017-08-29 15:54:12 +02:00
Arturo Gonzalez 63fb488176 Clean code 2017-08-29 11:52:34 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
Arturo Gonzalez 6b4dfe9885 Added remote server to snmp browser 2017-08-28 10:02:46 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
Arturo Gonzalez ffed7359bc Added execution in server proxy to event response commands 2017-08-24 13:25:03 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
vgilc be2eee1afa Merge branch '109-modificar-titulo-de-columna-umbrales-en-vista-de-agente' into 'develop'
Text change warn by thresholds

Closes #109

See merge request !318
2017-08-18 13:15:27 +02:00
vgilc 7d1a7103ad Merge branch '1190-Fallo-al-buscar-módulos-de-agente-en-protección-en-cascada-dev' into 'develop'
Fixed issue to search agent modules in cascade protection

See merge request !717
2017-08-18 13:05:01 +02:00
Daniel Maya e1d4a81034 Fixed issue with simple value 2017-08-10 15:45:53 +02:00
Daniel Maya 97392c4568 Fixed issue to search agent modules in cascade protection 2017-08-07 13:10:02 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
2017-07-28 10:30:17 +02:00
daniel 741cc05268 fixed errors in graph container 2017-07-24 10:53:04 +02:00
Arturo Gonzalez e9e10d3a79 Merge branch 'develop' into 618-new-item-auto-sla-graph-in-visual-console-dev
pandora_console/include/functions_visual_map.php
	pandora_console/include/functions_visual_map_editor.php
2017-07-18 11:57:13 +02:00
Enrique Camargo 1e7fbc443e Merge branch 'develop' into '412-consola-visual-Módulo-imagen'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
2017-07-17 10:39:20 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Arturo Gonzalez 8f2b4fb783 Added more changes to the first version 2017-07-13 13:25:28 +02:00
Arturo Gonzalez 19caa3ebfb Added js image 2017-07-13 12:26:13 +02:00
vgilc 38b42a26a2 Merge branch '845-Mejoras-en-SNMP-Browser-dev' into 'develop'
845 mejoras en snmp browser dev

See merge request !602
2017-07-13 12:07:46 +02:00
vgilc ab1980b5c8 Merge branch '977-change-format-in-module-data-dev' into 'develop'
Changed format

See merge request !560
2017-07-13 11:48:26 +02:00
Arturo Gonzalez 63d07e1416 Added more things to new vc item 2017-07-12 13:34:20 +02:00
daniel 39d090db1e fixed minor error 2017-06-28 16:39:54 +02:00
Daniel Maya c942fce068 added snmp_browser.ajax 2017-06-20 15:47:29 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
vgilc d8fc3ac9e9 Merge branch 'No-funciona-módulo-system-dev' into 'develop'
Fixed problem in data display snmp wizard

See merge request !534
2017-06-14 11:50:26 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
Arturo Gonzalez f0492c370c Changed format 2017-06-06 15:48:58 +02:00
vgilc a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop'
Fixed readonly validation in nodes

See merge request !542
2017-06-02 11:04:22 +02:00
vgilc eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop'
Changed current_package_enterprise

See merge request !516
2017-06-02 11:00:51 +02:00
Arturo Gonzalez 5d2a3fc094 Fixed readonly validation in nodes 2017-06-01 12:17:30 +02:00
vgilc e085a8a006 Merge branch '843-Error-Perfil-en-copia-masiva-de-modulos' into 'develop'
fixed errors in massive copy modules

See merge request !451
2017-05-31 17:40:27 +02:00
Daniel Maya 5cf6962de0 Fixed problem in data display snmp wizard 2017-05-30 15:40:50 +02:00
Daniel Maya b7e7e9e66a Changed current_package_enterprise 2017-05-26 11:15:00 +02:00
Daniel Maya e243067c4b New feature: Graphic grouping 2017-05-23 17:13:47 +02:00
daniel 400fcdca26 fixed errors in massive copy modules 2017-05-10 09:42:39 +02:00
Arturo Gonzalez eb1dafe807 Fixed lines in visual console 2017-05-09 12:40:22 +02:00
vgilc ab70607156 Merge branch '562-problema-acls-politicas-7-open' into 'develop'
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562

See merge request !301
2017-04-07 12:37:35 +02:00
Arturo Gonzalez df42f2a26b Fixed bad bucle 2017-04-06 17:38:05 +02:00
vgilc 3f27e0a306 Revert "Merge branch 'remove-traces-debug' into 'develop'"
This reverts merge request !266
2017-04-04 13:48:11 +02:00
vgilc 6b2cdb9784 Merge branch 'remove-traces-debug' into 'develop'
remove debug console.log traces.

See merge request !266
2017-04-04 13:47:41 +02:00
Daniel Maya 0dea7fb690 Text change warn by thresholds 2017-03-29 12:41:42 +02:00
vgilc ad77133ebd Merge branch '532-autenticacion-doble-metaconsola' into 'develop'
Fixed bug in qr

See merge request !271
2017-03-27 10:14:23 +02:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 576b834d25 Fixed error in rr 2017-03-21 14:58:42 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
Arturo Gonzalez f6b7c5ce19 Clean mr folder before um process 2017-03-21 13:29:06 +01:00
Arturo Gonzalez e8fbd1f7d1 Added minor change to um and rr system 2017-03-21 12:57:02 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
Arturo Gonzalez c8a0946eda Added code to rr system 2017-03-16 16:28:27 +01:00
Daniel Maya 44231b6515 Fixed bug in qr 2017-03-16 16:14:11 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 2b9e75237a Added changes to rr apply 2017-03-16 15:45:26 +01:00
Arturo Gonzalez c7fb00b46a Added a few modifications in RR system 2017-03-16 14:56:10 +01:00
Arturo Gonzalez 0c51650590 Revert "Added some modifications about RR"
This reverts commit e9cb769cbf.
2017-03-16 14:31:33 +01:00
Arturo Gonzalez e9cb769cbf Added some modifications about RR 2017-03-16 14:22:42 +01:00
Hirofumi Kosaka f4c812c469 Fixed 2 wrong ACL check about reporting.
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
2017-03-16 19:54:05 +09:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
Arturo Gonzalez fa885faf8e Added a new fine filter to RR 2017-03-15 16:45:55 +01:00
m-lopez-f 22f7bae5ae Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:17:01 +01:00
Arturo Gonzalez adb055b13c Added a lot of code to um and rr new system 2017-03-15 10:24:29 +01:00
Arturo Gonzalez a4512ceae2 Added a few modifications to rr 2017-03-15 09:36:31 +01:00
Arturo Gonzalez 3485497639 Remuve traces 2017-03-14 19:14:56 +01:00
Arturo Gonzalez 1adb43bfb0 Added a few things to um and rr 2017-03-14 19:11:39 +01:00
Arturo Gonzalez a582cb9204 Added a few things to mr 2017-03-14 18:53:49 +01:00
Arturo Gonzalez e7339e3f87 Added few things to mr 2017-03-14 18:37:24 +01:00
Arturo Gonzalez cdcd48ca17 Debug traces 2017-03-14 18:24:23 +01:00
Arturo Gonzalez cfcac5e95f Added a few things to mr 2017-03-14 18:17:06 +01:00
Arturo Gonzalez aa157b575d Added new translation and fix an error. 2017-03-14 16:28:30 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
Arturo Gonzalez 86e8e7fc1c Fixed module type order field in agent view. Ticket #392 2017-03-02 10:59:58 +01:00
Arturo Gonzalez cf27aae8cc Reorder module ordenation by status. Ticket #394 2017-03-01 16:02:35 +01:00
Daniel Maya 0e1c62e644 Changed agent search 2017-02-24 13:41:59 +01:00
enriquecd 817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop'
Feature/alias friendly name

See merge request !188
2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
Alejandro Gallardo Escobar 0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
Daniel Maya 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
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 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
Enrique Camargo 06a0b3b885 Merge branch '25-edicion-de-timethreshold-en-accion-de-alerta-integria-4372' into 'develop'
Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25

See merge request !105
2017-02-01 19:22:03 +01:00
enriquecd af763e14e9 Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25 2017-02-01 19:17:20 +01:00
artu30 20fcd7ef32 Merge branch 'feature/ux_modules_hierarchy' into 'develop'
Feature/ux modules hierarchy

See merge request !81
2017-01-25 15:35:09 +01:00
Arturo Gonzalez 3c8bc86ab7 Added cascade protection by module (agent, massive and api). Ticket #187 2017-01-25 13:59:14 +01:00
enriquecd 0fec55fd82 Timethreshold_alert_edition_fix - #25 2017-01-23 15:27:22 +01:00
Arturo Gonzalez 55063a20dc UX console in progres... (Added hierachy mode in modules list) 2017-01-18 17:33:28 +01:00
Arturo Gonzalez fe6f924d7a UX console in progress... (init develop and modules hierachy) 2017-01-18 12:45:25 +01:00
enriquecd 6447189606 Improve visual console - #110 2017-01-16 13:31:56 +01:00
m-lopez-f 6d1c519340 Fixed problems with access a node with user in metaconsole. 2017-01-13 10:46:09 +01:00
m-lopez-f 14891df47f Add column when user have a AW ACL. Ticket: #4193 2016-11-17 08:41:51 +01:00
enriquecd a89eb4ecf9 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2016-11-16 19:03:42 +01:00
enriquecd 76c1f7cd82 Visual console improvements - Add: font style/size setting - map size setting - back color map - graph function a type graph line/area - Improve wizard - Back graph color... #110 2016-11-16 18:58:27 +01:00
m-lopez-f ddf4366017 Fixed problems with user have AR bit and add column that didn't see in module and alerts list. Ticket: #4193 2016-11-15 11:21:04 +01:00
m-lopez-f 0b5d8831df Fixed problems with data in visual console. Ticket: #4181
(cherry picked from commit b8a0a542f2)
2016-11-15 10:56:20 +01:00
m-lopez-f b369d8b5b4 Add feature of timesticks. Ticket: #2494 2016-11-08 12:39:28 +01:00
enriquecd 367c88fc9e Fix icon bug and async string data without data:image string, Pandora UX #90 2016-11-07 13:49:33 +01:00
enriquecd 39169a8e91 Change no access error page - #91 2016-11-03 16:51:18 +01:00
m-lopez-f 2476e499cf Only show force button when user have a correct permmisions. Ticket: #3912 2016-11-03 15:41:31 +01:00
enriquecd 88453e2075 New function pandora ux, let open pics from base64 image modules #90 - 2 2016-10-28 14:08:13 +02:00
m-lopez-f f710fb0022 Remove code, Already exists this feature in pandora 2016-10-28 13:22:44 +02:00
enriquecd 22973e9f12 New function pandora ux, let open pics from base64 image modules #90 2016-10-26 18:39:41 +02:00
fbsanchez 5391c90922 Update manager. Issues fixed
Open:
 TGZ files extraction failed with PHP <5.5.0, added a switch to use system
 call to extract the file if PHP <5.5.0 (Linux)
 If in a Windows Server with PHP <5.5.0, the installation will fail.
 Removed double call to update_manager_starting_update

(cherry picked from commit 9e264c156c)
2016-10-26 16:37:57 +02:00
m-lopez-f 287c2a7477 Feature: Translate timestick of snmps to humen readable. Ticket: #2494 2016-10-26 16:17:02 +02:00
m-lopez-f 5985753326 Fixed problems with size elements in visual console. ticket: #4096 2016-10-25 11:41:59 +02:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
Arturo Gonzalez 3b7cad9654 Data precision (So much precision) 2016-10-18 16:32:39 +02:00
Arturo Gonzalez d5f82b568c New data precision... (Init) 2016-10-18 10:32:10 +02:00
Arturo Gonzalez 13a19c42c2 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:30 +02:00
Arturo Gonzalez 3e50676e19 Merge branch 'develop' into new_networkmap_feature 2016-10-17 11:36:00 +02:00
m-lopez-f c98a4be8fa Add percentil 95 a simple graph in reports. 2016-10-06 08:58:53 +02:00
daniel 33e7e40856 ticket Integria: 4070 fixed visual console add custom graph #4070 2016-09-27 12:16:14 +02:00
Daniel Maya 21dd508e53 Changed name by alias. Ticket #74. 2016-09-22 10:27:35 +02:00
enriquecd 331a4e01d6 visually enhance dialog box events, assignment alerts, alert list #58#52#57
(cherry picked from commit 95d73ceb88)
2016-09-20 17:31:42 +02:00
Arturo Gonzalez 17e3f38aca New networkmaps in progress... (Transfer e code to Open version) 2016-09-14 11:18:26 +02:00
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
m-lopez-f e914b3c87c Feature to update action assignate a alert and module. Internal Ticket: #3994 2016-09-01 09:09:03 +02:00
Daniel Maya e21eabbf04 Fixed problem with the permissions of the visual console. Ticket #4000. 2016-08-29 16:05:37 +02:00
Daniel Maya 0e53477fa7 Fixed orders groups. Ticket #3926. 2016-08-29 12:04:44 +02:00
m-lopez-f 2217e9f908 Fixed problems with group agents. Tiquet: #3079 2016-07-22 16:08:45 +02:00
Arturo Gonzalez 29dfd3df9b Fixed gauge graphs in visual console. Ticket 4 (gitlab) 2016-07-21 08:45:52 +02:00
Arturo Gonzalez 70c771013c Fixed things in rolling release develop 2016-07-19 15:39:31 +02:00
Arturo Gonzalez eefb094df6 Added restriction to dangerous querys (drop database). 2016-07-19 13:48:56 +02:00
Arturo Gonzalez 8c20874a88 Changed rolling release manager system. 2016-07-19 12:39:03 +02:00
Alejandro Gallardo Escobar 636dfd852c Added options to print a custom or sparse graphs
(cherry picked from commit fb3792645b)
2016-06-07 11:40:11 +02:00
m-lopez-f db8c7cb4f5 Fixed problems with update setup of update manager and ad Auidt log register when updated pandora fms. Tiquet: #3549 2016-06-02 12:57:04 +02:00
Arturo Gonzalez 710e15f1b2 Fixed "autocomplete agent search" with disabled agents. Ticket #3655 2016-05-25 15:30:46 +02:00
Alejandro Gallardo Escobar 735bb32e1a Added the keep_aspect_ratio parameter to the render_map action
(cherry picked from commit a1155e5e71)
2016-05-25 13:37:17 +02:00
mdtrooper 2e49a82938 Fixed the length in the editor of labels of nodes. 2016-05-10 14:02:04 +02:00
mdtrooper f9ca419aa9 Working in the enterprise holding area. 2016-04-28 16:03:24 +02:00
Arturo Gonzalez 5f53b2fa12 New maps in progress... (Fixed errors in enterprise ajax) 2016-04-22 13:26:18 +02:00
Arturo Gonzalez 54465df271 New maps in progress... (Added parameters to update node size) 2016-04-21 13:06:57 +02:00
Arturo Gonzalez 805d32e9c0 New maps in progress... (Added functions to ntwmap enterprise) 2016-04-21 10:02:03 +02:00
Arturo Gonzalez 386bdc268e New maps in progress... (Added functions to networkmap enterprise) 2016-04-20 15:57:18 +02:00
Arturo Gonzalez 34c026b4e9 New maps in progress... (Added edit table to group and policy nodes) 2016-04-20 12:03:56 +02:00
Arturo Gonzalez cd64345368 New maps in progress... (Added policies and groups tooltips) 2016-04-20 10:48:06 +02:00
Arturo Gonzalez c409b3d4ea New maps in progress... (Fixed error in node interface text) 2016-04-11 13:08:42 +02:00
mdtrooper 7550cafbbc Some changes in the edition of nodes. 2016-04-08 14:04:58 +02:00
mdtrooper ff598940e1 Some work in the networkmap. 2016-04-07 15:14:29 +02:00
mdtrooper 3b85e3c80f Fixed somethings in the arrows. 2016-04-07 14:20:27 +02:00
Arturo Gonzalez 09f156cd8c New maps in progress... (Edit node in progress) 2016-04-07 12:24:24 +02:00
mdtrooper 5fc27d1f2e Working in the refresh arrows. 2016-04-06 16:25:12 +02:00
mdtrooper fafe3b4eae Working in the arrows. 2016-04-06 13:11:00 +02:00
mdtrooper f7deed5508 Uploaded lost changes. 2016-04-06 13:00:11 +02:00
mdtrooper e4a2c3c7fb Working in the update status of nodes. 2016-04-06 12:23:17 +02:00
Arturo Gonzalez 725a4925a7 New maps in progress... (Fixed error in nodes dialog) 2016-04-06 10:17:11 +02:00
Arturo Gonzalez 6d265e78ae New maps in progress... (Edit node in progress) 2016-04-05 10:06:21 +02:00
Arturo Gonzalez 3c0c7259a9 New maps in progress... (Edit node in progress) 2016-04-05 09:49:31 +02:00
mdtrooper 16812b55b5 Merge branch 'develop' into feature/new_networkmap 2016-03-29 13:46:59 +02:00
Arturo Gonzalez 3e313c8c43 New maps in progress... (Works in the fantastic arrows... thx mdtrooper) 2016-03-17 17:42:54 +01:00
Arturo Gonzalez 894bbd2c9e New maps in progress... (mdtrooper i love you <3) 2016-03-17 11:44:07 +01:00
mdtrooper 5cc89d968c Fixed the minimap. 2016-03-17 11:40:38 +01:00
Arturo Gonzalez 56cadb2037 New maps in progress... (Node details finished) 2016-03-17 10:44:43 +01:00
Arturo Gonzalez 9d2dff71e3 New maps in progress... (node details) 2016-03-17 10:31:18 +01:00
m-lopez-f 368a96222e Fixed problems with dashboard performance when include users maps. Tiquet: #3438
(cherry picked from commit e3e549cbe8)
2016-03-15 09:26:24 +01:00
Arturo Gonzalez 95b13bf3aa New maps in progress... (map editor dialog version 1.0) 2016-03-10 16:12:54 +01:00
Arturo Gonzalez a1de142e98 New maps in progress... (Edit node dialog, 1.0 version) 2016-03-10 15:22:56 +01:00
Arturo Gonzalez 1a792c4d42 New maps in progress... (edit node dialog() 2016-03-10 14:54:31 +01:00
mdtrooper 9befc1c65e Uploaded some code about resize action 2016-03-10 12:42:25 +01:00
Arturo Gonzalez 9ceb3c15e4 New maps in progress... (Preliminar edit node table) 2016-03-10 11:06:52 +01:00
Arturo Gonzalez 73b16c177e New maps in progress... (test context menus) 2016-03-08 17:09:40 +01:00
Arturo Gonzalez 39a9ef4c28 New maps in progress... (contextual menus) 2016-03-08 17:04:09 +01:00
mdtrooper fd0ffb8264 Some changes. 2016-02-25 16:38:20 +01:00
Arturo Gonzalez a3d70740d0 New maps in progress... (adapt tooltip data to modules) 2016-02-25 16:34:32 +01:00
mdtrooper 78bf99e9f0 Some changes 2016-02-25 16:18:14 +01:00
Arturo Gonzalez d72be97e5e New maps in progress... (Fixed ajax to module nodes) 2016-02-25 09:27:00 +01:00
Arturo Gonzalez b7d4c97334 New maps in progress... (Tooltip buttons now have a function) 2016-02-24 16:44:37 +01:00
Arturo Gonzalez 799730c48d New maps in progress... (tooltips data and click events) 2016-02-24 14:28:13 +01:00
Arturo Gonzalez cccce11f79 New maps in progress... (get node data) 2016-02-24 13:04:38 +01:00
Arturo Gonzalez bd736ea598 New maps in progress... (get node data) 2016-02-24 11:45:08 +01:00
Arturo Gonzalez fcc42ce5a3 New maps in progress... (new ajax and class files for nodes) 2016-02-24 10:00:01 +01:00
Arturo Gonzalez 2b89d5d7e0 New maps in progress... (node data by ajax, first contact) 2016-02-23 17:28:55 +01:00
Arturo Gonzalez 2c7f0c423c Added map files 2016-02-04 13:11:14 +01:00
mdtrooper ab64f9100c Added the snmp editor for other data uses in the form wizard snmp. TICKET: #1805 2016-01-25 16:31:02 +01:00
mdtrooper 6a08273f24 Fixed the updating the version when you upload a offline package into update manager. 2016-01-19 14:43:15 +01:00
mdtrooper 110241ecc8 Change the rossete icon for long strig module values in the console for a dialog. TICKET: #3019 2016-01-18 16:58:24 +01:00
m-lopez-f b3221f39d8 fixed problems with show data in forms
(cherry picked from commit 494ae94cd9)
2015-11-10 08:51:39 +01:00
m-lopez-f f7c2d45210 Fixed custom graphs when include new type of graphs. 2015-11-06 10:34:11 +01:00
m-lopez-f 0826844290 Fixed problems with simple value in visual console. Tiquet: #2952 2015-11-04 10:11:33 +01:00
Arturo Gonzalez Diaz 2d4a7b30eb Fixed 'no data' value in modules. Ticket#2925 2015-10-21 17:06:08 +02:00
m-lopez-f 256da3bc3d Add new functions from acl enterprise menu 2015-10-19 15:08:44 +02:00
Arturo Gonzalez Diaz 23d459a716 Fixed item colors when the module value is 'not iniciated'. Ticket#2896 2015-10-15 12:33:38 +02:00
Arturo Gonzalez Diaz 838e14f43b Fixed module-relationship table. Ticket#2766 2015-10-07 15:19:08 +02:00
Arturo Gonzalez Diaz 5d9a3a24d3 New visualization of agent view 2015-10-07 09:57:45 +02:00
Arturo Gonzalez Diaz 29174e6368 Fixed module graphs in visual console. 2015-10-01 13:42:37 +02:00
Arturo Gonzalez Diaz 0dd0ae4b4c Fixed module graph problems in visual console. Ticket#2825 2015-09-30 10:52:12 +02:00
Arturo Gonzalez Diaz 0ffc7eab6c Fixed bug that did not create boxes in visual console. Ticket #2744 2015-09-23 16:52:13 +02:00
m-lopez-f 9f1a301109 Fixed SSH to host response of events. Tiquet: #2792 2015-09-23 15:08:39 +02:00
m-lopez-f 39ea3910b0 Fixed network maps when have more data. Tiquet: #2674 2015-09-11 10:57:36 +02:00
m-lopez-f cda76e17c1 Fixed problems of header response of ajax. Tiquet: #2630 2015-09-09 15:01:12 +02:00
Alejandro Gallardo Escobar 7bd8c8454c Visual changes to the detail tables 2015-09-07 11:54:15 +02:00
mdtrooper 6507d09792 Fixed the percentile bar. TICKET: #2537 2015-08-26 12:06:44 +02:00
mdtrooper 0a0d9fad25 Merge branch 'develop' into feature/ticket#2491-features-dashboard 2015-08-12 13:03:50 +02:00
Alejandro Gallardo Escobar d14e250ad8 Now the agents retrieved by group can be served with the key serialized when using the metaconsole 2015-08-05 10:39:16 +02:00
m-lopez-f 55f3cc96b8 Merge pull request #35 from crash890/patch-1
Update update_manager.ajax.php
2015-08-03 08:41:19 +02:00
crash890 620d8e01b8 Update update_manager.ajax.php
This would be to include proxy configuration in the download process. Without this Proxy will work to check for downloads, but the actual download does not respect the proxy settings.
2015-07-31 16:57:41 -04:00
m-lopez-f cd676cac59 change in the way data show snmp data timeticks. Tiquet: #2494 2015-07-31 11:16:42 +02:00
mdtrooper b1034c2071 Working in the features and improvements in dashboard. 2015-07-24 16:43:54 +02:00
m-lopez-f a316419afa Add new options when render proc is active. Tiquet: #2503 2015-07-22 11:49:00 +02:00
m-lopez-f f2181d66d7 Fixed problems with visual console. Tiquets: #2465,#2483,#2482,#2486 2015-07-21 08:41:26 +02:00
Alejandro Gallardo Escobar a90111ac18 Restored the call 'get_agent_modules_json_for_multiple_agents' and improved their performance 2015-07-17 10:02:11 +02:00
Alejandro Gallardo Escobar f14b07014f Merge pull request #34 from pandorafms/feature/ticket#2404-planned-downtimes-acl
Ended, tested and aproved
2015-07-16 13:48:41 +01:00
Alejandro Gallardo Escobar 4d43033d46 Fixed some general and ACL errors and improved some pieces of code
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
2015-07-16 13:53:57 +02:00
Alejandro Gallardo Escobar 05f40a21fc Now the data column of the module's raw data dialog are casted to double when is numeric 2015-07-15 16:55:08 +02:00
Akihiro Uchida 9fbe18a5d4 Disable modification of executed planned downtime 2015-07-10 11:02:21 +09:00
m-lopez-f 8c64e6b481 Fixed style 2015-07-09 17:52:37 +02:00
mdtrooper 3d46327f55 Rewrote the ajax call 'get_agent_modules_json_for_multiple_agents' for to run with the agents cache in new metaconsole in 6 version. 2015-07-08 16:40:12 +02:00
Alejandro Gallardo Escobar 89fe54d28a Error fixes 2015-07-06 18:26:44 +02:00
Alejandro Gallardo Escobar a719100855 Improvements to add better compatibility with the metaconsole 2015-06-30 12:59:23 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper dac4d30e91 Some fixes in the javascript visualmap. 2015-06-16 18:45:42 +02:00
mdtrooper 5e026a03e1 Some fixes. 2015-06-16 17:44:15 +02:00
Alejandro Gallardo Escobar 04c8348042 Minor improvements 2015-06-11 12:08:02 +02:00
Alejandro Gallardo Escobar abc426bc4d Improved the agent search for the metaconsole 2015-06-11 11:02:17 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
mdtrooper 9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
m-lopez-f 527d5079b3 Add option to changed image of service in visualconsole:builder. tiquet:#2175
(cherry picked from commit ca1641a4e0)
2015-05-26 16:01:57 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
m-lopez-f a43bfd5d5a Delete order by Data column in main data agent. tiquet: #2060 2015-05-07 08:53:37 +02:00
Alejandro Gallardo Escobar 65a425859e Error fixes 2015-05-04 21:18:38 +02:00
Alejandro Gallardo Escobar c02f3bacf4 Error fixes related with the improved oracle compatibility 2015-05-04 20:11:03 +02:00
m-lopez-f 6b974efe19 Merge branch 'feature/NewView' into develop 2015-05-04 15:45:34 +02:00
m-lopez-f 6241ae13d6 Add new option, when is active data of modules type is proc, show ok or fail. Tiquet: #1996 2015-05-04 15:44:37 +02:00
m-lopez-f 90d6ea15cf Merge branch 'develop' into feature/NewView 2015-04-27 10:12:45 +02:00
Alejandro Gallardo Escobar 1ae9ee0810 Added support to retrieve agents from the new table of the metaconsole 2015-04-23 21:14:24 +02:00
Alejandro Gallardo Escobar 8a348c2411 Merge remote-tracking branch 'origin/develop' into feature/meta-agent-cache 2015-04-23 15:02:27 +02:00
m-lopez-f dc09a9a14e Change visual and add new images 2015-04-21 17:26:20 +02:00
m-lopez-f 05c47bcafe Merge branch 'develop' into feature/NewView 2015-04-21 17:13:58 +02:00
Alejandro Gallardo Escobar 311fd99811 Improvements on the performance for the metaconsole 2015-04-21 14:01:10 +02:00
m-lopez-f dbfc273de9 Fixed error javascript 2015-04-20 15:48:17 +02:00
m-lopez-f 32582e5017 add title in dialog in tree view and change image in header 2015-04-20 12:31:04 +02:00
m-lopez-f 28522a1918 Add new images 2015-04-20 10:42:27 +02:00
m-lopez-f ebe95af69e Add title when open visual data in treeview and status monitor, tiquet: #2077 2015-04-20 10:40:42 +02:00
m-lopez-f 4158afde8c Merge branch 'develop' into feature/NewView 2015-04-13 09:09:04 +02:00
Alejandro Gallardo Escobar d28cd4c172 Changes on the functionality and the ACL checks. Great improvements on the ACL management 2015-04-09 14:00:37 +02:00
m-lopez-f f8c481a3ee Change views and styles in Console 2015-04-01 13:47:45 +02:00
m-lopez-f acfd2146dc Change views and styles in Console 2015-04-01 12:09:23 +02:00
Alejandro Gallardo Escobar 9920fa9a3f Fixed a missing tooltip 2015-03-30 12:03:34 +02:00
Alejandro Gallardo Escobar fd41fba3d8 Changed the behaviour of the network map tooltip info for the strict users 2015-03-27 14:32:31 +01:00
m-lopez-f b58bd83523 Fixed problems when filter by 'Specify time range' and lost filter and not show data 2015-03-16 11:58:12 +01:00
m-lopez-f 93a2d15b2c display data changed depending if compare dates or show date directly in the tree view #1976 2015-03-16 11:47:12 +01:00
Alejandro Gallardo Escobar 756cf4cbf7 Added the posibility to filter by 1 group or tag. Useful when accessing the tree view from the group view 2015-03-09 19:29:45 +01:00
mdtrooper 8d214486e6 Fixed the situations when the period is not init. 2015-02-23 12:11:13 +01:00
mdtrooper c11a81dbef Fixed the ajax calls with timepicker in other languages instead english.
(cherry picked from commit 15c93c3bd9)

Conflicts:
	pandora_console/include/ajax/module.php
2015-02-19 18:37:12 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
m-lopez-f e15e458aec Fixed problem in view of 'Tree view' with large data length. Reopen T#1748
(cherry picked from commit ded628da3e)
2015-02-04 13:11:45 +01:00
m-lopez-f d4de8b3856 Add width in table view data in tree view 2015-02-02 10:24:29 +01:00
m-lopez-f 38be10c94f Fixed align in view table data in tree view
(cherry picked from commit 18939f4249)
2015-02-02 10:20:40 +01:00
Alejandro Gallardo Escobar 1127737f83 Error fixes related with the data retrieving for the tree views on the metaconsole 2015-01-30 15:32:39 +01:00
Alejandro Gallardo Escobar c755d7a326 Minor fix 2015-01-29 21:08:44 +01:00
Alejandro Gallardo Escobar 3b449f3789 Now the the items detail is returned correctly 2015-01-29 20:53:00 +01:00
Alejandro Gallardo Escobar 42b8b97f82 Fixed an error that made impossible the connection with the metaconsole nodes 2015-01-29 20:26:46 +01:00
Alejandro Gallardo Escobar 2a36e4b864 Merge branch 'develop' into feature/NewTreeView 2015-01-28 18:58:26 +01:00
m-lopez-f 47b11b97c1 Delete line of error with cherry-pick and recovery timestamp filter 2015-01-27 15:34:47 +01:00
m-lopez-f f4e1cee998 Fixed problems with view of data when click in binary image in tree view, monitor detail and list of monitors 2015-01-27 15:25:18 +01:00
Alejandro Gallardo Escobar c765f6c957 Merge branch 'develop' into feature/NewTreeView 2015-01-26 17:51:39 +01:00
Alejandro Gallardo Escobar e812c55264 Added the modules filter 2015-01-22 16:55:31 +01:00
Alejandro Gallardo Escobar d6c51fb559 Rewrited all the data retrieving functionality of the different tree views 2015-01-21 17:37:51 +01:00
m-lopez-f db7680eb46 Add filter group module in general view of agents 2015-01-21 15:26:49 +01:00
Alejandro Gallardo Escobar b99cef8c1a Fixed an error related with the id retrieving 2015-01-19 14:56:42 +01:00
Alejandro Gallardo Escobar 265dda2a3f Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_groups.php
2015-01-19 11:47:55 +01:00
mdtrooper f6509da99c Fixed the get data of module data list view with historic data base set on. TICKET: #1668 2015-01-15 16:39:05 +01:00
Alejandro Gallardo Escobar eac739d362 Revert "Strict ACLs"
This reverts commit 3d251fd035.
2015-01-15 15:11:26 +01:00
Alejandro Gallardo Escobar b67c74661f Minor fixes 2015-01-14 17:52:05 +01:00
Alejandro Gallardo Escobar e1b34840b1 Merge branch 'develop' into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/functions_groups.php
2015-01-09 11:41:07 +01:00
Vanessa Gil 3ffeb145a6 Strict ACLs 2015-01-08 18:11:26 +01:00
Alejandro Gallardo Escobar 6b38a7072d Fixed js errors 2015-01-08 11:43:45 +01:00
Alejandro Gallardo Escobar ed2781f46b Added the TreeEnterprise hooks 2015-01-05 13:23:11 +01:00
mdtrooper 1e47df9ab2 Starting the OS type treeview. 2014-12-19 18:39:18 +01:00
mdtrooper fa475c38f4 Uploaded lost changes from the last day 2014-12-19 11:40:59 +01:00
mdtrooper e94b685231 Added status of group nodes 2014-12-18 18:52:35 +01:00
Alejandro Gallardo Escobar 278ceefb32 Added new info to the tree 2014-12-18 18:13:22 +01:00
Alejandro Gallardo Escobar 606d2128ce Moved code 2014-12-18 16:23:39 +01:00
Alejandro Gallardo Escobar 5fb3e94203 Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView
Conflicts resolved:
	pandora_console/include/ajax/tree.ajax.php
2014-12-18 14:48:18 +01:00
Alejandro Gallardo Escobar 93b248bf14 Preparing the element detail output for the tree view 2014-12-18 14:40:29 +01:00
mdtrooper c18b0b6066 Added ajax call for the stats. And fixed the function 'groups_agent_ok' in functions_groups.php 2014-12-18 14:25:38 +01:00
Alejandro Gallardo Escobar a045faeb6d Minor changes 2014-12-18 09:55:54 +01:00
mdtrooper 3556621cf0 Changed code for to run with Alex's code 2014-12-17 19:56:42 +01:00
mdtrooper 9c60470d49 Working in the new code of treeview 2014-12-17 19:00:48 +01:00
mdtrooper 48991738ca Working in the new code of treeview 2014-12-16 16:39:00 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
2014-12-15 15:06:29 +01:00
mdtrooper 5d485e16ef Working in the tags out the policies. Ticket: #1577 2014-12-12 15:01:50 +01:00
Alejandro Gallardo Escobar 30f24ff583 Modifications on the ajax calls to gain compatibility 2014-12-11 17:00:55 +01:00
Alejandro Gallardo Escobar 3c1dbbdc73 File with double auth utilities to be accessed by ajax 2014-12-11 16:10:15 +01:00
mdtrooper 03890a5295 Fixed the acl tags with groups without tags. Ticket: #1611 2014-12-04 13:03:41 +01:00
mdtrooper f25440d68a Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
mdtrooper e45b8183d8 Working in the improves of agent view. Ticket: #1285 2014-12-03 16:30:36 +01:00
Vanessa Gil 7806cee6fd Fixed several bugs with acl tags. 2014-12-03 10:27:27 +01:00
mdtrooper 303b4f148f Added feature to set bbcode links in agents description and custom fields. Ticket #1404 2014-12-02 16:38:07 +01:00
mdtrooper 6ba6290830 Fixed the lost id_group in the items on visualmap. Ticket #1586 2014-11-28 16:37:07 +01:00
mdtrooper a8a1bade0d Merge branch 'feature/ticket#1478-New_elements_visualmap' into develop 2014-11-26 16:12:38 +01:00
mdtrooper e48580c93a Working in the new elements for the visualmap. Ticket #1478 2014-11-25 13:15:51 +01:00
mdtrooper 631f0ee2b7 Fixed the lost hash user in the links from metaconsole to the nodes. 2014-11-25 11:07:41 +01:00