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

760 Commits

Author SHA1 Message Date
daniel 00283a5c6a progress task list 
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
 2019-03-07 14:45:26 +01:00
daniel 798567bf8e fixed minor errors change word command for parameters 
Former-commit-id: 6e6e56bded99331c606f7a9f6179826afee22d16
 2019-03-07 09:05:38 +01:00
daniel f79400ecfb Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva 
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
 2019-03-07 08:32:40 +01:00
daniel 8780571a74 add new functionality in event response 
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
 2019-02-27 10:59:44 +01:00
samucarc 9f92f3f010 Fixed 
Former-commit-id: 4fc7d9a22dd2a59501cd7ffc7539c431d37512a8
 2019-02-27 10:35:40 +01:00
samucarc 8f24c0cb18 Fixed conflict in CLI apply_policy 
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
 2019-02-27 10:28:36 +01:00
fbsanchez 0e7c498e1a Comment updates 
Former-commit-id: a711916af981c065d26def1943fc526d936de5d3
 2019-02-26 17:53:58 +01:00
Alejandro Fraguas 441fb979e1 Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop' 
Ent 3210 nueva vista de servicios

See merge request artica/pandorafms!2195

Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
 2019-02-26 16:32:34 +01:00
alejandro-campos eb56fd566c implemented services treeview 
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
 2019-02-22 13:07:47 +01:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
Alejandro Gallardo Escobar d554dcc7db Added the _current_user_ macro to the event responses 
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
 2019-02-19 11:37:44 +01:00
alejandro-campos 46de260573 Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta 
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
 2019-02-15 15:55:31 +01:00
fbsanchez 332c53b098 change behaviour to avoid mr slow updates. Event extended 
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
 2019-02-11 19:46:46 +01:00
fbsanchez e1d87ce0c8 minor fix falsse => false 
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
 2019-02-08 19:09:36 +01:00
fbsanchez 49cf9d5db0 Extended events 
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
 2019-02-08 19:07:49 +01:00
fbsanchez 091f6ace96 minor fixes and revised code style 
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
 2019-02-08 17:30:47 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
alejandro-campos 5a8e46d608 modify the way event responses are executed in event list 
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
 2019-01-14 12:10:43 +01:00
alejandro-campos 471c01a4c5 fixed bad link to node in metaconsole's custom graph item editor 
Former-commit-id: 22fb4302de980d8b3e16fb90d087b71c218598a1
 2019-01-09 10:20:17 +01:00
vgilc 1b4cd37d5f Merge branch 'ent-2997-color-cloud-vc-items' into 'develop' 
Add the Color Cloud item to the Visual Console

See merge request artica/pandorafms!2075

Former-commit-id: e40e442631628db94c8f21c52cd8c04a0adbb6d6
 2018-12-12 17:43:39 +01:00
Alejandro Gallardo Escobar 47a547367d Added a new item to the visual console 
Former-commit-id: 6dcb8c9500e12932775d929646f7fdc676ee94fa
 2018-12-11 19:14:14 +01:00
daniel c72d0dd0d4 fixed error status agent in custom field view 
Former-commit-id: 3516b02e27b28c856b665bc896d076867827f85a
 2018-12-11 10:00:05 +01:00
daniel ffb6b47106 fixed minor error custom field view 
Former-commit-id: deaa026e2f44273657ff8d76c4f4e212b46c04fe
 2018-12-10 13:22:51 +01:00
daniel 222da4ee40 group filter custom field view 2018-12-04 09:36:48 +01:00
daniel a03adb1762 add field group filter 2018-12-03 18:00:41 +01:00
daniel 0c27534ca3 fixed refresh status agents 2018-12-03 12:53:41 +01:00
daniel 01a9621eb5 Custom fields view add new filters 2018-12-03 11:36:34 +01:00
vgilc 3f02447271 Merge branch 'ent-2886-consolas-visuales-static-graphs-en-metaconsola-carrefour' into 'develop' 
Removed unused code (meta static graphs)

See merge request artica/pandorafms!1953
 2018-11-30 13:13:58 +01:00
vgilc 3cbb75b551 Merge branch '3044-Visualización-rara-en-agent-view' into 'develop' 
Changed ORDER BY in SQL query - #3044

See merge request artica/pandorafms!1938
 2018-11-30 11:02:14 +01:00
daniel 2078014406 fixed minor error 2018-11-20 09:14:36 +01:00
daniel 9d80e940bf fixed minor error cfv 2018-11-19 16:17:20 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
daniel 0a097d185d fixed errors in custom fields view 2018-11-16 11:58:49 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
tatiana.llorente@artica.es ea9cbb6973 Changed visual styles - #2784 2018-11-13 11:20:27 +01:00
tatiana.llorente@artica.es 406bf08e2e Changed images for status modules and agents - #2784 2018-11-12 15:43:23 +01:00
fermin831 80d3299b2b Removed unused code (meta static graphs) 2018-11-08 16:46:34 +01:00
daniel bb15c39ef5 WIP Custom view fields 2018-11-08 15:03:40 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
tatiana.llorente@artica.es aa19640497 Changed ORDER BY in SQL query - #3044 2018-11-07 10:34:14 +01:00
tatiana.llorente@artica.es 9448111927 Fixed SQL query - #2973 2018-11-06 11:14:12 +01:00
daniel ec194208f5 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-02 08:20:39 +01:00
daniel 879b1cfecb Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-10-31 09:23:58 +01:00
Fermin 7f22e2b067 Fixed disabled modules on agent view 2018-10-31 08:57:34 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
daniel f78e86b925 view cusatom field 2018-10-25 17:08:56 +02:00
vgilc 2b6e8473dc Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop' 
Improve performance on tactical view with a lot of events

See merge request artica/pandorafms!1857
 2018-10-25 10:32:11 +02:00
danielmaya 87abf1dc02 added event time filter in tactical view 2018-10-24 16:36:44 +02:00
daniel e299209a92 fixed visual console custam graph in meta 2018-10-18 13:24:15 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
danielmaya 4ac4f46daf Fixed html_print_autocomplete_modules 2018-10-10 18:02:10 +02:00
Fermin a72b9b0515 [Tags performance] Fixed agents_get_modules to ajax calls 2018-10-05 13:32:14 +02:00
danielmaya e8621e54e5 Updated tags optimization 2018-10-05 09:40:08 +02:00
fermin831 36fade6b37 Removed unwanted traces 2018-10-03 13:55:06 +02:00
fermin831 7bd0615681 [Tags performace] Check visual consoles 2018-10-03 13:53:59 +02:00
fermin831 dc92a00b48 [Tags performance] Fixed performance of main agent view 2018-10-02 13:19:36 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
danielmaya 896ba6051b fixed issue with string data in visual map 2018-09-26 11:00:44 +02:00
Alejandro Gallardo Escobar 167cd67ece Bugfix 2018-09-18 15:44:55 +02:00
daniel 0c853a83d1 add new tree view edition group 2018-09-18 09:28:22 +02:00
vgilc 59feccda72 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Añadidos textos de ayuda

See merge request artica/pandorafms!1767
 2018-09-14 11:52:59 +02:00
Alejandro Gallardo Escobar 98b2907857 Bug fixes 2018-09-12 16:16:04 +02:00
vgilc 683d748b38 Merge branch 'ent-2588-service-like-visual-console-status' into 'develop' 
Now is possible to link visual consoles from different nodes to the visual console elements

See merge request artica/pandorafms!1741
 2018-09-10 12:43:06 +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
nramon aa98b62e5c Merge branch '2611-Cache_de_vista_de_arbol_y_vista_de_grupos' into 'develop' 
fixed errors in tree view

See merge request artica/pandorafms!1710
 2018-09-05 14:44:37 +02:00
daniel 51f71d1a07 fixed metaconsole tree view 2018-09-05 11:23:53 +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
daniel 718401467d put tree view in separate files 2018-09-04 11:51:36 +02:00
fermin831 a23dd89c70 Removed unwanted safe input in a data display 2018-08-16 09:24:59 +02:00
fermin831 a5ff91185b Fixed text format in html historic data 2018-08-13 12:41:09 +02:00
daniel d740240a51 fixed error data string show 2018-07-27 14:07:02 +02:00
tatiana.llorente@artica.es 965c6c839b Image for mode Quiet changed to blue - #2036 2018-06-26 12:31:23 +02:00
slerena 17cb7337f5 Merge branch '2300-Eventos-de-respuesta-personalizada' into 'develop' 
Fixed bug in ajax/events.php

See merge request artica/pandorafms!1561
 2018-06-25 19:00:58 +02:00
slerena 082e9c6185 Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop' 
Add visual animation to popup modal windows - #1781

See merge request artica/pandorafms!1284
 2018-06-25 18:59:34 +02:00
manuel.montes 11dc746eca Fixed bug in ajax/events.php 2018-06-20 13:31:23 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Fermin 6479e3ac64 Fixed repeated real time item on agents view 2018-05-11 13:14:08 +02:00
fermin831 fcebfceffb Do not show always the percentil in custom graphs 2018-05-10 17:29:50 +02:00
fermin831 d9e35b3668 [Rebranding] Open git status 2018-05-10 17:08:30 +02:00
danielmaya 3c7fe95a33 Added check login and check acl in update_manager.ajax 2018-05-09 11:37:53 +02:00
vgilc c83def806b Merge branch '2231-Vistas-realtime-en-modulos-de-red' into 'develop' 
2231 vistas realtime en modulos de red

See merge request artica/pandorafms!1470
 2018-05-09 10:28:02 +02:00
fermin831 fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
fermin831 32822054d6 Added realtime graph button to agent view 2018-05-03 17:13:38 +02:00
fermin831 70bf2dd49f Added percentile to custom graphs containers 2018-04-18 16:01:38 +02:00
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