tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
20,366 Commits 34 Branches 30 Tags
Commit Graph

20366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Rodriguez
25960e65ba Merge branch 'ent-3320-7151-parametros-instalacion-destendida-windows' into 'develop' 
Added alias to windows configuration file

See merge request artica/pandorafms!2329

Former-commit-id: 04f3fb87c82d248a6caa197464893aab2973531c
 2019-04-03 17:07:45 +02:00
Daniel Maya
8923c53ec4 Fixed problem with fixed header 
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
 2019-04-03 16:48:28 +02:00
Alejandro Fraguas
54f6f595dd Merge branch 'ent-3824-7869-Mapas-GIS-no-funcionan' into 'develop' 
Fixed problem with openlayer

See merge request artica/pandorafms!2330

Former-commit-id: 639deee6b66cf43894f4eb093d590d699bb9d37c
 2019-04-03 16:02:45 +02:00
Daniel Rodriguez
ccf0192547 Merge branch 'ent-3731-Bug_en_reports_SLA_mensual' into 'develop' 
fixed SLA weekly hourly and monthly

See merge request artica/pandorafms!2271

Former-commit-id: 1335616814937252d57028905596ec3083d2464f
 2019-04-03 14:23:22 +02:00
Daniel Rodriguez
8f369828c4 Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop' 
RHEL specs and build orders (update version)

See merge request artica/pandorafms!2327

Former-commit-id: 8d6acaab90efec5cec698272e98f76ebc40b39df
 2019-04-03 13:11:25 +02:00
Daniel Maya
faecabb1cc Fixed problem with openlayer 
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
 2019-04-03 12:54:36 +02:00
Alejandro Fraguas
dcd5ab6317 Merge branch '3787-agents_get_agents' into 'develop' 
rollback agent_get_agents

See merge request artica/pandorafms!2309

Former-commit-id: 7badea15471fa3d7aae787f913c76c8da70472cc
 2019-04-03 12:04:52 +02:00
fermin831
e642907215 Merge remote-tracking branch 'origin/develop' into ent-3791-7780-cron-en-modulos-no-funcionan-bien 
Former-commit-id: 46844dc1e44569be828ae90bfb22c669d4eb352a
 2019-04-03 12:00:48 +02:00
Alejandro Fraguas
ee59f4678e Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop' 
Add a missing configuration option.

See merge request artica/pandorafms!2322

Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
 2019-04-03 10:57:26 +02:00
fermin831
1dcdc1bc79 Added alias to windows configuration file 
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
 2019-04-03 09:53:17 +02:00
artica
30e9b67062 Auto-updated build strings. 
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
 2019-04-03 00:01:33 +02:00
fbsanchez
11d8edd88b RHEL specs and build orders (update version) 
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
 2019-04-02 18:04:33 +02:00
Daniel Barbero Martin
a0a250bef7 fixed error add ff_type 
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
 2019-04-02 16:45:01 +02:00
manuel
1fd40447e1 Custom fields in availability report type 
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
 2019-04-02 16:24:29 +02:00
Daniel Barbero Martin
c679751f94 fixed error add ff_type 
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
 2019-04-02 16:01:24 +02:00
Daniel Barbero Martin
7be3d5fa58 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Former-commit-id: d0667e3686d186a79fe7525f73a770257eaaf883
 2019-04-02 15:39:32 +02:00
Alejandro Fraguas
490aa2ac0f Merge branch 'ent-3783-Error-date-last-contact-snmp-interfaces-view' into 'develop' 
Ent 3783 error date last contact snmp interfaces view

See merge request artica/pandorafms!2316

Former-commit-id: 6959931add69ebb7b1b43c23cd7758024c31a886
 2019-04-02 14:33:14 +02:00
daniel
b50901bfd3 Merge branch 'revert-39b80d2c' into 'develop' 
Revert "fixed IPAM config"

See merge request artica/pandorafms!2323

Former-commit-id: 00caaac9361782698f23ae47aad9740927045b0e
 2019-04-02 14:10:00 +02:00
daniel
89bbbd2893 Revert "fixed IPAM config" 
This reverts commit 1fe1beb930337770170bce177105020bdb3c06bb [formerly 39b80d2ca41c21a823cdec5948e30109a81eeb2a]

Former-commit-id: e11aec8e300db083b7ce04cb74d19de276e69eb7
 2019-04-02 14:06:05 +02:00
Ramon Novoa
7af141258e Add a missing configuration option. 
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
 2019-04-02 10:30:53 +02:00
daniel
431c807f61 Merge branch 'develop' into 'ent-3445-Solucionar_problematica_flip_flop' 
# Conflicts:
#   pandora_console/extras/mr/27.sql

Former-commit-id: 4fcd03764bf959fb6b126df48e20bc29327105b2
 2019-04-02 10:21:04 +02:00
Alejandro Fraguas
2461f826ce Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop' 
fixed IPAM config

See merge request artica/pandorafms!2274

Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c
 2019-04-02 09:41:02 +02:00
Fermin
4957bd763a Merge branch 'ent-3791-7780-cron-en-modulos-no-funcionan-bien' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3791-7780-cron-en-modulos-no-funcionan-bien 
Former-commit-id: e9a9619b767208a7249e44a1fb98623f2ff93c11
 2019-04-02 09:04:34 +02:00
artica
f67c3d5fc0 Auto-updated build strings. 
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
 2019-04-02 00:01:31 +02:00
Daniel Rodriguez
ee6d8642f3 Merge branch 'ent-3805-nombre-agente-guarda-sin-guion' into 'develop' 
Fix agent name input to allow '-'

See merge request artica/pandorafms!2319

Former-commit-id: 9496fa004ee36b8d09c875a77cf3f19bec45a130
 2019-04-01 18:49:11 +02:00
Daniel Rodriguez
6733182b5d Merge branch 'ent-3757-Errores-en-diagnostic-info' into 'develop' 
Fixed errors in Diagnostic tool

See merge request artica/pandorafms!2292

Former-commit-id: 62fafd92e852c65136c50a3c0ff6d80a3edf72b8
 2019-04-01 18:39:12 +02:00
Daniel Rodriguez
2afc16c8dc Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop' 
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf

See merge request artica/pandorafms!2272

Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
 2019-04-01 17:51:37 +02:00
Luis Calvo
343c6a6edf Fix agent name input to allow '-' 
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
 2019-04-01 15:18:56 +02:00
Luis Calvo
c07319fb70 Insert zero into fires_min an fires_max when null 
Former-commit-id: de1197159053155d4f962d74179933c46189460e
 2019-04-01 12:56:10 +02:00
Daniel Barbero Martin
be0f96b5f0 add ff_type Windows agent 
Former-commit-id: d167449fe305d6a013eb2b2e22ec48a58af1e346
 2019-04-01 12:52:09 +02:00
Luis Calvo
ad80b5b562 Merge remote-tracking branch 'origin/develop' into ent-3783-Error-date-last-contact-snmp-interfaces-view 
Former-commit-id: 9c82f920608289d3f4fb49d4295c6356b7551f56
 2019-04-01 10:36:27 +02:00
Daniel Barbero Martin
5ca01b0294 add ff_type linux agent 
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
 2019-04-01 10:27:24 +02:00
artica
2d26a74f9e Auto-updated build strings. 
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
 2019-03-31 00:01:22 +01:00
artica
69df187ae5 Auto-updated build strings. 
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
 2019-03-30 00:01:27 +01:00
Fermin
4fd3aa3a51 Avoid to execute non cron complianced modules on creation 
Former-commit-id: edfb13175ca00bc5aee99609c0eec30e06d5936e
 2019-03-29 15:06:26 +01:00
Daniel Barbero
b2e16848f9 add new ff type 
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
 2019-03-29 14:59:31 +01:00
Luis Calvo
59300bd757 Changed field for last contact to timestamp 
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
 2019-03-29 13:24:22 +01:00
Fermin
05ce178854 Fixed week day cron in server 
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
 2019-03-29 11:51:51 +01:00
artica
2a96b610d9 Auto-updated build strings. 
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
 2019-03-29 00:01:24 +01:00
Daniel Barbero Martin
33197df731 add new functionality flipflop 
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
 2019-03-28 17:33:49 +01:00
fbsanchez
783417cab5 rollback agent_get_agents 
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
 2019-03-28 12:20:15 +01:00
Daniel Barbero Martin
e3222626dc fixed error in bbdd 
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
 2019-03-28 09:49:16 +01:00
Daniel Barbero Martin
626aacbf43 Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop 
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
 2019-03-28 08:49:08 +01:00
artica
98a9c62de9 Auto-updated build strings. 
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
 2019-03-28 00:01:30 +01:00
fbsanchez
1299d6c7d6 Merge branch 'fix/netmap' into 'develop' 
minor fix

See merge request artica/pandorafms!2307

Former-commit-id: cd6071765c1e9be5d05ed7283f0a49146ac46cb7
 2019-03-27 18:34:35 +01:00
fbsanchez
086ee0620e minor fix 
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
 2019-03-27 18:31:02 +01:00
Daniel Barbero Martin
a3865a3181 flip flop keep counters 
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
 2019-03-27 18:16:53 +01:00
fbsanchez
c85a84673f Merge branch 'fix/mr26' into 'develop' 
fix mr 26

See merge request artica/pandorafms!2306

Former-commit-id: d90f41df35dfbe7655af56648ca40ec9e9b3cc43
 2019-03-27 17:57:24 +01:00
fbsanchez
128a97d254 fix mr 26 
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
 2019-03-27 17:38:08 +01:00
fbsanchez
0f30633094 Merge branch 'fix/mr' into 'develop' 
minor fix

See merge request artica/pandorafms!2304

Former-commit-id: f24ca3e2617a696adb9de32ad5fd1bd5f5b14111
 2019-03-27 17:27:39 +01:00