tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,617 Commits 34 Branches 30 Tags
Commit Graph

12617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arturo Gonzalez
a39addc0ec Fixed threshold in interface graphs. Ticket #156 
(cherry picked from commit d3f5a62814c257fd150e0b9fbedea54f78a57681)

 Conflicts resolved:
	pandora_console/include/functions_graph.php
 2017-01-17 14:37:34 +01:00
Arturo Gonzalez
0a584c3741 Added things to interface thressold. Ticket #4113 
(cherry picked from commit b683d5d50c8f83448fe680b3a6c8c96a345e1c37)
 2017-01-17 14:34:12 +01:00
Arturo Gonzalez
fd21b281c7 Added threshold graph to interface monitors graph (Only when monitors have the same warning or critical min value). Ticket #4113 
(cherry picked from commit 2391e7ae7827eaae7ff73f2377e89bbc70fc2848)

 Conflicts resolved:
	pandora_console/operation/agentes/interface_traffic_graph_win.php
 2017-01-17 14:33:08 +01:00
Arturo Gonzalez
0e031b50e3 Added module value control to shows units in max, min and avg values. Ticket #159 
(cherry picked from commit 1f07d8a022cec8988fdf148e5c4c35f447eb6fa0)

Conflicts resolved:
	pandora_console/include/functions_visual_map.php
 2017-01-17 11:43:28 +01:00
Arturo Gonzalez
3053322d60 Filter with not init history db. Ticket #158 
(cherry picked from commit 2cbe165d2513cb9ca8d252a978caa8ca08a9e7eb)
 2017-01-17 10:51:51 +01:00
vgilc
9791f2aacb Merge branch 'cherry-pick-e2b749a3' into 'pandora_6.0' 
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'

See merge request !37
 2017-01-17 09:57:40 +01:00
daniel
f6028640d3 Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop' 
Allow dinamic ip

Closes #17

See merge request !34
 2017-01-17 09:57:05 +01:00
vgilc
6481ed01df Merge branch 'cherry-pick-2aba5dde-2' into 'pandora_6.0' 
Merge branch 'revert-981273b2' into 'develop'

See merge request !36
 2017-01-17 09:56:23 +01:00
daniel
5409b852bd Merge branch 'revert-981273b2' into 'develop' 
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…

See merge request !33
 2017-01-17 09:55:52 +01:00
vgilc
3d984bbfe2 Merge branch 'cherry-pick-981273b2' into 'pandora_6.0' 
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'

Allow automatic ip

Closes #17

See merge request !31

See merge request !32
 2017-01-16 17:48:52 +01:00
daniel
0aa2c40958 Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop' 
Allow automatic ip

Closes #17

See merge request !31
 2017-01-16 17:48:16 +01:00
vgilc
0ab5e4c2a7 Merge branch '151-seguridad-en-public-dashboard-integria-4347' into 'pandora_6.0' 
Fixed problems with sessions in public dashboards

#151

See merge request !30
 2017-01-16 17:01:32 +01:00
m-lopez-f
ab648b64bf Fixed problems with sessions in public dashboards 2017-01-16 16:57:58 +01:00
vgilc
b21e2ed875 Merge branch 'cherry-pick-0933ccd5' into 'pandora_6.0' 
Merge branch '8-tree-view-metaconsola-con-usuario-ad-no-muestra-hiperlink-nodo' into 'develop'

Fixed problems with access a node with user in metaconsole.
#8
See merge request !17

See merge request !18
 2017-01-16 15:22:05 +01:00
vgilc
cd2af72638 Merge branch 'cherry-pick-a27f7216' into 'pandora_6.0' 
Change the input encoding once,not on every run.



See merge request !28
 2017-01-16 14:01:36 +01:00
Ramon Novoa
e9b6d9071a Change the input encoding once,not on every run. 2017-01-16 14:00:15 +01:00
vgilc
bab8227bb1 Merge branch 'group_pass_in_console' into 'pandora_6.0' 
Added pass field to groups in console. Ticket #153

(cherry picked from commit d51225f86ccd0b9adeda84198f05d37004298916)

See merge request !26
 2017-01-16 11:40:17 +01:00
vgilc
075821b809 Merge branch 'cherry-pick-66ae3460' into 'pandora_6.0' 
Add the token group_password to agent configuration files.



See merge request !25
 2017-01-16 11:39:11 +01:00
Arturo Gonzalez
20aac21c84 Added pass field to groups in console. Ticket #153 
(cherry picked from commit d51225f86ccd0b9adeda84198f05d37004298916)
 2017-01-16 11:38:02 +01:00
Ramon Novoa
bd19b1489c Add the token group_password to agent configuration files. 2017-01-16 11:35:50 +01:00
vgilc
d4fcd8b927 Merge branch 'macros_snmp_fields_macros' into 'pandora_6.0' 
Added a minor modification to alert snmp macros. Ticket #4290

(cherry picked from commit 907ba03b1ab3c4e6df0e63a9ecefb672aa238cb8)

See merge request !23
 2017-01-16 10:12:29 +01:00
Arturo Gonzalez
dd2ce3582d Added a minor modification to alert snmp macros. Ticket #4290 
(cherry picked from commit 907ba03b1ab3c4e6df0e63a9ecefb672aa238cb8)
 2017-01-16 10:09:54 +01:00
vgilc
0d67346950 Merge branch 'cherry-pick-102e5bfc' into 'pandora_6.0' 
Merge branch '11-config-network-tools-no-se-muestra-3520' into 'develop'

fixed minor error extensions

Closes #11

See merge request !21

See merge request !22
 2017-01-16 09:36:12 +01:00
daniel
31f07677f7 Merge branch '11-config-network-tools-no-se-muestra-3520' into 'develop' 
fixed minor error extensions

Closes #11

See merge request !21
 2017-01-16 08:39:18 +01:00
artica
4d8236ab7e Auto-updated build strings. 2017-01-16 00:01:30 +01:00
artica
a6c24eed2c Auto-updated build strings. 2017-01-15 00:01:34 +01:00
artica
c39d9f51a4 Auto-updated build strings. 2017-01-14 00:01:37 +01:00
Enrique Camargo
90f8a7b416 Merge branch '9-Feature_Case_sensitive_en_campos_de_búsqueda' into 'develop' 
Case insensitive in tree view filter search #9

#9

See merge request !19
 2017-01-13 11:03:54 +01:00
mlopez
4a61c03235 Merge branch '8-tree-view-metaconsola-con-usuario-ad-no-muestra-hiperlink-nodo' into 'develop' 
Fixed problems with access a node with user in metaconsole.

#8

See merge request !17
 2017-01-13 10:47:05 +01:00
vgilc
729f0daaca Merge branch '7-cambiar_color_de_grafica_de_acceso' into 'pandora_6.0' 
Change agent details graph color

#7

See merge request !14
 2017-01-13 10:01:20 +01:00
artica
4b83823783 Auto-updated build strings. 2017-01-13 00:01:34 +01:00
mlopez
001c01a885 Merge branch '1-acciones-masivas' into 'develop' 
Add selection modules in "Bulk operations: Add action alerts and delete action alerts".

#1

See merge request !15
 2017-01-12 15:53:32 +01:00
vgilc
40676d44ff Merge branch 'cherry-pick-8ae01d5c' into 'pandora_6.0' 
Merge branch '141-consola-visual-metaconsola-vista-integria-4348-open' into 'develop'

fixed visual errors in metaconsole



See merge request !12

See merge request !13
 2017-01-12 12:42:32 +01:00
enriquecd
0f50d40104 Change agent details graph color 2017-01-12 11:40:56 +01:00
daniel
c3eb11bd2b Merge branch '141-consola-visual-metaconsola-vista-integria-4348-open' into 'develop' 
fixed visual errors in metaconsole



See merge request !12
 2017-01-12 10:57:36 +01:00
Hirofumi Kosaka
3581ef8ba5 Fixed "pagination" had ignored trap_type filtering at SNMP Console. 2017-01-12 11:29:19 +09:00
artica
b33157885d Auto-updated build strings. 2017-01-12 00:01:34 +01:00
vgilc
a7776122ef Merge branch 'cherry-pick-061273a2' into 'pandora_6.0' 
Merge branch '5-consola-visual-metaconsola-scroll-a-tope-integria-4346' into 'develop'

fixed visual error visual console

Closes #5

See merge request !9

See merge request !10
 2017-01-11 17:39:14 +01:00
daniel
dce29d204a Merge branch '5-consola-visual-metaconsola-scroll-a-tope-integria-4346' into 'develop' 
fixed visual error visual console

Closes #5

See merge request !9
 2017-01-11 17:38:27 +01:00
vgilc
56c740772f Merge branch 'cherry-pick-59bd635b' into 'pandora_6.0' 
Merge branch '4-vista-de-alertas-metaconsola' into 'develop'

add lost option in call function in alert view in metaconsole.
See merge request !7

See merge request !8
 2017-01-11 16:54:47 +01:00
mlopez
2bc6bae5bf Merge branch '4-vista-de-alertas-metaconsola' into 'develop' 
add lost option in call function in alert view in metaconsole.



See merge request !7
 2017-01-11 16:52:57 +01:00
mlopez
890952aa5e Merge branch '2-el-campo-last-data-hacer-click-en-un-modulo-no-se-muestra-correctamente' into 'develop' 
Change visual of data in tree view, now show more data.

Closes #2

See merge request !4
 2017-01-11 13:15:04 +01:00
artica
867b74a879 Auto-updated build strings. 2017-01-11 00:01:31 +01:00
m-lopez-f
c708991cb4 Fixed lost filter in url pagination events in metaconsole. Ticket: #4243 2017-01-10 09:55:22 +01:00
artica
bac6cc17ef Auto-updated build strings. 2017-01-10 00:01:32 +01:00
Ramon Novoa
221e738f01 Properly parse absolute incremental modules. 
(cherry picked from commit b331867e9414e1d1141db89d29221292a58a1b8b)
 2017-01-09 14:47:03 +01:00
m-lopez-f
f11e78cc3a Fixed problems with wizard login when cancel wizard. Ticket: #4246 2017-01-09 09:09:41 +01:00
artica
17bd32f04b Auto-updated build strings. 2017-01-09 00:01:52 +01:00
artica
087200656e Auto-updated build strings. 2017-01-08 00:01:44 +01:00
artica
402826f11f Auto-updated build strings. 2017-01-07 00:01:32 +01:00