eb17b01adc
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 357f606489e6328157f6090484f0141914bbc482
2019-04-03 10:30:15 +02:00
0dca571e2d
Visual Console Refactor: minor fix
...
Former-commit-id: aaa840b7145ff0a449ab31f850095ca5574761e1
2019-04-03 10:28:41 +02:00
b7ed6f9a7b
Visual Console Refactor: refactores the SimpleValue model and added value retrieval
...
Former-commit-id: 97ef5c92852b8fc5fd7f71e960f947d22222abcd
2019-04-03 10:28:07 +02:00
8e89f07961
Visual Console Refactor: changed some functions from instance to static
...
Former-commit-id: 64fdb9086b5028570fea02de1bbe5e8c22e45c08
2019-04-03 10:27:22 +02:00
db30a8650e
Added visual_console_view
...
Former-commit-id: a121bb8ee6fe338561fcf7efda289727e1ba7afe
2019-04-03 10:08:01 +02:00
2bcc05806a
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: 770dec9dd08f8c6cb526c38b35d52a7b825e9b62
2019-04-03 10:05:59 +02:00
1dcdc1bc79
Added alias to windows configuration file
...
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
2019-04-03 09:53:17 +02:00
30e9b67062
Auto-updated build strings.
...
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
2019-04-03 00:01:33 +02:00
11d8edd88b
RHEL specs and build orders (update version)
...
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
2019-04-02 18:04:33 +02:00
5670157e06
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
...
Former-commit-id: a97cbb6723fb51b583c98af381bfd92f1a1413f2
2019-04-02 17:26:27 +02:00
a0a250bef7
fixed error add ff_type
...
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
2019-04-02 16:45:01 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
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
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
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
89bbbd2893
Revert "fixed IPAM config"
...
This reverts commit 1fe1beb930
2019-04-02 14:06:05 +02:00
2a2e8e39dd
Visual Console Refactor: added the percentile item to the client
...
Former-commit-id: d0467ed40d4013ca7fb080c9b135a9af95e8040e
2019-04-02 13:29:16 +02:00
80f4f8f381
Visual Console Refactor: minor change
...
Former-commit-id: 2380785b00bc6f400e147d782b2713819d9aa97f
2019-04-02 13:28:54 +02:00
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
6c53833484
Visual Console Refactor: changed the visibility of a pair of functions
...
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
2019-04-02 13:00:03 +02:00
7af141258e
Add a missing configuration option.
...
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
2019-04-02 10:30:53 +02:00
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
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
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
f67c3d5fc0
Auto-updated build strings.
...
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
2019-04-02 00:01:31 +02:00
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
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
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
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
07e464d52b
Merge branch 'develop' into visual-console-refactor
...
Former-commit-id: c986c2d40359b2d35808037b857ae931becf7e91
2019-04-01 16:04:20 +02:00
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
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
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +02:00
be0f96b5f0
add ff_type Windows agent
...
Former-commit-id: d167449fe305d6a013eb2b2e22ec48a58af1e346
2019-04-01 12:52:09 +02:00
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
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
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
5ca01b0294
add ff_type linux agent
...
Former-commit-id: 0e903a7e304c5a2ea4dcf8570e45663524777748
2019-04-01 10:27:24 +02:00
ebbd131941
Visual Console Client: Upgraded the dependencies
...
Former-commit-id: cec7459402c6f3f6558c8a64918ad377ca0ea8f3
2019-04-01 09:56:33 +02:00
2d26a74f9e
Auto-updated build strings.
...
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
69df187ae5
Auto-updated build strings.
...
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
4fd3aa3a51
Avoid to execute non cron complianced modules on creation
...
Former-commit-id: edfb13175ca00bc5aee99609c0eec30e06d5936e
2019-03-29 15:06:26 +01:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
8be5cc6a38
Visual Console Item: removed some warning messages
...
Former-commit-id: e498e29eda0f790669a3343265c7b923773482b0
2019-03-29 11:57:14 +01:00
470d0b71d1
Visual Console Refactor: finished the label support
...
Former-commit-id: d09e3ac1a35722d6531817e5c935e4b582a5e0eb
2019-03-29 11:54:01 +01:00
05ce178854
Fixed week day cron in server
...
Former-commit-id: cfbd3601904c85fa1112eaf0f2310edb53f9afe8
2019-03-29 11:51:51 +01:00
4893c78f77
Added the label and colorcloud classes
...
Former-commit-id: 5a68272b63169f7d36520b3d4cdead28b26209d3
2019-03-29 11:49:40 +01:00
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
Alejandro Gallardo Escobar
Daniel Maya
fermin831
artica
fbsanchez
Daniel Barbero Martin
manuel
Alejandro Fraguas
Ramon Novoa
Daniel Rodriguez
Luis Calvo
Alejandro Gallardo Escobar