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

2803 Commits

Author SHA1 Message Date
enriquecd dc33195358 Add recursion group search for agent/module view and angent/module item in reports - #1113 2017-09-11 17:20:07 +02:00
Arturo Gonzalez eb03e4753e Minor change 2017-09-11 11:51:08 +02:00
vgilc ffdafce87b Merge branch '1094-no-filter-by-agent-in-status-monitor-dev' into 'develop' 
Added correct filter name

See merge request !652
 2017-09-11 09:26:40 +02:00
vgilc 99fa1d0aad Merge branch '1216-error-in-edit-networkmaps-open-dev' into 'develop' 
Fixed combo in editor

See merge request !747
 2017-09-11 09:19:59 +02:00
vgilc 054c13695c Merge branch '1203-Hora-descuadrada-en-caja-de-eventos-del-agente' into 'develop' 
Apply padding to event 24h event history bar for agent view - #1203

See merge request !738
 2017-09-08 10:01:47 +02:00
Arturo Gonzalez 2bb5c1e3b3 Added section to agent tabs 2017-09-08 09:01:58 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel a64e0feba3 fixed minor error view snapshot WUX 2017-08-31 16:13:28 +02:00
nramon 83da33a53f Merge branch '137-global-module-search-get-disabled-modules-dev' into 'develop' 
Added condition to query

See merge request !762
 2017-08-31 11:39:17 +02:00
enriquecd 68aa0f91ac Fix agent view remote config column order - #124 2017-08-30 17:30:36 +02:00
Arturo Gonzalez 573a0f5534 Added condition to query 2017-08-30 16:26:06 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
slerena 9c4eb3086e Merge branch '832-exec-proxy-dev' into 'develop' 
832 exec proxy dev

See merge request !755
 2017-08-29 16:11:03 +02:00
Enrique Camargo 092bbd12ff Merge branch 'develop' into '124-anadir-enlace-a-los-iconos-de-la-columna-remote-config-de-la-vista-de-agentes' 
# Conflicts:
#   pandora_console/operation/agentes/estado_agente.php
 2017-08-28 12:32:06 +02:00
Arturo Gonzalez 88834d6ea1 Added a first version of snmp browser with a proxy server 2017-08-24 16:26:58 +02:00
daniel 94cb6ee060 documentation wux 2017-08-24 14:04:12 +02:00
Arturo Gonzalez bc557573ec Fixed combo in editor 2017-08-23 10:19:56 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
enriquecd f70763d739 Apply padding to event 24h event history bar for agent view - #1203 2017-08-21 10:48:03 +02:00
vgilc a2e0dc06be Merge branch '137-La-busqueda-de-modulos-muestra-los-modulos-disabled-dev' into 'develop' 
Disabled modules no longer appear in the search

See merge request !407
 2017-08-18 13:16:03 +02:00
daniel 1b5979113a hidden tab wux 2017-08-18 12:42:48 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
Daniel Maya fba5a38482 Fixed time range with user no admin 2017-08-16 10:38:02 +02:00
Daniel Maya 2bcc01c9ba Fixed time range with user no admin 2017-08-09 11:33:12 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
Daniel Maya 5df61b95b9 Fixed issue in public console 2017-08-07 11:30:49 +02:00
vgilc 9c534ce2dc Merge branch '1127-Elementos-desplazados-en-mapas-GIS-con-Google-maps-dev' into 'develop' 
Expand layer

See merge request !685
 2017-07-28 10:24:44 +02:00
vgilc f0afe8431f Merge branch '1120-Nombre-de-agente-en-mapas-GIS-dev' into 'develop' 
Change agent name by alias in gis map

See merge request !678
 2017-07-28 10:16:27 +02:00
daniel 4dfbdca423 add new field table view agents for type of agent 2017-07-24 15:53:31 +02:00
vgilc 5f128ed9ce Merge branch '1087-error-in-events-filter-from-agent-events-graph-dev' into 'develop' 
Fixed events filter from agent events graph

See merge request !655
 2017-07-24 13:20:07 +02:00
Daniel Maya b4765a0a9a Expand layer 2017-07-21 12:19:56 +02:00
Daniel Maya 5fd6c03917 Change agent name by alias in gis map 2017-07-19 12:32:45 +02:00
vgilc 7dd0e989fa Merge branch '412-consola-visual-Módulo-imagen' into 'develop' 
Add data image option to simple data visual console element - #412

See merge request !584
 2017-07-17 17:03:04 +02:00
vgilc 0bd74d92f0 Merge branch '1040-autorefresh-in-user-section-is-separated-by-user-dev' into 'develop' 
Added refresh by user

See merge request !607
 2017-07-17 10:54:06 +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
vgilc c2c677de65 Merge branch '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' into 'develop' 
Changed agent name by alias

See merge request !590
 2017-07-13 12:11:18 +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 fb57ea216e Merge branch '997-Active-SNMP-filters-in-snmp-console-dev' into 'develop' 
Added active filters to snmp console

See merge request !611
 2017-07-13 12:02:39 +02:00
vgilc cc9191b676 Merge branch 'develop' into '1014-Aparece-el-agent-name-en-lugar-del-alias-en-la-consola-SNMP-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-07-13 11:59:19 +02:00
vgilc bbc54cfcfc Merge branch '890-No-esta-funcionando-el-GIS-en-Pandora-dev' into 'develop' 
Fixed display of data

See merge request !617
 2017-07-13 11:53:00 +02:00
vgilc 24728cc062 Merge branch '1042-Descuadre-en-consola-visual-dev' into 'develop' 
Fixed visual console render img

See merge request !612
 2017-07-13 11:51:25 +02:00
vgilc 43f7bcde39 Merge branch '1041-module-charts-with-standar-perms-dev' into 'develop' 
Added second check to period field in module charts (admin have diferent field name)

See merge request !610
 2017-07-13 11:42:11 +02:00
vgilc 614fbebded Merge branch '868-Consola-visual-a-pantalla-completa-no-hace-autorefresco' into 'develop' 
Change ajax call method get to post for autorefresh and use new timecount param - #868

See merge request !555
 2017-07-13 11:39:25 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
Arturo Gonzalez dac5b6f237 Added correct filter name 2017-07-10 10:04:04 +02:00
vgilc 129b64e870 Merge branch '884-low-width-in-groups-select-dev' into 'develop' 
Fixed selector

See merge request !622
 2017-07-05 12:06:39 +02:00
nramon d7b45cb027 Merge branch '149-SNMP-console-doesnt-show-agent-aliases' into 'develop' 
Modified SNMP Console to prefer agent aliases as SNMP agent if registered.  #149

Closes #149

See merge request !489
 2017-06-28 08:37:29 +02:00
Arturo Gonzalez 242667e162 Fixed selector 2017-06-27 11:10:07 +02:00
Daniel Maya 8d378b4b60 Fixed display of data 2017-06-26 11:29:56 +02:00
vgilc 1f2c3f3ad7 Merge branch '929-fixed-netflow-live-view-in-meta-dev' into 'develop' 
Fixed nwtflow live view filter table

See merge request !531
 2017-06-23 14:11:15 +02:00
vgilc a151a7e0b8 Merge branch '884-groups-hierachy-in-select-dev' into 'develop' 
Fixed groups select width

See merge request !523
 2017-06-23 14:02:50 +02:00
Daniel Maya b19164cbd2 Fixed visual console render img 2017-06-22 11:55:30 +02:00
Arturo Gonzalez e6efe5825b Added active filters to snmp console 2017-06-22 09:28:07 +02:00
Arturo Gonzalez ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +02:00
Arturo Gonzalez e86c87d23b Added refresh by user 2017-06-21 13:50:05 +02:00
Daniel Maya b38b41b942 updated files 2017-06-20 15:32:24 +02:00
Daniel Maya 4398b47d92 updated 2017-06-20 10:31:14 +02:00
Daniel Maya 7bf9860aaa Changed agent name by alias 2017-06-15 15:40:12 +02:00
Daniel Maya e68858e4c2 new feature in snmp browser 2017-06-15 15:12:27 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
vgilc 528b9abba6 Merge branch '996-Filtro-SNMP-desaparece-dev' into 'develop' 
Fixed problem with snmp filter

See merge request !574
 2017-06-14 11:48:49 +02:00
vgilc babc431c82 Merge branch '948-Borrado-de-traps-agrupados-dev' into 'develop' 
fixed deleting grouped traps

See merge request !549
 2017-06-14 11:48:01 +02:00
enriquecd 2ede057298 Add data image option to simple data visual console element - #412 2017-06-13 16:49:25 +02:00
Daniel Maya 96ef0fdc4f Fixed problem with snmp filter 2017-06-12 12:05:23 +02:00
enriquecd 777713f939 Fix bug when there is an event with a bad data in custom_data - #311 2017-06-07 17:55:53 +02:00
enriquecd 38464bf615 Change ajax call method get to post for autorefresh and use new timecount param - #868 2017-06-05 18:36:12 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
Daniel Maya ae30068397 fixed deleting grouped traps 2017-06-02 11:33:26 +02:00
vgilc 5ed3e01afc Merge branch '957-sound-events-style-dev' into 'develop' 
Added styles to sound events window

See merge request !543
 2017-06-02 10:34:05 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop' 
Changed custom graph size specs in visual console

See merge request !517
 2017-06-02 10:32:58 +02:00
Arturo Gonzalez 1362bbc555 Added styles to sound events window 2017-06-01 13:50:35 +02:00
vgilc 87f3cb46f6 Merge branch '923-New-sound-events-console-view-dev' into 'develop' 
Added new visual styles to event sound console

See merge request !513
 2017-05-31 17:46:11 +02:00
vgilc ef5680c718 Merge branch '877-bad-colours-and-status-hierachy-in-group-view-dev' into 'develop' 
Added changes to group view

See merge request !504
 2017-05-31 17:44:56 +02:00
vgilc 1d6747c353 Merge branch '807-module-massive-operations-with-tag-filter-dev' into 'develop' 
807 module massive operations with tag filter dev

See merge request !476
 2017-05-31 17:42:09 +02:00
vgilc 70db081222 Merge branch '862-search-fields-going-wrong-dev' into 'develop' 
Added alias search to general search and case no case sensitive search to agent details search field

See merge request !466
 2017-05-31 17:39:44 +02:00
vgilc 05397a876f Merge branch '841-boolean-charts-in-agent-charts-section-dev' into 'develop' 
Added boolean modules to agent graphs section

See merge request !455
 2017-05-31 17:10:52 +02:00
vgilc c66810afea Merge branch '847-networkmap-autorefresh-dev' into 'develop' 
Fixed networkmap path in auto-refresh white list

See merge request !452
 2017-05-31 17:09:00 +02:00
vgilc 08642eacd3 Merge branch '311-Filtrar-por-campo-personalizado-en-eventos' into 'develop' 
Free search input in event list view filter also by custom_data - #311

See merge request !486
 2017-05-31 17:06:10 +02:00
vgilc 956a4a1b20 Merge branch '866-fixed-free-search-field-in-monitor-detail-view-dev' into 'develop' 
Fixed free search

See merge request !499
 2017-05-31 17:03:10 +02:00
vgilc 00e73a8213 Merge branch '675-search-filter-by-start-date-and-end-date-dev' into 'develop' 
Added date filter in snmp console

See merge request !471
 2017-05-31 17:02:14 +02:00
Arturo Gonzalez eec313c4c7 Fixed nwtflow live view filter table 2017-05-30 13:10:57 +02:00
Arturo Gonzalez f467d6d466 Fixed groups select width 2017-05-29 14:31:46 +02:00
Arturo Gonzalez 54b70e5927 Changed custom graph size specs in visual console 2017-05-26 12:55:37 +02:00
Arturo Gonzalez 2e71af2568 Added new visual styles to event sound console 2017-05-25 17:11:35 +02:00
Arturo Gonzalez 8b849efc3c Added changes to group view 2017-05-24 15:39:44 +02:00
Arturo Gonzalez 63129641eb Fixed free search 2017-05-23 16:54:24 +02:00
artu30 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
Hirofumi Kosaka 5807e55459 Modified SNMP Console to prefer agent aliases as SNMP agent if registered. #149 2017-05-19 16:49:54 +09:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
enriquecd c4ffd0257f Free search input in event list view filter also by custom_data - #311 2017-05-18 14:59:17 +02:00
vgilc 10e6153574 Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop' 
Added new help tip icon to snmp console

See merge request !443
 2017-05-18 10:00:31 +02:00
vgilc e89be76e61 Merge branch 'fixed-graphs-styles' into 'develop' 
Fixed graphs styles Gitlab: #537

See merge request !283
 2017-05-17 17:45:55 +02:00
artu30 e54eb93ea8 Merge branch 'develop' into '805-change-tip-icon-in-trap-editor-dev' 
# Conflicts:
#   pandora_console/operation/snmpconsole/snmp_view.php
 2017-05-17 17:37:10 +02:00
vgilc 3118a70f66 Merge branch 'dashboards-in-home-page-dev' into 'develop' 
Added dashboards to "edit my user" section

See merge request !391
 2017-05-17 17:20:29 +02:00
vgilc 28eaae4601 Merge branch '724-SNMP-Console--En-el-campo-Agente-mete-el-Agent-name-en-lugar-del-Alias-dev' into 'develop' 
Changed agent name by agent alias

See merge request !375
 2017-05-17 17:16:48 +02:00
Arturo Gonzalez 19a12b23ef Added white start to snmp traps 2017-05-17 11:37:19 +02:00
Arturo Gonzalez d49f1f9916 Added tags filter to mosule massive operations (agent selection first) 2017-05-17 10:41:30 +02:00
Arturo Gonzalez 4b94e7ce2b Added tag filter to module massive operations (edit and modules selection first) 2017-05-17 09:59:10 +02:00