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

483 Commits

Author SHA1 Message Date
fermin831 d8a7ebea08 Only change the group to all grupo if neccesary when command is changed 2018-10-22 16:26:58 +02:00
fermin831 f537dbb961 Validate the group command on action creation 2018-10-22 16:19:29 +02:00
fermin831 1f299cad52 Added copy button to alert commands 2018-10-22 12:01:29 +02:00
fermin831 b50b1c9f34 Added group icon to alerts commands view 2018-10-22 10:08:25 +02:00
fermin831 8b0b23dc27 Added group to alert commands update and creation 2018-10-22 09:49:06 +02:00
daniel c3bcb84293 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 2018-10-15 08:58:55 +02:00
vgilc f3c8b14b32 Merge branch '2457-Formulario-de-creacion-repetido' into 'develop' 
added check to prevent alert creation form from being printed in alert cluster for step 5

See merge request artica/pandorafms!1854
 2018-10-15 00:06:41 +02:00
alejandro-campos aa33522670 added check to prevent alert creation form from being printed in alert cluster for step 5 2018-10-11 15:22:36 +02:00
daniel 16be9488c8 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/include/functions_graph.php
 2018-10-11 13:06:17 +02:00
vgilc edadc60957 Merge branch '2737-Optimización-de-tags-dev' into 'develop' 
2737 optimización de tags dev

See merge request artica/pandorafms!1815
 2018-10-11 12:14:10 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
alejandro-campos 7fcbc6ece9 added check whto skip alert creation table printing in cluster alert only when step is 5 2018-10-10 18:54:46 +02:00
daniel e2f7157545 fixed php7 2018-10-04 11:43:08 +02:00
tatiana.llorente@artica.es 0855d09156 Fixed a minor mistake - #2858 2018-10-03 16:46:35 +02:00
tatiana.llorente@artica.es 61a3d147af Added descriptive error messages - #2858 2018-10-03 16:41:58 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
tatiana.llorente@artica.es 2dd10a4328 Added number of times an alert is fired - #2827 2018-10-02 12:35:20 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc d5b9ddec46 Merge branch '2457-No-permite-editar-ni-eliminar-alertas-de-cluster' into 'develop' 
Added new funcionality to cluster alert configuration: update alert

See merge request artica/pandorafms!1634
 2018-09-28 10:50:44 +02:00
fermin831 13ad7b4fc7 Fixed group all alert templates visualization 2018-08-13 11:24:32 +02:00
danielmaya a9bb538e1a Fixed permissions in alert_actions 2018-08-02 12:47:42 +02:00
alejandro-campos c70475cd38 Added new funcionality to cluster alert configuration: update alert 2018-07-26 10:24:45 +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
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
fermin831 acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
fermin831 358847ecef [Rebranding] Open godmode/<others> 2018-05-10 15:43:46 +02:00
vgilc 5ee01aa70f Merge branch '2007-Monitorizacion-de-cluster-fase-2' into 'develop' 
Cluster monitoring 2 - #2007

See merge request artica/pandorafms!1378
 2018-04-20 10:31:57 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
danielmaya e4f24b2452 Fixed json in audit log 2018-04-05 16:57:26 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 db16a797f3 [Secondary Groups] Assign secondary groups by AJAX on agent edit view 2018-03-22 13:34:15 +01:00
enriquecd 8690aa908a Cluster monitoring 2 - #2007 2018-03-19 10:05:29 +01:00
danielmaya 3a3de49802 Fixed text/html option in alert action 2018-01-15 11:04:53 +01:00
vgilc 3a4ed1671b Merge branch '1410-Traducción-en-filtro-de-Alertas' into 'develop' 
Change manage alerts list enabled / disabled select text - #1410

See merge request artica/pandorafms!973
 2017-11-29 16:59:57 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
enriquecd 47c7f23208 Change manage alerts list enabled / disabled select text - #1410 2017-10-25 16:40:21 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" 
This reverts merge request !862
 2017-10-16 16:44:44 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
Daniel Maya 4bdc0df5c4 Changed agent name by alias in alerts details 2017-06-08 17:55:04 +02:00
vgilc b506e47150 Merge branch '622-fixed-qick-guide' into 'develop' 
Remove temporality links to help. And in future chenge this help

See merge request !386
 2017-05-17 17:28:46 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
vgilc b11865ccae Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop' 
Not use group filter sql if not exist filter_group data - #782

See merge request !412
 2017-04-27 16:31:45 +02:00
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
m-lopez-f fcf3da2acf Remove temporality links to help. And in future chenge this help 2017-04-20 12:10:52 +02:00
enriquecd 15749e323f Change sec param in policies section, gpolicies to gmodules / 7 / open - #562 2017-03-24 13:07:49 +01:00
Daniel Maya a1978e93b1 Inserted alias in pandora audit 2017-02-22 16:52:42 +01:00
Arturo Gonzalez 83776e46d1 Changed some texts in pandora. Ticket #347 2017-02-22 12:36:30 +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
Arturo Gonzalez 1f1023db92 Added new fields to alert macros (snmp as well). Ticket #233 2017-02-07 10:41:48 +01:00
Arturo Gonzalez 3e0b0f231b Added more fields to alert macro fields. Ticket #233 2017-02-06 16:20:39 +01:00
enriquecd 0fec55fd82 Timethreshold_alert_edition_fix - #25 2017-01-23 15:27:22 +01:00
Junichi Satoh 34f4b434c2 Set default module action threshold to 0. 2017-01-18 10:56:08 +09:00
Junichi Satoh 5ec7e1ae0f Fixed broken header of alert list. 2016-10-11 12:28:58 +09:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
daniel e48e1ddd7e ticket: 4069 add actions for defect in templates html #4069 2016-09-29 14:30:07 +02:00
enriquecd 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
m-lopez-f 581d3835db Fixed acl's permmissions. Ticket #3912 2016-09-08 16:06:12 +02:00
m-lopez-f e914b3c87c Feature to update action assignate a alert and module. Internal Ticket: #3994 2016-09-01 09:09:03 +02:00
fbsanchez 8b06931715 Ticket 3462: Provided snmp help/std help based on referer 2016-07-29 15:46:27 +02:00
Junichi Satoh 2882c320a9 Fixed wrong privileges for special days creation. 2016-07-15 16:16:17 +09:00
Junichi Satoh 73775b09dc Removed an unnecessary argument for users_can_manage_group_all(). 2016-07-12 16:46:27 +09:00
m-lopez-f 04c1304a5d Fixed help of action alerts. Tiquet: #3889 2016-06-27 13:09:23 +02:00
Daniel Maya b40f0848e0 Fixed help alert command. Ticket #3415. 2016-06-15 15:52:29 +02:00
Junichi Satoh b6164485b6 Improved special day's UI. Special days are now shown in calendar style. 
And, iCalendar(.ics) files can also be uploaded.
 2016-06-07 13:43:30 +09:00
Junichi Satoh e2ad075152 Added a new feature to the alert template. 
It allows to reset minimum number of alert when the alert status is not
continuously.
 2016-03-09 11:33:01 +09:00
m-lopez-f cfcc6b40ea Fixed view and call funtions, dont work in Oracle's DB. Tiquet: #3231 
(cherry picked from commit 64b2ad8f6b)
 2016-01-22 09:29:45 +01:00
m-lopez-f 13b480ec92 Fixed width of field in alerts template. Tiquet: #2951 
(cherry picked from commit 005da0e3e2)
 2015-11-04 11:12:51 +01:00
Arturo Gonzalez Diaz fdff5ca98b Changed alerts list table 2015-10-26 12:46:26 +01:00
Arturo Gonzalez Diaz 5fb981377d Fixed lost filter in alerts list. Ticket#2919 2015-10-26 12:21:54 +01:00
Arturo Gonzalez Diaz d3339c95c3 Fixed alert list table 2015-10-22 11:13:06 +02:00
Arturo Gonzalez Diaz 01ac115a29 Fixed alert list table 2015-10-22 10:20:48 +02:00
Arturo Gonzalez Diaz 7aed427a7a Fixed special days in oracle. Ticket#2904 2015-10-21 13:31:17 +02:00
Arturo Gonzalez Diaz 2b7c74f1d9 Changed bad help message in alert macros. Ticket#2863 2015-10-21 10:05:56 +02:00
m-lopez-f 1f99733ac8 Fixed problems with data from database when db is oracle 2015-10-19 08:32:37 +02:00
m-lopez-f 523cb7bf65 Add break to switch to last commit 2015-10-14 11:16:10 +02:00
m-lopez-f e94618db62 Fixed problems with data when database is in Oracle. Tiquet: #2864 2015-10-14 11:10:44 +02:00
m-lopez-f c4644b4a4b Fixed problems with query when have chief operation permission and show administration of alets. Tiquet: #2839 2015-10-02 11:08:22 +02:00
Arturo Gonzalez Diaz 72c5a47fcc Solved nonexistent help message in the field 1, alerts section. Ticket #2799 2015-09-23 09:11:01 +02:00
Arturo Gonzalez Diaz e9d61ab644 Fixed error in snmp alerts whit PandoraFMS event. Ticket#1592 2015-09-14 13:41:54 +02:00
m-lopez-f be7e8aa567 Change form of search data in orcle 2015-09-11 12:58:13 +02:00
m-lopez-f 0e090c27c5 Fixed list of alerts when dbengine is Oracle. Tiquet: #2699 2015-09-07 11:50:35 +02:00
Alejandro Gallardo Escobar 3c08c32482 Fixed an ajax error 2015-07-14 18:34:16 +02:00
m-lopez-f 09f6b7a29a Fixed styles metaconsole 2015-07-07 13:57:47 +02:00
mdtrooper 3498e9e1e7 Killing some unicorns and magic numbers. 2015-06-29 16:49:48 +02:00
m-lopez-f 94c742bfbe Merge from Develop 2015-06-25 10:40:35 +02:00
m-lopez-f 5b4214277b Changed of visual 2015-06-25 10:07:53 +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
m-lopez-f ff1186ee57 Changed visual of console 2015-06-16 16:09:50 +02:00
Alejandro Gallardo Escobar e5685dfe07 Fixed errors for oracle databases 2015-06-16 15:39:27 +02:00
m-lopez-f 9e528d0459 Change visual of console 2015-06-12 15:50:46 +02:00
mdtrooper 7574f6ed09 Clean the source code style. 2015-06-08 13:13:09 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper b96fdad6d8 Sanitized the project (clean code and removed the deprecated htmLaWed) 2015-06-08 09:18:00 +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
m-lopez-f 84fb973c6f Change privilege in call function to return groups of view this user. Tiquet: #2259 
(cherry picked from commit 73ae001a3f)
 2015-06-01 10:13:42 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00