tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-20 09:18:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
36,825 Commits 34 Branches 30 Tags
Commit Graph

6083 Commits

Author SHA1 Message Date
artica
b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Jose Gonzalez
4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Daniel Rodriguez
a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop' 
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
 2021-03-22 12:39:59 +00:00
artica
49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica
2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica
db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica
3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
Daniel Rodriguez
3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
Jose Gonzalez
9e54f9517b WIP: Backup upload 2021-03-18 16:12:39 +01:00
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
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
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
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
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
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
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
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
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