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

959 Commits

Author SHA1 Message Date
fbsanchez
582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Barbero Martin
c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
Daniel Rodriguez
c47c5e34f6 Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop' 
set deployment_timeout per agent installation file

See merge request artica/pandorafms!4516
 2021-11-18 16:34:12 +00:00
fbsanchez
9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
fbsanchez
a96d5d68e3 MR updates for NCMv2 2021-11-10 17:13:17 +01:00
Daniel Barbero Martin
900a37ad5d Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 2021-11-08 08:54:41 +01:00
Daniel Barbero Martin
ea747f25f3 Fix mr pandoradb migrate 2021-11-05 12:29:34 +01:00
Daniel Barbero Martin
c3f4addb0e wip special days alerts 2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
25268ec9b4 color 2021-11-02 17:49:45 +01:00
fbsanchez
08d4323941 set deployment_timeout per agent installation file 2021-11-02 17:37:47 +01:00
fbsanchez
a5bf72cca0 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Tools.pm
 2021-10-26 14:21:40 +02:00
fbsanchez
5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez
bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
fbsanchez
6c0e2d23de updates 2021-10-15 13:39:23 +02:00
fbsanchez
75949691f3 fix mr 2021-10-14 21:22:21 +02:00
fbsanchez
6a537e58f4 Fix 2021-10-14 21:09:14 +02:00
fbsanchez
79174d512d Added tncm_vendor and model to manage targetrs 2021-10-14 20:44:05 +02:00
fbsanchez
96250dcfa0 WIP NCM 2021-10-13 22:47:31 +02:00
Daniel Maya
e986005cc0 #8090 Added auto_adjust in tlayout_template 2021-10-13 17:23:34 +02:00
fbsanchez
d2f5a04583 WIP NCM 2021-10-11 20:42:43 +02:00
fbsanchez
ef42348807 compat mysql 5.1 exceeded key 2021-10-08 16:02:06 +02:00
fbsanchez
fa35e6054c Fixes 2021-10-08 15:30:17 +02:00
fbsanchez
1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
fbsanchez
6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
fbsanchez
b8dc85a0dd wip 2021-10-05 16:42:24 +02:00
fbsanchez
31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
fbsanchez
e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
fbsanchez
be95b5ffd0 updates 2021-10-01 13:56:21 +02:00
fbsanchez
e237d7dd07 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/mr/50.sql
 2021-09-30 12:24:19 +02:00
fbsanchez
18b1a1e14e Schema update to avoid using JSON columns until internal CICD is updated 2021-09-30 11:18:13 +02:00
fbsanchez
696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
alejandro.campos@artica.es
fc6fb36293 Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-29 13:29:20 +02:00
fbsanchez
15c2bdf17b WIP NCM 2021-09-28 18:53:22 +02:00
alejandro.campos@artica.es
9e0729574e Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports 2021-09-24 11:40:25 +02:00
fbsanchez
12ddb4d792 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql
 2021-09-23 16:23:38 +02:00
Alejandro Campos
ca46285a0e Merge branch 'develop' into 'ent-3407-Informes-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/50.sql
 2021-09-23 13:33:02 +00:00
alejandro.campos@artica.es
fc959f0bc6 created report for ipam networks 2021-09-21 15:59:14 +02:00
Daniel Maya
10f1894b82 #7982 Added id_template_fields and id_template_conditions 2021-09-10 09:46:00 +02:00
fbsanchez
f0791cbd4f WIP CorrelationServer 2021-08-27 15:07:14 +02:00
alejandro.campos@artica.es
54ae7e5783 modified availability report 2021-08-16 09:43:11 +02:00
Alejandro Campos
ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
José González
ebc4df2080 Changes in debug_content db field 2021-07-22 15:20:06 +02:00
fbsanchez
0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +02:00
fbsanchez
9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +02:00
Daniel Maya
a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
fbsanchez
f52d389327 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-05 09:55:14 +02:00
vgilc
159920a05d Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop' 
Add the AlertServer to the repo.

See merge request artica/pandorafms!4251
 2021-07-02 09:15:27 +00:00
Ramon Novoa
f8bcd1660f Add the AlertServer to the repo. 
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
 2021-07-01 16:19:47 +02:00
fbsanchez
074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00