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

611 Commits

Author SHA1 Message Date
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