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

6897 Commits

Author SHA1 Message Date
Arturo Gonzalez e9cb769cbf Added some modifications about RR 2017-03-16 14:22:42 +01:00
enriquecd 8a547961c4 Not show graph icons legend - #96 2017-03-16 12:45:33 +01:00
Hirofumi Kosaka 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
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
m-lopez-f b937db8f35 remove debug console.log traces. 2017-03-16 09:10:22 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
enriquecd 00f0a171b4 Show agent - module in pdf reports item - #528 2017-03-15 18:45:52 +01:00
m-lopez-f 5d1088dfa9 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:23:26 +01:00
m-lopez-f 7a7a42b04e Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533" 
This reverts commit 4563ef34a4.
 2017-03-15 17:22:50 +01:00
m-lopez-f 994432c335 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:19:07 +01:00
m-lopez-f 4563ef34a4 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:18:53 +01:00
Arturo Gonzalez e5011a010b Update translations 2017-03-15 17:13:21 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
Arturo Gonzalez fa885faf8e Added a new fine filter to RR 2017-03-15 16:45:55 +01:00
Arturo Gonzalez 41f40d8310 Update translations in develop 2017-03-15 16:00:19 +01:00
vgilc 41c774ac99 Merge branch 'cherry-pick-22138f62' into 'develop' 
DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
 2017-03-15 15:58:45 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00
Arturo Gonzalez 794b292078 Changed translations in mr 2017-03-15 14:37:52 +01:00
Arturo Gonzalez d9d01a453a Added a last modifications to um offline and online open 2017-03-15 13:53:44 +01:00
Arturo Gonzalez 0db1dc50c7 Added a lot of code to um offline and online open. 2017-03-15 13:20:05 +01:00
m-lopez-f 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
Daniel Maya f00cf520ce Fixed problem with the module graph type line in the public visual console 2017-03-15 11:43:13 +01:00
Arturo Gonzalez adb055b13c Added a lot of code to um and rr new system 2017-03-15 10:24:29 +01:00
daniel a87839bd07 login page 2017-03-15 10:12:18 +01:00
Arturo Gonzalez a4512ceae2 Added a few modifications to rr 2017-03-15 09:36:31 +01:00
Arturo Gonzalez ebf6c26e0a Added new translations to pandorafms. Ticket #347 2017-03-15 09:05:23 +01:00
Junichi Satoh c835f48b6f Updated Japanese translations. 2017-03-15 13:44:55 +09:00
artica 904e3142c8 Auto-updated build strings. 2017-03-15 00:01:18 +01:00
Arturo Gonzalez 3485497639 Remuve traces 2017-03-14 19:14:56 +01:00
Arturo Gonzalez 1adb43bfb0 Added a few things to um and rr 2017-03-14 19:11:39 +01:00
Arturo Gonzalez a582cb9204 Added a few things to mr 2017-03-14 18:53:49 +01:00
Arturo Gonzalez e7339e3f87 Added few things to mr 2017-03-14 18:37:24 +01:00
Arturo Gonzalez cdcd48ca17 Debug traces 2017-03-14 18:24:23 +01:00
Arturo Gonzalez cfcac5e95f Added a few things to mr 2017-03-14 18:17:06 +01:00
Arturo Gonzalez 252b43122e Added a new index.pot 2017-03-14 16:29:58 +01:00
Arturo Gonzalez aa157b575d Added new translation and fix an error. 2017-03-14 16:28:30 +01:00
Arturo Gonzalez 00ffbb6fcb New index.pot. Ticket #347 2017-03-14 16:21:07 +01:00
Arturo Gonzalez 0b62513fea Updated translations. Ticket #347 2017-03-14 16:17:13 +01:00
Daniel Maya f4350aed6b Ticket 477. Fixed some bug in the visual console 2017-03-14 15:54:46 +01:00
Arturo Gonzalez 6aa97917f2 Added new verification when mr filename is wrong. Ticket #510 2017-03-14 15:20:22 +01:00
Arturo Gonzalez be6cc9ea79 Added the last dialog to um. Ticket #486 2017-03-14 13:52:29 +01:00
Arturo Gonzalez fe23e81481 Fixed negative id to pandorafms node in networkmaps. 2017-03-14 13:38:19 +01:00
Daniel Maya cdd2363912 ticket 348. Fixed problem of access to the database 2017-03-14 13:14:39 +01:00
Arturo Gonzalez 36fda7a23d Added interface modules to db (to next relations with this interfaces) 2017-03-14 12:24:37 +01:00
Arturo Gonzalez 9cd9eb6fb4 Added filter to non-relation modules. (networkmap) 2017-03-14 11:30:41 +01:00
Arturo Gonzalez cb84e69ada Added warning img to mr advice. Ticket #486 2017-03-14 10:48:29 +01:00
Arturo Gonzalez 73c31012d9 Added new visual styles to um and rr systems. Ticket #486 2017-03-14 10:36:10 +01:00
Arturo Gonzalez 6f935f27ce Fixed recon task field to get subnet (networkmaps) 2017-03-14 08:53:41 +01:00
artica 4fb6a26365 Auto-updated build strings. 2017-03-14 00:01:18 +01:00
artu30 2c8af1d54a Merge branch 'new_jquery_dialog_view' into 'develop' 
New styles to jquery dialog. (Header done)

See merge request !250
 2017-03-13 17:06:00 +01:00
artu30 7bca59dee1 Merge branch 'move_mr_to_um' into 'develop' 
Move mr to um

See merge request !249
 2017-03-13 16:45:54 +01:00
Arturo Gonzalez 6a39147940 Added rr to um offline. Ticket #510 2017-03-13 16:30:04 +01:00
Arturo Gonzalez 44ac96ae5e Added mr to um menu (online open and enterprise). Ticket #510 2017-03-13 15:52:30 +01:00
enriquecd 0094cfa9bf Center alert modal window when is opened - #93 2017-03-13 13:25:16 +01:00
Arturo Gonzalez b5168928e8 Merge branch 'develop' into move_mr_to_um 2017-03-13 08:42:08 +01:00
artica 7890d7bfea Auto-updated build strings. 2017-03-13 00:01:17 +01:00
artica 76fe1bbab6 Auto-updated build strings. 2017-03-12 00:01:18 +01:00
artica 9b45f46af5 Auto-updated build strings. 2017-03-11 00:01:19 +01:00
Alejandro Gallardo Escobar c795f56feb Fixed functions_agents.php 2017-03-10 14:58:19 +01:00
Arturo Gonzalez 46b008708c Move mr to um section 2017-03-10 14:01:24 +01:00
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
artica c3f3900ee5 Updated version and build strings for the 7.0NG release. 2017-03-10 11:10:28 +01:00
Ramon Novoa 4a739775c9 Merge remote-tracking branch 'origin/develop' into feature#new-iface-names 2017-03-10 10:32:46 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
Arturo Gonzalez dfa7552fcd New styles to jquery dialog. (Header done) 2017-03-10 09:41:07 +01:00
artica 67a31f8a70 Auto-updated build strings. 2017-03-10 00:01:21 +01:00
enriquecd 94fceaaa5d Fix printing elements in visual console (revert) - #90 2017-03-09 19:52:37 +01:00
m-lopez-f 8de4984faf Fixed dialog of system warning alerts. Gitlab: #506 2017-03-09 15:40:59 +01:00
m-lopez-f cb2ff6e9f8 Fixed problems with resize imgs when dont do it. Gitlab: #504 2017-03-09 12:50:51 +01:00
m-lopez-f 54d2ee6790 Remove file 2017-03-09 12:41:16 +01:00
daniel 66e7d71858 fixed errors in search tree view 2017-03-09 12:16:35 +01:00
m-lopez-f baf16db154 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:40:32 +01:00
Arturo Gonzalez 944f891f93 Added modules nodes to non interface relacions. 2017-03-09 11:20:06 +01:00
daniel b7d44c4c62 add new macro in helps 2017-03-09 11:14:58 +01:00
Arturo Gonzalez 65fcfd7f4c Fixed module type in map relations, again, and now its true. 2017-03-09 11:06:51 +01:00
daniel e5c0440d0b fixed errors in mail module_graph 2017-03-09 08:58:53 +01:00
Arturo Gonzalez 7dd279b902 Rewrite code to modules type cause it was broken. 2017-03-09 08:58:11 +01:00
artica cfec08d075 Updated version string to 7.0NG_BETA to avoid problems with package managers. 2017-03-09 08:10:20 +01:00
artica b61f552649 Auto-updated build strings. 2017-03-09 00:01:19 +01:00
Arturo Gonzalez 6548443c82 Removed module tipe filter in networkmaps. 2017-03-08 16:09:08 +01:00
Ramon Novoa a832ae99ab Add icons for the Mainframe and Sync servers. 2017-03-08 14:59:24 +01:00
Arturo Gonzalez 1b1ab69edc Fixed holding area checking 2017-03-08 13:25:13 +01:00
enriquecd 07f0c405b3 Use original size for elements smaller than 70 in render and viewer vconsole - #90 2017-03-08 12:18:06 +01:00
m-lopez-f c7e1d682df Add access node in auth ad method in all cases. Gitlab: #367 2017-03-08 12:05:15 +01:00
daniel 07a58aa944 changes css for widget 2017-03-08 10:56:25 +01:00
artica 342bcbb4ef Auto-updated build strings. 2017-03-08 00:01:20 +01:00
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
m-lopez-f ba423c93d8 Only view of system event of user that have admin powers. Gitlab: #455 2017-03-07 16:30:01 +01:00
Daniel Maya b26863d7ac Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-03-07 15:36:25 +01:00
Daniel Maya d1302731b6 Added alias when creating and modifying agent 2017-03-07 15:36:04 +01:00
daniel a7a7a27225 fixed widgets groups status 2017-03-07 15:31:24 +01:00
Arturo Gonzalez 15bcd0add8 Changed visual styls of install page. Ticket #448 2017-03-07 10:59:22 +01:00
Daniel Maya 4b8ec8e5ae Added alias in api 2017-03-07 10:31:23 +01:00
daniel 7ecfe679ea fixed graph pie legend 2017-03-07 09:46:40 +01:00
daniel afecd9f4a4 fixed color in verical graph 2017-03-07 09:10:15 +01:00
daniel 24c4060ab1 fixed last in legend combined graph 2017-03-07 08:37:45 +01:00
Junichi Satoh c39657f233 Translated a help file into japanese. 2017-03-07 15:33:36 +09:00
Junichi Satoh df9bb41dea Updated Japanese translations. 2017-03-07 15:21:34 +09:00
artica 03741b62d9 Auto-updated build strings. 2017-03-07 00:01:16 +01:00
enriquecd a0b87859c5 Resize incident by status graph to have similar size to other graphs - #89 2017-03-06 18:11:58 +01:00
Arturo Gonzalez 5a612b3ab6 Added check to PNG extensions. Ticket #51 2017-03-06 15:32:24 +01:00
daniel 74c8bf5539 fixed errors in custom graph pdf percentil 2017-03-06 15:19:19 +01:00
enriquecd db370619b4 Change url and params on hbar_graph, now show grpah in html and pdf - #87 2017-03-06 13:52:28 +01:00
m-lopez-f 7f0359283d Fixed problems with ACL permmisions. Gitlab: #451 2017-03-06 12:54:48 +01:00
fermin831 395a73a868 Order top N ascending pie chart 2017-03-06 12:37:23 +01:00
Arturo Gonzalez 49204b6864 Changed generation method in agent_modules image. Ticket #376 2017-03-06 11:50:38 +01:00
daniel 7b97b30cfa fixed error in report custam graphs 2017-03-06 10:58:15 +01:00
m-lopez-f 10078287c7 Reports, Prediction date: Change position of inputs in create items. And change code of creation data. Gitlab: #414 2017-03-06 10:06:51 +01:00
daniel ed287b7cdb fixed errors in custom graph with percentile and pdf 2017-03-06 10:01:24 +01:00
artica cf5ade4972 Auto-updated build strings. 2017-03-06 09:13:26 +01:00
Enrique Camargo f2e6aa446e Merge branch '85-label-custom-graph-en-informes' into 'develop' 
Increase custom graph report items container because not fit labels, fix loading message (no hide) -

See merge request !228
 2017-03-03 14:14:20 +01:00
m-lopez-f 0b943fcf08 Remove debug traces 2017-03-03 13:27:02 +01:00
m-lopez-f b8f6b9fad4 Fixed style of visual mapwidget in dashboards. Gitlab: #374 2017-03-03 12:50:03 +01:00
enriquecd b4dd2e97b2 Increase custom graph report items container because not fit labels, fix loading message (no hide) - 2017-03-03 12:44:00 +01:00
Ramon Novoa 540d076c9f Merge branch 'develop' into feature#new-iface-names 2017-03-03 08:32:31 +01:00
artica 5e1b14a75a Auto-updated build strings. 2017-03-03 00:01:30 +01:00
fermin831 0ce0d7a61c Fixed height on module graph when no resize is needed 2017-03-02 18:49:37 +01:00
fermin831 31ea5bf5ec Added Time lapse in #434 2017-03-02 16:37:28 +01:00
m-lopez-f 99c176daf8 Fixed problems with graphs when using visual console maps and pure vision. 2017-03-02 15:50:05 +01:00
daniel ff3d8ca07f fixed error graph in report network_interfaces 2017-03-02 13:35:11 +01:00
m-lopez-f 4e6fdf7b15 Fixed change/delete or added permmisions when active AD o AD advanced method login and using a metaconsole version. Gitlab: #379 2017-03-02 13:23:01 +01:00
fermin831 9883be0302 Deleted graph name on projection graphs 2017-03-02 13:18:13 +01:00
daniel 4ef8cd3234 fixed errors in visual consele meta 2017-03-02 11:23:09 +01:00
fermin831 c8ebcafc13 Fixed monitor report (using reporting_advanced_sla function) 2017-03-02 11:12:19 +01:00
Arturo Gonzalez 86e8e7fc1c Fixed module type order field in agent view. Ticket #392 2017-03-02 10:59:58 +01:00
Arturo Gonzalez c527aa243b Fixed font size reduction in graphs. Ticket #411 2017-03-02 09:35:28 +01:00
Ramon Novoa 12d3c1722b Merge branch 'develop' into feature#new-iface-names 2017-03-02 08:18:19 +01:00
Ramon Novoa 6f8452f10f Apply Aoyagi's second patch. 2017-03-02 07:59:13 +01:00
artica 01784bd083 Auto-updated build strings. 2017-03-02 00:01:16 +01:00
Arturo Gonzalez cf27aae8cc Reorder module ordenation by status. Ticket #394 2017-03-01 16:02:35 +01:00
artica 8ab66f6d64 Updated version and build strings for the NG BETA release. 2017-03-01 16:01:27 +01:00
fermin831 ec515db179 Fixed get module_data to get url_encode_separator 2017-03-01 15:30:40 +01:00
artica 02332570de Revert "Updated version and build strings." 
This reverts commit 8867a17baf.
 2017-03-01 15:25:58 +01:00
artica 8867a17baf Updated version and build strings. 2017-03-01 15:25:30 +01:00
daniel ab56ffda93 fixed minor error in report availability 2017-03-01 15:20:41 +01:00
Ramon Novoa 47e17630d1 Merge branch 'develop' into feature#new-iface-names 2017-03-01 15:00:44 +01:00
daniel 99bf29b667 fised errors in graph 2017-03-01 14:59:37 +01:00
Ramon Novoa 936ae0b4cd Apply Aoyagi's patch. 2017-03-01 12:34:32 +01:00
Ramon Novoa 225147770d Merge branch 'develop' into feature#new-iface-names 2017-03-01 12:18:09 +01:00
Arturo Gonzalez 44724e648d Fixed graphs in reports. Ticket #411 2017-03-01 12:10:01 +01:00
daniel 5faf2fdaef merge develop in new_ifaces_name 2017-03-01 11:47:38 +01:00
Arturo Gonzalez 8bae65b4a2 Fixed gis map agents name when refresh map. Ticket #395 2017-03-01 09:20:28 +01:00
fermin 62bdfbf4f8 Merge branch 'ent-312-filtros-activos-en-vista-de-eventos' into 'develop' 
Ent 312 filtros activos en vista de eventos

See merge request !219
 2017-03-01 08:36:44 +01:00
m-lopez-f 80edd82cf4 Fixed graphs in visual console and dashboards. Ticket: #374 2017-03-01 08:26:10 +01:00
artica 8d092ef24d Auto-updated build strings. 2017-03-01 00:01:17 +01:00
fermin831 9354e845f7 Changed some icons 2017-02-28 19:17:38 +01:00
daniel 909637c1f8 add pdf to report interfaces 2017-02-28 18:06:23 +01:00
fermin831 4ae8963e2e Added events active filter view (open side) 2017-02-28 15:41:03 +01:00
enriquecd 7034f7afc6 Check interval filter agents without modules and disabled modules - #74 2017-02-28 14:29:05 +01:00
Arturo Gonzalez 24ef7a1e11 Languages updated. Ticket #371 2017-02-28 14:03:42 +01:00
Arturo Gonzalez 2d3d82001e Fixed some things to networkmaps. Ticket #406 2017-02-28 12:51:24 +01:00
daniel 5a79f83bba feature change name interfaces 2017-02-28 12:42:50 +01:00
m-lopez-f d83981ef5d Fixed values and graphs in visual consoles. 2017-02-28 12:25:06 +01:00
m-lopez-f 0dd770a551 Fixed problems with visual maps in dashboards view. Gitlab: #374 2017-02-28 10:49:12 +01:00
Arturo Gonzalez 4d89b6496f Min value always must be 0 in y axis. Ticket #345 2017-02-28 08:52:47 +01:00
artica 19dcc729da Auto-updated build strings. 2017-02-28 00:01:17 +01:00
Daniel Maya c1d22dad1b Change in pandora link 2017-02-27 17:23:02 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +01:00
Daniel Maya 742f487d72 Change to alias in treeview 2017-02-27 15:06:24 +01:00
Arturo Gonzalez 938dc40f77 Fixed api get module data. Ticket #385 2017-02-27 14:58:40 +01:00
enriquecd 983d00535a Change background color when mouse over rows in agent and module managers - #81 2017-02-27 14:28:09 +01:00
m-lopez-f 070db42c41 Add default value of field advance ad configuration. Gitlab: #367 2017-02-27 11:26:48 +01:00
Arturo Gonzalez fc7e2f69b7 Fixed exception in datetime object. Functions api get_module_data. Ticket #378 2017-02-27 11:05:23 +01:00
Junichi Satoh 023f4b1703 Fixed setcookie() usage. 2017-02-27 13:45:45 +09:00
artica 163b061af0 Auto-updated build strings. 2017-02-27 00:01:16 +01:00
artica ef50808832 Auto-updated build strings. 2017-02-26 00:01:15 +01:00
artica 4d6e26a496 Auto-updated build strings. 2017-02-25 00:01:17 +01:00
daniel 45ea30e5b3 fixed nome agent for alias agent 2017-02-24 13:59:03 +01:00
Daniel Maya 0e1c62e644 Changed agent search 2017-02-24 13:41:59 +01:00
artica 62ab9f0a55 Auto-updated build strings. 2017-02-24 00:01:16 +01:00
Alejandro Gallardo Escobar 2f3053ebbd Changed the agent name by its alias and fixed the exception reporting item 2017-02-23 12:59:24 +01:00
m-lopez-f 289549a49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-23 12:26:56 +01:00
m-lopez-f 45316cdd0f Fixed visual in welcome view. Gitlab: #359 2017-02-23 12:26:48 +01:00
daniel a0ace09e01 fixed url img in metaconsole 2017-02-23 12:02:02 +01:00
m-lopez-f 8050f063cb Fixed problems with export data in csv on graphs when have percentil active. Gitlab: #358 2017-02-23 10:55:38 +01:00
Enrique Camargo 9bdfc386f3 Merge branch '75-etiquetas-de-vista-de-agente' into 'develop' 
Add not init status count label y agent detail section - #75

See merge request !199
 2017-02-23 10:15:29 +01:00
enriquecd fe8a43d045 Add not init status count label y agent detail section - #75 2017-02-23 10:05:03 +01:00
daniel 7609e85d3e fixed errors in tab menu 2017-02-23 09:23:27 +01:00
m-lopez-f 30baabafeb Fixed problems with output data in netflow, change max view data. Gitlab: #333 2017-02-23 09:05:11 +01:00
artica 39e380097b Auto-updated build strings. 2017-02-23 00:01:18 +01:00
enriquecd 817bce5f4c Convert to array values revieved by ajax for updatedb - #77 2017-02-22 17:41:19 +01:00
Alejandro Gallardo Escobar 3d8af42834 Changed the agent name by its alias 2017-02-22 16:43:28 +01:00
m-lopez-f 1e4d784e72 Remove text from header and only indicated name of networkmap or agents. Gitlab: #353 2017-02-22 13:48:11 +01:00
m-lopez-f 724b2e469d Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-22 13:08:47 +01:00
m-lopez-f 015890a18a Fixed problems with duplicade color in netflow graphs. Gitlab: #346 2017-02-22 13:08:39 +01:00
Alejandro Gallardo Escobar 3d521ec290 Changed the agent name by its alias in some sections 2017-02-22 12:51:55 +01:00
Alejandro Gallardo Escobar c26eb06adb Now the function to print the agent name prints the alias by default. This behaviour can be modified by changing a parameter 2017-02-22 12:51:55 +01:00
enriquecd 454a799c3d Change count column label text in agent detail section - #75 2017-02-22 11:36:29 +01:00
daniel f351a95993 fixed errors in tabs reports 2017-02-22 09:21:35 +01:00
artica 54d228c00e Auto-updated build strings. 2017-02-22 00:01:20 +01:00
Alejandro Gallardo Escobar 6fc884d327 Changed the agent name by its alias in the events sections 2017-02-21 19:07:17 +01:00
Enrique Camargo 1e88c6d457 Merge branch '74-muestra-last-contact-en-rojo-no-deberia' into 'develop' 
Functions_module now not use async modules to calc if last contact is major than…

See merge request !190
 2017-02-21 18:59:14 +01:00
fermin831 d16138c68e Modified GIS Maps to print OpenMaps on empty google license 2017-02-21 18:48:50 +01:00
enriquecd 63c112a628 Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 2017-02-21 18:45:44 +01:00
daniel bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +01:00
Daniel Maya 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
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
daniel 63d582586b Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop' 
fixed error in ldap create new users

See merge request !186
 2017-02-21 15:55:51 +01:00
Daniel Maya c21bbfd88c Merge branch 'feature/alias_friendly_name' of https://192.168.50.5:8081/artica/pandorafms into feature/alias_friendly_name 2017-02-21 15:31:45 +01:00
Daniel Maya 76cb61f288 Changes for the merge 2017-02-21 15:31:20 +01:00
Alejandro Gallardo Escobar 430ae3e201 Merge branch 'develop' into feature/alias_friendly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-21 15:23:44 +01:00
daniel a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
Alejandro Gallardo Escobar 0daaa9651e Changed the agent name by its alias 2017-02-21 14:04:43 +01:00
daniel df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
Enrique Camargo 32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop' 
Improve custom graph interface - #66

See merge request !179
 2017-02-21 12:39:01 +01:00
enriquecd 48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
Arturo Gonzalez 5190228010 Merge branch 'develop' into feature/log_in_reports 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
 2017-02-21 12:06:24 +01:00
m-lopez-f 09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin 59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop' 
Updated eHorus client

See merge request !176
 2017-02-21 10:23:29 +01:00
Alejandro Gallardo Escobar e7df5ebacb Merge branch 'develop' into feature/alias_friendly_name 2017-02-21 10:12:35 +01:00
artica 028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
Alejandro Gallardo Escobar 51955d5bea Changed the agent name by its alias 2017-02-20 20:02:39 +01:00
Alejandro Gallardo Escobar 58617c00aa Merge branch 'develop' into feature/alias_friendly_name 2017-02-20 18:52:18 +01:00
Alejandro Gallardo Escobar e53d75d98d Added a function to get the agent alias using a module id 2017-02-20 18:50:28 +01:00
fermin831 7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +01:00
Alejandro Gallardo Escobar 354377a56a Changed the agent name by its alias 2017-02-20 17:28:38 +01:00
daniel 5c32d0ba95 Merge branch '267-vista-agente-modulo-con-filtros-no-visualiza-datos-open' into 'develop' 
fixed errors in agent/module

See merge request !175
 2017-02-20 17:26:14 +01:00
Arturo Gonzalez 03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
daniel 65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +01:00
Alejandro Gallardo Escobar 550a00cec7 Changed the agent name by its alias 2017-02-20 15:32:49 +01:00
Alejandro Gallardo Escobar c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
m-lopez-f 2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
daniel 40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Arturo Gonzalez f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
artica f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica 2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica 1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
m-lopez-f e3c3fafa43 Fixed problems with agent name in visual consoles. Gitlab #257 2017-02-17 15:39:28 +01:00
m-lopez-f 699942eef5 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-17 13:34:39 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Enrique Camargo 8ad2c2f35f Merge branch '63-la-consola-visual-en-pantalla-completa-se-come-un-trozo-por-arriba' into 'develop' 
Visual console in fullscreen does not allow see complete background if is bigger than screen - #63

See merge request !168
 2017-02-17 13:23:43 +01:00
Arturo Gonzalez 294cb5a14f Revert "Added data precision to events table. Ticket #288" 
This reverts commit f6f5d64d32.
 2017-02-17 13:15:28 +01:00
enriquecd d7b24fc9c9 Visual console in fullscreen does not allow see complete background if is bigger than screen - #63 2017-02-17 13:04:21 +01:00
Arturo Gonzalez f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +01:00
Daniel Maya 3051ce4e23 Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_console/include/functions_ui.php
 2017-02-17 10:11:59 +01:00
artica 0677a62be0 Auto-updated build strings. 2017-02-17 00:01:17 +01:00
Daniel Maya 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
daniel cfb7a3a88e fixed tabs in reports 2017-02-16 15:40:56 +01:00
Arturo Gonzalez 928689ef3b Added some modifications in networkmaps fonts. Ticket #270 2017-02-16 15:05:44 +01:00
fbsanchez 27744031ce Fixed thresholds SLA 
fixed dynamic calculation while the thresholds are disabled.
 2017-02-16 12:29:31 +01:00
fbsanchez 9ddee676b6 Minor fix: inherit mysqli from config 2017-02-16 11:35:26 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00
Junichi Satoh fdb19d309d Updated japanese translations. 2017-02-16 18:22:30 +09:00
fbsanchez 8a2bd0f087 Fixed mysqli availability checker 2017-02-16 10:18:08 +01:00
Arturo Gonzalez 8dbd12eac7 Changed default value to service label font size. Ticket #218 2017-02-16 10:09:05 +01:00
artica 96b160adc2 Auto-updated build strings. 2017-02-16 00:01:14 +01:00
nramon 165b59656e Merge branch 'develop' into '253-bit-de-licencia-ux-para-pandora-7' 
# Conflicts:
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
 2017-02-15 15:49:16 +01:00
Ramon Novoa de392d26ad Update the Update Manager URLs. 2017-02-15 15:41:54 +01:00