c29d8a4fdb
Revert "merge develop"
...
This reverts commit 8232911713f5da86ac0a
2017-08-23 09:35:17 +02:00
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
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
e1d4a81034
Fixed issue with simple value
2017-08-10 15:45:53 +02:00
97392c4568
Fixed issue to search agent modules in cascade protection
2017-08-07 13:10:02 +02:00
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
741cc05268
fixed errors in graph container
2017-07-24 10:53:04 +02:00
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
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
d57508f09e
Added sla_auto_graph item to vc first version
2017-07-13 16:23:16 +02:00
8f2b4fb783
Added more changes to the first version
2017-07-13 13:25:28 +02:00
19caa3ebfb
Added js image
2017-07-13 12:26:13 +02:00
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
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
63d07e1416
Added more things to new vc item
2017-07-12 13:34:20 +02:00
39d090db1e
fixed minor error
2017-06-28 16:39:54 +02:00
c942fce068
added snmp_browser.ajax
2017-06-20 15:47:29 +02:00
80a38cbd9f
add checkbox for show all events in view agent detail
2017-06-14 12:45:40 +02:00
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
2ede057298
Add data image option to simple data visual console element - #412
2017-06-13 16:49:25 +02:00
f0492c370c
Changed format
2017-06-06 15:48:58 +02:00
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
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
5d2a3fc094
Fixed readonly validation in nodes
2017-06-01 12:17:30 +02:00
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
5cf6962de0
Fixed problem in data display snmp wizard
2017-05-30 15:40:50 +02:00
b7e7e9e66a
Changed current_package_enterprise
2017-05-26 11:15:00 +02:00
e243067c4b
New feature: Graphic grouping
2017-05-23 17:13:47 +02:00
400fcdca26
fixed errors in massive copy modules
2017-05-10 09:42:39 +02:00
eb1dafe807
Fixed lines in visual console
2017-05-09 12:40:22 +02:00
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
df42f2a26b
Fixed bad bucle
2017-04-06 17:38:05 +02:00
3f27e0a306
Revert "Merge branch 'remove-traces-debug' into 'develop'"
...
This reverts merge request !266
2017-04-04 13:48:11 +02:00
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
0dea7fb690
Text change warn by thresholds
2017-03-29 12:41:42 +02:00
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
15749e323f
Change sec param in policies section, gpolicies to gmodules / 7 / open - #562
2017-03-24 13:07:49 +01:00
277a3b656d
Fixed mr and um mix in um online open
2017-03-24 11:22:30 +01:00
6731eb7da4
Fixed async error
2017-03-21 15:13:04 +01:00
576b834d25
Fixed error in rr
2017-03-21 14:58:42 +01:00
8ae921402c
Added mr folder cleaner
2017-03-21 14:48:12 +01:00
f6b7c5ce19
Clean mr folder before um process
2017-03-21 13:29:06 +01:00
e8fbd1f7d1
Added minor change to um and rr system
2017-03-21 12:57:02 +01:00
b64afb7d6f
Added a few changes to um and rr
2017-03-21 10:39:39 +01:00
8fc433f2a8
Added code to control the ocassional errors
2017-03-17 14:13:45 +01:00
89727824a4
Fixed error in um online open
2017-03-17 13:56:38 +01:00
aebbc783df
Added changes to um online open to integrate mr
2017-03-17 13:27:06 +01:00
e7b811c39d
Fixed error in um offline oum path to get mrs.
2017-03-17 09:02:40 +01:00
831b5e2c7d
Added a lot of modifications to integrate mr with um
2017-03-16 19:14:33 +01:00
01b9572edc
Added more changes to um online open with mr
2017-03-16 18:23:07 +01:00
b9702a5b00
Added a lot of changes in update manager online open to integrate with mr
2017-03-16 18:07:19 +01:00
c8a0946eda
Added code to rr system
2017-03-16 16:28:27 +01:00
44231b6515
Fixed bug in qr
2017-03-16 16:14:11 +01:00
54959257c0
Added more code to um and rr
2017-03-16 16:00:57 +01:00
2b9e75237a
Added changes to rr apply
2017-03-16 15:45:26 +01:00
c7fb00b46a
Added a few modifications in RR system
2017-03-16 14:56:10 +01:00
0c51650590
Revert "Added some modifications about RR"
...
This reverts commit e9cb769cbf
2017-03-16 14:31:33 +01:00
e9cb769cbf
Added some modifications about RR
2017-03-16 14:22:42 +01:00
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
51cd53b3b3
Debug UM and RR system
2017-03-16 10:46:41 +01:00
b937db8f35
remove debug console.log traces.
2017-03-16 09:10:22 +01:00
fa885faf8e
Added a new fine filter to RR
2017-03-15 16:45:55 +01:00
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
adb055b13c
Added a lot of code to um and rr new system
2017-03-15 10:24:29 +01:00
a4512ceae2
Added a few modifications to rr
2017-03-15 09:36:31 +01:00
3485497639
Remuve traces
2017-03-14 19:14:56 +01:00
1adb43bfb0
Added a few things to um and rr
2017-03-14 19:11:39 +01:00
a582cb9204
Added a few things to mr
2017-03-14 18:53:49 +01:00
e7339e3f87
Added few things to mr
2017-03-14 18:37:24 +01:00
cdcd48ca17
Debug traces
2017-03-14 18:24:23 +01:00
cfcac5e95f
Added a few things to mr
2017-03-14 18:17:06 +01:00
aa157b575d
Added new translation and fix an error.
2017-03-14 16:28:30 +01:00
6aa97917f2
Added new verification when mr filename is wrong. Ticket #510
2017-03-14 15:20:22 +01:00
73c31012d9
Added new visual styles to um and rr systems. Ticket #486
2017-03-14 10:36:10 +01:00
6a39147940
Added rr to um offline. Ticket #510
2017-03-13 16:30:04 +01:00
44ac96ae5e
Added mr to um menu (online open and enterprise). Ticket #510
2017-03-13 15:52:30 +01:00
46b008708c
Move mr to um section
2017-03-10 14:01:24 +01:00
86e8e7fc1c
Fixed module type order field in agent view. Ticket #392
2017-03-02 10:59:58 +01:00
cf27aae8cc
Reorder module ordenation by status. Ticket #394
2017-03-01 16:02:35 +01:00
0e1c62e644
Changed agent search
2017-02-24 13:41:59 +01:00
817bce5f4c
Convert to array values revieved by ajax for updatedb - #77
2017-02-22 17:41:19 +01:00
3d8af42834
Changed the agent name by its alias
2017-02-22 16:43:28 +01:00
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
cb7ab827d2
Fixed module type chart selected in conf. Ticket #345
2017-02-21 16:36:46 +01:00
0daaa9651e
Changed the agent name by its alias
2017-02-21 14:04:43 +01:00
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
d0faeb3ec1
fixed errors in graphs
2017-02-16 11:18:42 +01:00
584427de06
Added changes to finish rr feature. Ticket #169
2017-02-14 09:36:11 +01:00
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
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
af763e14e9
Timethreshold_alert_edition_fix - 2 / Load fields fired in popup - #25
2017-02-01 19:17:20 +01:00
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
3c8bc86ab7
Added cascade protection by module (agent, massive and api). Ticket #187
2017-01-25 13:59:14 +01:00
0fec55fd82
Timethreshold_alert_edition_fix - #25
2017-01-23 15:27:22 +01:00
55063a20dc
UX console in progres... (Added hierachy mode in modules list)
2017-01-18 17:33:28 +01:00
fe6f924d7a
UX console in progress... (init develop and modules hierachy)
2017-01-18 12:45:25 +01:00
6447189606
Improve visual console - #110
2017-01-16 13:31:56 +01:00
6d1c519340
Fixed problems with access a node with user in metaconsole.
2017-01-13 10:46:09 +01:00
14891df47f
Add column when user have a AW ACL. Ticket: #4193
2016-11-17 08:41:51 +01:00
a89eb4ecf9
Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop
2016-11-16 19:03:42 +01:00
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
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
0b5d8831df
Fixed problems with data in visual console. Ticket: #4181
...
(cherry picked from commit b8a0a542f2
2016-11-15 10:56:20 +01:00
b369d8b5b4
Add feature of timesticks. Ticket: #2494
2016-11-08 12:39:28 +01:00
367c88fc9e
Fix icon bug and async string data without data:image string, Pandora UX #90
2016-11-07 13:49:33 +01:00
39169a8e91
Change no access error page - #91
2016-11-03 16:51:18 +01:00
2476e499cf
Only show force button when user have a correct permmisions. Ticket: #3912
2016-11-03 15:41:31 +01:00
88453e2075
New function pandora ux, let open pics from base64 image modules #90 - 2
2016-10-28 14:08:13 +02:00
f710fb0022
Remove code, Already exists this feature in pandora
2016-10-28 13:22:44 +02:00
22973e9f12
New function pandora ux, let open pics from base64 image modules #90
2016-10-26 18:39:41 +02:00
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
287c2a7477
Feature: Translate timestick of snmps to humen readable. Ticket: #2494
2016-10-26 16:17:02 +02:00
5985753326
Fixed problems with size elements in visual console. ticket: #4096
2016-10-25 11:41:59 +02:00
26862b5f9d
Added a function to remove right zeros in precision data feature
2016-10-20 10:47:12 +02:00
3b7cad9654
Data precision (So much precision)
2016-10-18 16:32:39 +02:00
d5f82b568c
New data precision... (Init)
2016-10-18 10:32:10 +02:00
13a19c42c2
Merge branch 'develop' into new_networkmap_feature
2016-10-17 11:36:30 +02:00
3e50676e19
Merge branch 'develop' into new_networkmap_feature
2016-10-17 11:36:00 +02:00
c98a4be8fa
Add percentil 95 a simple graph in reports.
2016-10-06 08:58:53 +02:00
33e7e40856
ticket Integria: 4070 fixed visual console add custom graph #4070
2016-09-27 12:16:14 +02:00
21dd508e53
Changed name by alias. Ticket #74 .
2016-09-22 10:27:35 +02:00
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
17e3f38aca
New networkmaps in progress... (Transfer e code to Open version)
2016-09-14 11:18:26 +02:00
581d3835db
Fixed acl's permmissions. Ticket #3912
2016-09-08 16:06:12 +02:00
e914b3c87c
Feature to update action assignate a alert and module. Internal Ticket: #3994
2016-09-01 09:09:03 +02:00
e21eabbf04
Fixed problem with the permissions of the visual console. Ticket #4000 .
2016-08-29 16:05:37 +02:00
0e53477fa7
Fixed orders groups. Ticket #3926 .
2016-08-29 12:04:44 +02:00
2217e9f908
Fixed problems with group agents. Tiquet: #3079
2016-07-22 16:08:45 +02:00
29dfd3df9b
Fixed gauge graphs in visual console. Ticket 4 (gitlab)
2016-07-21 08:45:52 +02:00
70c771013c
Fixed things in rolling release develop
2016-07-19 15:39:31 +02:00
eefb094df6
Added restriction to dangerous querys (drop database).
2016-07-19 13:48:56 +02:00
8c20874a88
Changed rolling release manager system.
2016-07-19 12:39:03 +02:00
636dfd852c
Added options to print a custom or sparse graphs
...
(cherry picked from commit fb3792645b
2016-06-07 11:40:11 +02:00
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
710e15f1b2
Fixed "autocomplete agent search" with disabled agents. Ticket #3655
2016-05-25 15:30:46 +02:00
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
2e49a82938
Fixed the length in the editor of labels of nodes.
2016-05-10 14:02:04 +02:00
f9ca419aa9
Working in the enterprise holding area.
2016-04-28 16:03:24 +02:00
5f53b2fa12
New maps in progress... (Fixed errors in enterprise ajax)
2016-04-22 13:26:18 +02:00
54465df271
New maps in progress... (Added parameters to update node size)
2016-04-21 13:06:57 +02:00
805d32e9c0
New maps in progress... (Added functions to ntwmap enterprise)
2016-04-21 10:02:03 +02:00
386bdc268e
New maps in progress... (Added functions to networkmap enterprise)
2016-04-20 15:57:18 +02:00
34c026b4e9
New maps in progress... (Added edit table to group and policy nodes)
2016-04-20 12:03:56 +02:00
cd64345368
New maps in progress... (Added policies and groups tooltips)
2016-04-20 10:48:06 +02:00
c409b3d4ea
New maps in progress... (Fixed error in node interface text)
2016-04-11 13:08:42 +02:00
7550cafbbc
Some changes in the edition of nodes.
2016-04-08 14:04:58 +02:00
ff598940e1
Some work in the networkmap.
2016-04-07 15:14:29 +02:00
3b85e3c80f
Fixed somethings in the arrows.
2016-04-07 14:20:27 +02:00
09f156cd8c
New maps in progress... (Edit node in progress)
2016-04-07 12:24:24 +02:00
5fc27d1f2e
Working in the refresh arrows.
2016-04-06 16:25:12 +02:00
daniel
vgilc
Daniel Maya
artu30
Enrique Camargo
enriquecd
Hirofumi Kosaka
m-lopez-f
Alejandro Gallardo Escobar
fbsanchez
mdtrooper