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

5654 Commits

Author SHA1 Message Date
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop' 
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
 2021-03-18 09:56:31 +00:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
fbsanchez 71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle 
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2021-03-17 10:11:58 +01:00
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00
Daniel Rodriguez 8715cbceaf Merge branch 'ent-6984-server-log-permissions' into 'develop' 
adding permissions to apache group

See merge request artica/pandorafms!3877
 2021-03-16 16:39:48 +00:00
fbsanchez c67e5f9846 hrStorageAllocationUnits fixed ref. snmp_remote.pl 2021-03-16 10:14:28 +01:00
Daniel Rodriguez cb6bb195b5 Merge branch 'ent-5700-traza-ejecucion-pandora-db-tgraph-source' into 'develop' 
Added log on deleting tgraph_source data in pandora_db

See merge request artica/pandorafms!3721
 2021-03-16 09:13:00 +00:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Daniel Rodriguez d0234314a0 Merge branch 'ent-6052-revision-parametros-binario-server' into 'develop' 
Solved issue with verbosity parameters

Closes pandora_enterprise#6052

See merge request artica/pandorafms!3790
 2021-03-12 09:11:53 +00:00
artica d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González d79d1a1262 Merge branch 'develop' into 'ent-6052-revision-parametros-binario-server' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-11 08:16:50 +00:00
artica 74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Jose Gonzalez d86bfa8e7a Updated 2021-03-10 14:00:29 +01:00
Jose Gonzalez 2d4577b23b Cleaned -v and -q options 2021-03-10 13:58:56 +01:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
artica e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
rafael.ameijeiras ab68bcf1d6 adding permissions to apache group 2021-03-04 12:13:16 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
artica 442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
Daniel Rodriguez f9faac8abd Merge branch 'ent-6710-instalacion-desatendida-agente-windows' into 'develop' 
Fixed issue

Closes pandora_enterprise#6710

See merge request artica/pandorafms!3871
 2021-03-02 12:18:48 +00:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
artica 19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
artica 0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica 0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica 814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
Jose Gonzalez 08cc259f07 Fixed issue 2021-02-26 14:24:44 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
artica 0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
fbsanchez aca9814e0f uniqid pandora_snmp_bandwidth 2021-02-15 19:10:49 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
artica 2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica 2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica 3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
Luis 0469c3c9a8 Pandora sendmail control write all data in socket 2021-02-12 15:30:44 +01:00
fbsanchez 24ed77b5a1 Pandora bandwidth server plugin 2021-02-12 15:25:41 +01:00
artica 768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica 16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00
fbsanchez 7017c6136e Avoid events while ceasing alerts 2021-02-10 10:21:39 +01:00
artica 40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica 0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
Kevin 0a432e574b Done right 2021-02-05 13:23:45 +01:00
Kevin cc9bf057f4 fixed slip-up 2021-02-05 13:20:56 +01:00
Kevin b657138fad Changed exit code so error modules are created 2021-02-05 13:07:54 +01:00
Daniel Rodriguez 1416135d86 Merge branch 'ent-5986-fallo-use_xml_timestamp-a-0' into 'develop' 
Fix the description of use_xml_timestamp.

See merge request artica/pandorafms!3817
 2021-02-05 10:00:23 +01:00
artica fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
Jose Gonzalez 4978ac3081 Fix issue 2021-02-04 16:41:47 +01:00
Ramon Novoa bf618cbb72 Fix the description of use_xml_timestamp. 2021-02-04 13:34:59 +01:00
artica 778b3762a2 Auto-updated build strings. 2021-02-04 01:00:25 +01:00
Daniel Rodriguez 6dee7a68db Merge branch 'ent-7001-open-modulos-host-latency-no-reportan-datos' into 'develop' 
Fixed latency modules

See merge request artica/pandorafms!3813
 2021-02-03 17:09:03 +01:00
artica 7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
fbsanchez cae68eac35 Fixed latency modules 2021-02-02 12:27:01 +01:00
artica ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
fbsanchez f4768b44fc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-02-01 15:38:19 +01:00
fbsanchez 712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
Daniel Rodriguez 897064183c Merge branch 'ent-fix-multi-byte-chars-treatment' into 'develop' 
Fixed garbled characters with multi-byte characters.

See merge request artica/pandorafms!3802
 2021-02-01 12:18:19 +01:00
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
fbsanchez 279bd5456d Disabled compactdb while running in historical database 2021-01-29 10:25:14 +01:00
artica 750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
Junichi Satoh a88a563b45 Fixed garbled characters with multi-byte characters. 2021-01-28 10:49:54 +09:00
artica ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
Daniel Rodriguez 6063c4f50b Merge branch 'ent-6091-Suprimir-corregir-logs' into 'develop' 
Solved issue

Closes pandora_enterprise#6091

See merge request artica/pandorafms!3786
 2021-01-25 12:15:16 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop' 
several fixes in netscan custom

See merge request artica/pandorafms!3736
 2021-01-25 09:50:27 +01:00
Daniel Rodriguez 619574269b Merge branch 'ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos' into 'develop' 
Fix capitalization issues in wmi windows env

See merge request artica/pandorafms!3677
 2021-01-25 09:28:44 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
Jose Gonzalez 5283771e32 Solved issue with verbosity parameters 2021-01-21 13:33:14 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
Jose Gonzalez a5d39365f8 Added feature for fix discovery tasks with server down 2021-01-20 17:56:39 +01:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
Jose Gonzalez c760a937ae Solved issue 2021-01-19 16:10:46 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
fbsanchez 6f228fa2dd Merge remote-tracking branch 'origin/develop' into ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos 2021-01-18 10:52:06 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 79d6c8fb59 Merge branch 'ent-6670-POST-Prioridad-incorrecta-en-el-contenido-de-las-alertas-SNMP' into 'develop' 
changed action/alert priority of fields for snmp alerts

See merge request artica/pandorafms!3595
 2021-01-11 18:09:58 +01:00
Daniel Rodriguez d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop' 
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
 2021-01-11 09:30:56 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez 1f7a68cacc Added group_password to print_agent 2021-01-07 16:37:13 +01:00
fbsanchez 3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-01-07 10:59:02 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop' 
added additional check for token

See merge request artica/pandorafms!3757
 2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es 84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' 
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
 2021-01-05 13:43:42 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez 60f43dadb9 Merge branch 'ent-6719-mensaje-error-server-open' into 'develop' 
Fix error

Closes pandora_enterprise#6719

See merge request artica/pandorafms!3623
 2020-12-23 17:05:38 +01:00
Daniel Rodriguez 1324725263 Merge branch 'ent-6856-Warning-feo-server' into 'develop' 
Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
 2020-12-23 16:06:24 +01:00
Daniel Rodriguez ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop' 
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
 2020-12-23 16:04:53 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00