Alejandro Gallardo Escobar
62792c078f
Visual Console Refactor: refactored the events history item to return its HTML representation
...
Former-commit-id: 8b29503a24b1877c645a3b9856d09ee2db947f99
2019-04-02 13:00:49 +02:00
Alejandro Gallardo Escobar
6c53833484
Visual Console Refactor: changed the visibility of a pair of functions
...
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
2019-04-02 13:00:03 +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
marcos.alconada
ba251e8731
Changed sql error
...
Former-commit-id: 44e44ac87e446b8ce1753a64e790a5d957938a11
2019-04-02 10:18:56 +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
Daniel Maya
92408f2ac1
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: fb37c8e84e264cd27158a481774c3712650df647
2019-04-01 16:11:49 +02:00
Daniel Maya
07e464d52b
Merge branch 'develop' into visual-console-refactor
...
Former-commit-id: c986c2d40359b2d35808037b857ae931becf7e91
2019-04-01 16:04:20 +02:00
Luis Calvo
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
Alejandro Gallardo Escobar
73a7842ac1
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' into 'visual-console-refactor'
...
created item class and test
See merge request artica/pandorafms!2277
Former-commit-id: db7ad849637af4fb2839625078b51c511a4b564f
2019-04-01 13:05:28 +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
Alejandro Gallardo Escobar
8c1076453f
Visual Console Refactor: added the events history item to the visual console container
...
Former-commit-id: 0105d2cc1a93a24e0d53df8fe057ef233d8a2843
2019-04-01 11:50:30 +02:00
marcos.alconada
ad15ed613d
changed wrong traduction from out of agents limits
...
Former-commit-id: a2b6cf49298f3c215ab73804943c61f2ab3d865d
2019-04-01 11:17:07 +02:00
Alejandro Gallardo Escobar
ae0ca5a204
Visual Console Refactor: finished the events history item and added new lib functions
...
Former-commit-id: b54534b7e5a44764622e2f99c18f4f5edc6703f6
2019-04-01 11:16:46 +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
Alejandro Gallardo Escobar
ebbd131941
Visual Console Client: Upgraded the dependencies
...
Former-commit-id: cec7459402c6f3f6558c8a64918ad377ca0ea8f3
2019-04-01 09:56:33 +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
fbsanchez
b0a6ea7415
WIP atomic JS map. Minor fix to keep working
...
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
2019-03-29 20:52:51 +01:00
fbsanchez
4854d4b2df
WIP atomic JS map
...
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
2019-03-29 20:31:55 +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
Luis Calvo
8b5744a6c1
Added unknown status image
...
Former-commit-id: 1b7da57a8f3f409902053a9e5c05edeb28b67033
2019-03-29 15:00:52 +01:00
Daniel Barbero
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
marcos.alconada
48c4eb9c01
Add changes in migrate and 27.sql file
...
Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
2019-03-29 13:58:53 +01:00
marcos.alconada
b3c7a9fb4d
change
...
Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
2019-03-29 13:38:36 +01:00
marcos.alconada
7412a7cef0
change
...
Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
2019-03-29 13:37:12 +01:00
Luis Calvo
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
Alejandro Gallardo Escobar
8be5cc6a38
Visual Console Item: removed some warning messages
...
Former-commit-id: e498e29eda0f790669a3343265c7b923773482b0
2019-03-29 11:57:14 +01:00
Alejandro Gallardo Escobar
470d0b71d1
Visual Console Refactor: finished the label support
...
Former-commit-id: d09e3ac1a35722d6531817e5c935e4b582a5e0eb
2019-03-29 11:54:01 +01:00
Fermin
05ce178854
Fixed week day cron in server
...
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
Daniel Maya
4893c78f77
Added the label and colorcloud classes
...
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
Tatiana Llorente
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
marcos.alconada
3f41561628
Added pandoradb.sql without output column in tnetflow_filter
...
Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
2019-03-29 09:23:38 +01:00
artica
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
Alejandro Gallardo Escobar
129c4ad3dd
Visual Console Refactor: WIP
...
Former-commit-id: f201bf5320f460fe1c57bd31c683a0cb7c7293b0
2019-03-28 17:59:35 +01:00
Daniel Maya
58f6fac29e
Added colorCloud and changes in clock item
...
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
2019-03-28 17:55:32 +01:00
Daniel Barbero Martin
33197df731
add new functionality flipflop
...
Former-commit-id: 00a71df0d228833dbe7211504e11418d91622d93
2019-03-28 17:33:49 +01:00
marcos.alconada
82bfd624ba
Ternary condition is added
...
Former-commit-id: 35b1b34d83ffa89fed34529a58cef6e586f086b1
2019-03-28 15:40:26 +01:00
marcos.alconada
c45d5f2f70
Ternary condition is added
...
Former-commit-id: 345cfb2ef1e211234a5fc4cc35f0faaaab3360c8
2019-03-28 15:37:52 +01:00
fbsanchez
783417cab5
rollback agent_get_agents
...
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
2019-03-28 12:20:15 +01:00
Daniel Maya
4c08987ece
Merge branch 'develop' into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
...
Former-commit-id: f235e3324cbf60afc015a870b9464b6bcf7bd89a
2019-03-28 09:52:14 +01:00
Daniel Barbero Martin
e3222626dc
fixed error in bbdd
...
Former-commit-id: dddd4fc90a4d3847c04108ba4dcdd4988872066f
2019-03-28 09:49:16 +01:00
Tatiana Llorente
1572949875
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 817d48af3803bd81f0cd3128b7b783c5b5bcc26b
2019-03-28 09:09:57 +01:00
