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

9357 Commits

Author SHA1 Message Date
m-lopez-f e19c002470 Fixed LDAP connection when name containt space and data login is false 
(cherry picked from commit fd7fc4eb00)
 2015-07-30 16:11:29 +02:00
artica 415a4f4373 Auto-updated build strings. 2015-07-30 00:01:29 +02:00
Arturo Gonzalez Diaz fd2eb27de8 Now the group of a module belonging to a policy does not go away by making some modification in the module. Ticket#2554 2015-07-29 13:34:51 +02:00
m-lopez-f 4c52129186 Add order data in metaconsole enterprise. Tiquet: #2232 
(cherry picked from commit 25106d8383)
 2015-07-29 10:13:55 +02:00
artica c343ca36ef Auto-updated build strings. 2015-07-29 00:01:31 +02:00
artica 2673558495 Auto-updated build strings. 2015-07-28 00:01:29 +02:00
artica 54bcc8a7a4 Auto-updated build strings. 2015-07-27 00:01:28 +02:00
artica 546fb5de11 Auto-updated build strings. 2015-07-26 00:01:27 +02:00
artica fdcd2cb1db Auto-updated build strings. 2015-07-25 00:01:29 +02:00
mdtrooper c68da1de83 Fixed the numeric format of failed % in report. 2015-07-24 15:41:39 +02:00
artica 032acc5cb3 Auto-updated build strings. 2015-07-24 00:01:28 +02:00
Arturo Gonzalez Diaz d3bb628ea2 Merge branch 'pandora_5.1' into feature/ticket#2179-recontask-view-acl 2015-07-23 16:28:22 +02:00
Arturo Gonzalez Diaz 4ede845c1c Recon-task ACL changed. Ticket #2179 2015-07-23 16:27:20 +02:00
artica be13fa9aa4 Auto-updated build strings. 2015-07-23 00:01:33 +02:00
mdtrooper 39b667a879 Fixed the report item SLA with some configurations. 2015-07-22 16:56:06 +02:00
m-lopez-f 68b6120609 Add new options when render proc is active. Tiquet: #2503 2015-07-22 12:16:10 +02:00
Arturo Gonzalez Diaz 575aedb6f7 Now diagnostic info have a new data, 'db_scheme_first_version' and show the first pandora db scheme version. 2015-07-22 11:35:42 +02:00
Ramon Novoa 3e32db2234 Return from the data server consumer if the XML file was not found. 
(cherry picked from commit 6592e0f5b9)
 2015-07-22 10:39:04 +02:00
artica bc6ad60373 Auto-updated build strings. 2015-07-22 00:02:25 +02:00
mdtrooper cca0c552a8 Fixed the availability item report. TICKET: #2423 2015-07-21 18:59:11 +02:00
mdtrooper 6629d0fe1c Added feature. The report items SLA, Availaibily and General do not show the not init modules. TICKET: #2510 2015-07-21 13:17:02 +02:00
mdtrooper a64f1eda1d Added function 'modules_is_not_init' 
(cherry picked from commit a8162a1876)
 2015-07-21 13:11:44 +02:00
Arturo Gonzalez Diaz 681139e2d3 Now is not possible create two recon task with the same name. Ticket #2179 2015-07-21 13:08:19 +02:00
mdtrooper 706971f763 Added a filter 'normal & critical' in severity into events. 
(cherry picked from commit f1ada9076e)

Conflicts:
	pandora_console/godmode/events/event_edit_filter.php
	pandora_console/include/constants.php
 2015-07-21 10:48:29 +02:00
Arturo Gonzalez Diaz 2aafc7a53e Permissions in recontask changed. Ticket #2179 2015-07-21 09:38:49 +02:00
artica 0460e01188 Auto-updated build strings. 2015-07-21 00:01:33 +02:00
Arturo Gonzalez Diaz 3744e0ea6f Now always show the number of monitors in monitor detail. Ticker #2463 2015-07-20 10:53:24 +02:00
artica 30728f04ec Auto-updated build strings. 2015-07-20 00:01:30 +02:00
artica 8eef10d85b Auto-updated build strings. 2015-07-19 00:01:31 +02:00
artica 39a0c14ea1 Auto-updated build strings. 2015-07-18 00:01:33 +02:00
mdtrooper 6aa2d6c66c Fixed the general report in metaconsole with some agents disabled. 2015-07-17 17:26:37 +02:00
m-lopez-f aeedcd0ec3 Fixed heigth in pure view when see a services map. Tiquet: #2470 2015-07-17 10:04:40 +02:00
artica 902dd189d5 Auto-updated build strings. 2015-07-17 00:02:00 +02:00
Alejandro Gallardo Escobar f01c021b14 Fixed an error in the function 'planned_downtimes_stop' 2015-07-16 15:51:05 +02:00
Alejandro Gallardo Escobar 46cd0b4ca0 Minor visual change 2015-07-16 15:50:53 +02:00
Alejandro Gallardo Escobar 8f3973d934 Added some useful functions from the 6.0 version 2015-07-16 15:38:15 +02:00
Alejandro Gallardo Escobar daedfa6a21 Fixed some general and ACL errors and improved some pieces of code 
Downtime editor.
Some of the ACL checks added are:
-Permission check on downtime before adding an agent
-Permission check on agent before adding an agent
-Permission check on downtime before deleting an agent
-Permission check on agent before deleting an agent
-Permission check on downtime before creating or updating the downtime
-Removed the ACL check for every result item (it is done before, into the query)
-Permission check on the query for the agents added to the downtime

Downtime editor ajax.
Some of the ACL checks added are:
-Permission check on downtime before retrieving the modules
-Permission check on agent before retrieving the modules
-Permission check on downtime before deleting the modules
-Permission check on agent before deleting the modules
-Permission check on downtime before adding the modules
-Permission check on agent before adding the modules
(cherry picked from commit 4d43033d46)

Conflicts resolved:
	pandora_console/include/ajax/planned_downtime.ajax.php
 2015-07-16 15:30:21 +02:00
Alejandro Gallardo Escobar c7aabdb6f1 Fixed syntax and ACL errors and improved some pieces of code 
Some of the ACL checks added are:
-Permission check before stopping.
-Running check before deleting.
-Permission check before deleting.
-Permission check before adding specific table columns.
(cherry picked from commit 95d0794ae0)
 2015-07-16 15:28:50 +02:00
Alejandro Gallardo Escobar 433fa3eaef Added a function to stop a planned downtime (once type) and recover the agent and modules status 
(cherry picked from commit e8d68739b7)
 2015-07-16 15:28:28 +02:00
Alejandro Gallardo Escobar 245b88d103 Minos changes and improvements 
(cherry picked from commit 970be457d6)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.export_csv.php
 2015-07-16 15:27:48 +02:00
Arturo Gonzalez Diaz 019f203213 Planned downtime editor changed. Ticket #2404 
(cherry picked from commit 52619f4e7c)
 2015-07-16 15:26:51 +02:00
Arturo Gonzalez Diaz 49ad7477c3 Planned downtime list and edit changed. Ticket #2404 
(cherry picked from commit 12334a3cd1)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.editor.php
 2015-07-16 15:26:11 +02:00
Arturo Gonzalez Diaz f654d6567b Planned downtime export csv changed. Ticket #2404 
(cherry picked from commit ca1c6c0bf2)
 2015-07-16 15:18:10 +02:00
Arturo Gonzalez Diaz 492dc420f8 Planned downtime list changed. Ticket #2404 
(cherry picked from commit 595ffe8f5c)
 2015-07-16 15:17:57 +02:00
Arturo Gonzalez Diaz 14e785a689 Change permissions to a non-privilege user in planned-downtimes-acl Ticket #2404 
(cherry picked from commit 8906e050ae)
 2015-07-16 15:17:20 +02:00
Arturo Gonzalez Diaz 88a53868aa Acces to non-privilege user to planned downtime 
(cherry picked from commit bbbddf2fff)

Conflicts resolved:
	pandora_console/godmode/agentes/planned_downtime.list.php
 2015-07-16 15:16:40 +02:00
artica 8115724e60 Auto-updated build strings. 2015-07-16 00:01:44 +02:00
fbsanchez 30afa2a135 PandoraAgentWindows: Added latest scripts & configuration 2015-07-15 18:16:48 +02:00
m-lopez-f 9c64dfdc5a Add more width to field for separate selct to botton. Tiquet: #2445 2015-07-15 15:25:30 +02:00
m-lopez-f c4a598890a Fixed problems with user edit when change language,see all fields in home screen. Tiquet: #2448 
(cherry picked from commit bc54629604)
 2015-07-15 15:09:39 +02:00