Commit Graph

433 Commits

Author SHA1 Message Date
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel 74a8212032 fixed error show events 2018-02-09 14:20:49 +01:00
fbsanchez 571ed36276 Fixed image handle in data view 2018-02-08 14:17:08 +01:00
enriquecd ab24c3bf80 Merge branch 'develop' into 1571-Auditoría-del-sistema-información-de-los-cambios-4850-com1
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-02-06 10:46:59 +01:00
daniel 0d0b7ada48 Merge branch 'develop' into 1749-sistena-cache-de-acl-s-de-la-consola
Conflicts:
	pandora_console/include/functions_users.php
2018-01-30 17:56:30 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
fbsanchez 2e1ab72a21 Reapplied #1000 solution 2018-01-24 17:28:00 +01:00
daniel 955c183cd8 fixed error ip validate 2018-01-08 11:12:07 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
enriquecd afd84ce74d Change system audit log extended info to table format with change info - #1571 2017-11-24 10:59:44 +01:00
Ramon Novoa cea0f90117 Remove HTML entities from the SNMP community.
Ref. pandora_enterprise#1565.
2017-11-08 09:15:13 +01:00
Arturo Gonzalez 526f76d7d1 Added minor change to fix this issue 2017-09-20 12:08:31 +02:00
Arturo Gonzalez da763824a9 Added a minor change to test optimization 2017-09-19 10:48:30 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
Arturo Gonzalez 0e7b00f26e Added correct user and fixed db error 2017-08-28 16:38:30 +02:00
Arturo Gonzalez bab1f14a31 Added remote command execute to agent wizard 2017-08-28 12:44:51 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
vgilc c09033ae03 Merge branch '1000-Sentencia_UNION_restringida_en_informes_SQL' into 'develop'
allow UNION sql reports

See merge request !704
2017-08-18 13:01:53 +02:00
Arturo Gonzalez ea06ba213b Added registration method to reset pass 2017-08-03 13:05:57 +02:00
daniel 20fc24b99e allow UNION sql reports 2017-08-03 11:32:43 +02:00
daniel 179325447f Revert "Use session and not exec sql if already exists acl perms in session - #1017"
This reverts commit 78bb583824.
2017-07-28 12:46:17 +02:00
enriquecd 78bb583824 Use session and not exec sql if already exists acl perms in session - #1017 2017-06-28 11:31:45 +02:00
artu30 faa353bc5c Merge branch 'develop' into '635-reset-or-recover-password-in-pandora-node-and-meta-dev'
# Conflicts:
#   pandora_console/include/help/clippy/extension_cron_send_email.php
2017-05-23 09:50:22 +02:00
Arturo Gonzalez b10f1f422f Added more restrictions to user dashboard function 2017-04-20 18:02:34 +02:00
Arturo Gonzalez 87f3798499 Added dashboards to "edit my user" section 2017-04-20 17:36:26 +02:00
Arturo Gonzalez df80304a80 Move code to enterprise section 2017-04-20 11:36:40 +02:00
Arturo Gonzalez 727bd095f5 Added function to reset password in node 2017-04-20 10:59:32 +02:00
Arturo Gonzalez 4a4f52c459 Added send mail function 2017-04-19 17:29:22 +02:00
Arturo Gonzalez 48f7fa50dd Added error control and email handler 2017-04-19 16:04:24 +02:00
Arturo Gonzalez 277a3b656d Fixed mr and um mix in um online open 2017-03-24 11:22:30 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 5a612b3ab6 Added check to PNG extensions. Ticket #51 2017-03-06 15:32:24 +01:00
Junichi Satoh 023f4b1703 Fixed setcookie() usage. 2017-02-27 13:45:45 +09:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 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
Arturo Gonzalez 0e179a1725 Added "G" in srtftime format from date format. Ticket #241 2017-02-09 12:19:59 +01:00
daniel e9fc39b53b add percentil dinamic ticket: 4262 2016-12-23 09:36:44 +01:00
Junichi Satoh 85475bd6cc Fixed that exported csv file of audit log contains unnecessary data. 2016-12-08 09:35:34 +09:00
Arturo Gonzalez bba75aa166 Now non decimal numbers have all right zeros. Ticket #4254 2016-12-01 08:55:44 +01:00
Junichi Satoh 70f609b204 Fixed timestamp text corruption when language setting is Japanese. 2016-11-24 11:38:28 +09:00
m-lopez-f 3b0344298c Revert "Fixed problems with double pandora in servers. Ticket: #3557"
This reverts commit e7021d8a0f.
2016-11-18 13:01:13 +01:00
m-lopez-f 0b5d8831df Fixed problems with data in visual console. Ticket: #4181
(cherry picked from commit b8a0a542f2)
2016-11-15 10:56:20 +01:00
m-lopez-f e7021d8a0f Fixed problems with double pandora in servers. Ticket: #3557 2016-11-07 09:12:58 +01:00
m-lopez-f 287c2a7477 Feature: Translate timestick of snmps to humen readable. Ticket: #2494 2016-10-26 16:17:02 +02:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
fbsanchez 43ad1c0f55 Minor fix 2016-10-14 11:54:24 +02:00
fbsanchez 2513dea2b5 Added switch to image content
(cherry picked from commit d0a83b5021)
2016-10-14 11:44:36 +02:00
fermin831 6d2c1c126e Fixed confilcts with onlyOneGroup 2016-08-09 10:22:54 +02:00
Arturo Gonzalez 8c20874a88 Changed rolling release manager system. 2016-07-19 12:39:03 +02:00
Junichi Satoh 11aba4ce63 Removed unused argument from check_acl() and added new option(argument) for
roots up.
Fixed that users_can_manage_group_all() returns ture even if user does not
have rights to manage group all.
2016-07-15 15:37:56 +09:00
fermin831 dbde4ffc43 Added dummy and undesigned identification wizard
Conflicts:
	pandora_console/godmode/update_manager/update_manager.setup.php
	pandora_console/include/functions_config.php
	pandora_console/index.php
2016-06-16 12:59:11 +02:00
Arturo Gonzalez 0618dbbab3 Rolling release in progress... (Added minor releases) 2016-06-01 14:43:31 +02:00
mdtrooper c817d96937 Cleaned source code. 2016-01-27 15:58:54 +01:00
mdtrooper ab64f9100c Added the snmp editor for other data uses in the form wizard snmp. TICKET: #1805 2016-01-25 16:31:02 +01:00
mdtrooper 82c890410d Now the dates are showed in the locale of user. TICKET: #2487 2016-01-18 11:54:17 +01:00
mdtrooper 1242db08f8 Fixed the refresh time in the enterprise dashboard. TICKET: #3156
(cherry picked from commit b94f47f3a9)
2016-01-13 14:11:19 +01:00
Alejandro Gallardo Escobar 0b914a39c7 Added a declaration of the function 'hex2bin' for the users that has a PHP version <5.4 2015-09-22 18:10:31 +02:00
Ramon Novoa 786cf45344 Updated update manager URLs. 2015-09-22 12:55:38 +02:00
mdtrooper 63498fdbf7 Added percentile 95º in the stat win of module. TICKET: #2613 2015-08-20 17:55:10 +02:00
mdtrooper f1ada9076e Added a filter 'normal & critical' in severity into events. 2015-07-21 10:40:29 +02:00
Alejandro Gallardo Escobar f14b07014f Merge pull request #34 from pandorafms/feature/ticket#2404-planned-downtimes-acl
Ended, tested and aproved
2015-07-16 13:48:41 +01:00
Alejandro Gallardo Escobar cbd4b60aca Fixed an error in the function 'extract_column' 2015-07-16 13:27:11 +02:00
mdtrooper 85b47df1fe Fixed the xml reports with & in the values. 2015-07-16 11:48:17 +02:00
mdtrooper f3d6513c65 Added useful function 'is_metaconsole' in functions.php 2015-07-10 15:00:12 +02:00
Alejandro Gallardo Escobar 35654709d1 Added a function to extract the column or columns of an array easily 2015-07-06 11:48:15 +02:00
mdtrooper 447c4ccd6d Some fixes in the code. 2015-06-22 16:10:15 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper dac4d30e91 Some fixes in the javascript visualmap. 2015-06-16 18:45:42 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
2015-06-02 18:08:46 +02:00
Alejandro Gallardo Escobar 127f53e8c8 Added the new function "set_when_empty" 2015-06-02 18:03:39 +02:00
m-lopez-f 988228a90a Fixed problems with snmpwalks, when server have mibs text in hexadeximal-string. Tiquet: #2288
(cherry picked from commit 127daf8fdc)
2015-06-01 15:24:53 +02:00
Alejandro Gallardo Escobar 09998429b7 Modified the alert messages the system stores in the user session 2015-05-27 16:01:52 +02:00
mdtrooper 1160fd800c Fixed the 'availability' item in report. (Merge from 5d25b7c8e6) 2015-05-26 17:20:34 +02:00
Alejandro Gallardo Escobar d212fd5543 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-05-14 11:09:37 +02:00
mdtrooper 0ec32cc826 Fixed the PHP Warnings about the re-start the session.
(cherry picked from commit 1a035873dc)
2015-05-06 18:43:10 +02:00
mdtrooper 1a035873dc Fixed the PHP Warnings about the re-start the session. 2015-05-06 18:42:42 +02:00
Alejandro Gallardo Escobar 7ae97fa48b Added a new function to sort an associative array by key 2015-05-04 20:10:13 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
Alejandro Gallardo Escobar d25c32b76d Added some lost columns to check the ACL permissions 2015-04-09 15:03:26 +02:00
Alejandro Gallardo Escobar e61ecd3f73 Added the new 'tperfil' columns to the function "get_acl_column" 2015-04-06 16:54:24 +02:00
Alejandro Gallardo Escobar 91b7bf19a5 Added functions to help with the data assign to the variables 2015-03-30 17:28:12 +02:00
mdtrooper 5f57ca716b Change some code for the future fixed in PHP about the try catch in the includes. TICKET: #1791 (still open thanks PHP) 2015-03-17 16:48:52 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper 45d036acdb Merge branch 'develop' of github.com:pandorafms/pandorafms into develop 2015-02-02 14:18:32 +01:00
mdtrooper 9bed03aefd Fixed PHP warnings. 2015-02-02 14:18:05 +01:00
m-lopez-f 626a3b5527 Fixed problems with export audit log to csv when no data to show 2015-01-30 11:41:52 +01:00
m-lopez-f a240b71fb4 fixed error in mysql to login user without AR permisions 2015-01-22 15:35:40 +01:00
Alejandro Gallardo Escobar 52e6dda3b4 Merge branch 'feature/ticket#1579-TwoFactorAuthentication' into develop
Resolved conflicts:
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
	pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
	pandora_console/include/styles/pandora.css
2014-12-15 15:06:29 +01:00
Ramon Novoa d46c114fd8 Small changes to support the Z/OS extension. 2014-12-12 12:56:21 +01:00
Alejandro Gallardo Escobar 9512216ed6 Moved some functions 2014-12-11 18:19:47 +01:00
Alejandro Gallardo Escobar ebee411646 Added some lost types to the "get_event_types" function 2014-10-03 12:53:38 +02:00
mdtrooper 8c7ac00f14 2014-08-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
	include/help/clippy/godmode_agentes_modificar_agente.php,
	include/help/clippy/homepage.php,
	include/help/clippy/godmode_agentes_configurar_agente.php,
	include/javascript/intro.js,
	include/javascript/introjs.css,
	include/javascript/clippy.js,
	include/functions_ui.php,
	include/functions_clippy.php,
	index.php,
	general/header.php: first version of the new feature a annoying
	clippy such as the lovely micro$oft mascot.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-08-08 15:11:00 +00:00