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

571 Commits

Author SHA1 Message Date
Ramon Novoa d740b32810 Add support for DESTDIR. 
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
 2019-03-26 11:47:20 +01:00
samucarc 00eb2766a9 Fixed labels in automatic combined graphs 
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
 2019-03-05 18:06:50 +01:00
Fermin 942b160a3d Use multiples in network explorer table 
Former-commit-id: 2aec7e59e4ea46c693f5fe89c847f524cd882f63
 2019-03-05 08:03:18 +01:00
samucarc 7d88af625e Added module units in module graphs 
Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813
 2019-03-04 15:53:47 +01:00
fbsanchez e397353f71 minor fix get_parameter_switch 
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
 2019-02-15 14:03:16 +01:00
fbsanchez efdc17b801 WIP: H&D 
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
 2019-02-15 13:08:44 +01:00
fbsanchez f4c22d2250 added extra arguments to get_snmpwalk 
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
 2019-02-07 13:01:21 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
daniel 61c9603ae8 Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan 
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
 2019-01-25 09:55:09 +01:00
fermin831 072ad0a1ea Add return value to generate_hash_to_api function 
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
 2019-01-24 13:38:13 +01:00
daniel dc2b738776 IPAM supernet 
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
 2019-01-21 09:24:00 +01:00
daniel 1c8d846574 WIP IPAM Supernet 
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
 2019-01-17 15:49:41 +01:00
fermin831 9531065dbe Merge branch 'develop' into ent-2753-meter-profiler-en-el-docker 
Former-commit-id: da01f6f0f7f223755a6c2a72cadafac075b6a3c0
 2018-12-20 18:17:57 +01:00
daniel 807f7a0b74 fixed minor error 
Former-commit-id: e855d814160365c0b6f53d15ea40b3c1bed16890
 2018-12-13 17:24:01 +01:00
daniel a76895f20e fixed error metaconsole template send template 
Former-commit-id: 2b92b353a4811d6aec22e2a61c128cc24b01ba14
 2018-12-13 12:47:22 +01:00
daniel 07f5455e28 fixed errors in cron jobs 
Former-commit-id: 6926e6cca21cb43d4c08ed0c4c48ae344abe8fab
 2018-12-12 10:46:28 +01:00
fbsanchez c728cb1412 fixed related changes in phantomjs interface 2018-11-29 17:26:41 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
fermin831 06830c9f69 Added profiller to docker 2018-11-13 12:55:25 +01:00
manuel.montes df8c5e8bf9 Fixed bug in deleted policies 2018-11-06 13:52:03 +01:00
Ramon Novoa 6353af0482 Merge remote-tracking branch 'github/develop' into develop 2018-10-29 13:20:48 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
vgilc aabd5435d0 Merge branch '2535-Macro-para-unidad-informes' into 'develop' 
Added unit in label graphs

See merge request artica/pandorafms!1874
 2018-10-25 13:12:26 +02:00
manuel.montes 972f4b1e89 Added unit in label graphs 2018-10-19 14:03:15 +02:00
Ramón Novoa 3e584747b3
Merge pull request #104 from sofwerx/https-proxy 
Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running()
 2018-10-11 09:34:26 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
manuel.montes d0e7b86112 Fixed bug in deleted policies from the metaconsole 2018-09-18 09:41:05 +02:00
fermin831 764b1125bd Generate session csrf code to avoid attacks in user edition 2018-09-13 15:19:08 +02:00
daniel f117d1af43 fixed heigth charts for reports 2018-09-11 09:33:24 +02:00
Alejandro Gallardo Escobar 21bad5330b Bug fix 2018-09-04 17:24:03 +02:00
fbsanchez ae6d7139b4 is_management_allowed fix 2018-07-24 18:24:03 +02:00
fbsanchez 581cf7c5a0 Added management_allowed 2018-07-24 17:55:33 +02:00
fermin831 001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
daniel 23ef9c8f53 Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola 2018-07-12 14:49:59 +02:00
daniel fce669ae21 fixed minor errors in legend charts 2018-07-10 17:53:19 +02:00
fermin831 aaf8173b8a Added is_central_policies function 2018-07-10 17:49:46 +02:00
Alejandro Gallardo Escobar de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
daniel 0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
daniel eaf5abd476 fixed keep alive bool type module 100 2018-06-25 15:35:12 +02:00
daniel aa4f13d17a fixed errors in graphs 2018-06-20 11:31:43 +02:00
fbsanchez 73567f1859 Trying to adjust graph render sizes 2018-06-19 19:19:38 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
danielmaya 9bff4f28f4 Fixed graph with https 2018-06-19 15:00:39 +02:00
daniel 7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
daniel 9e229e6228 fixed minor errors 2018-06-14 18:14:54 +02:00
daniel 80ddcbe1b6 fixed security error phantomjs 2018-06-14 16:47:23 +02:00
daniel 46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel 25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel 2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
vgilc 24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop' 
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
 2018-06-12 12:13:46 +02:00
daniel 6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel abad4f4f4b fixed minor errorstime graphs 2018-06-11 15:35:04 +02:00
daniel adf9e4d1fe fixed minor errors 2018-06-11 13:53:10 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel 7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
daniel d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
daniel 89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
Junichi Satoh 5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
Alejandro Gallardo Escobar 37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
fermin831 614db8b523 [Rebranding] Added product name and copyright notice to setup 2018-05-09 11:49:12 +02:00
fermin831 57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
Alejandro Gallardo Escobar f1985313ab The audit view and csv now use the user defined timezone 2018-05-07 16:10:31 +02:00
daniel 30dc841bae custom graph 2018-04-27 10:03:05 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
vgilc 778be05874 Merge branch 'ent-1902-sql-error' into 'develop' 
Elimina un error SQL al obtener noticias

See merge request artica/pandorafms!1415
 2018-04-17 16:22:44 +02:00
Alejandro Gallardo Escobar d1608400f9 Avoid the news search for users without groups 2018-04-09 17:17:01 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
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
Ian Blenke fbbc070b39 Adding a check for HTTP_X_FORWARDED_PROTO in https_is_running() 2018-02-15 09:34:24 -05: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