f9fd0062e9
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
...
added +x permissions to build_rpm_rhel7
See merge request artica/pandorafms!2335
Former-commit-id: 2c7239c6e533866710eacf7b763586c06d0d07ea
2019-04-04 12:38:52 +02:00
a1a4ae51e2
added +x permissions to build_rpm_rhel7
...
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
2019-04-04 12:30:50 +02:00
ac0ad88e8d
Merge branch 'ent-3829-7866-no-se-ve-cabecera-si-tenemos-habilitado-token-"Fixed-header"' into 'develop'
...
Fixed problem with fixed header
See merge request artica/pandorafms!2331
Former-commit-id: 1cdcf881352c404b25cfcbc8c6b63a2c67dd05e5
2019-04-04 10:19:04 +02:00
f0c9957838
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' into 'visual-console-refactor'
...
Added the label and colorcloud classes
See merge request artica/pandorafms!2332
Former-commit-id: 4f5b051161b78eaac1261f1379c3c6f9c475d494
2019-04-04 10:18:01 +02:00
de750bb59f
Merge branch 'visual-console-refactor' into 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual'
...
# Conflicts:
# pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
# pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
# pandora_console/tests/Functional/Models/VisualConsole/Items/ColorCloudTest.php
# pandora_console/tests/Functional/Models/VisualConsole/Items/LabelTest.php
Former-commit-id: 4ef35ceb24d2cde4b3d18f92ea14ea617fcba2cd
2019-04-04 10:10:26 +02:00
f64835dca9
Auto-updated build strings.
...
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
2019-04-04 00:01:27 +02:00
1c4765f4f5
Merge branch 'ent-3688-7704-no-cambia-el-propietario-del-evento-en-event-response' into 'develop'
...
Resolved
See merge request artica/pandorafms!2251
Former-commit-id: dc092a97b35022dd846775568df9fca1e332022a
2019-04-03 18:47:52 +02:00
1f8d115130
Visual Console Refactor: finished the color cloud model
...
Former-commit-id: a8a98ba44a459044e9f262d6dc062bde64743406
2019-04-03 17:46:43 +02:00
adc0f3c21b
Visual Console Refactor: minor changes
...
Former-commit-id: a36d3901f79bb8342dc22e27946a2bb1798ce41c
2019-04-03 17:46:19 +02:00
77ab7cad40
Visual Console Refactor: improved the sorting of the the model's data
...
Former-commit-id: 3f5fb074fa0839cc207605f92b54cd2af9d16a8a
2019-04-03 17:45:56 +02:00
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
8923c53ec4
Fixed problem with fixed header
...
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
2019-04-03 16:48:28 +02:00
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
5ff1a9059a
Visual Console Refactor: added the label model
...
Former-commit-id: d1c26e023fd9c75f3ae9ab0f068e301b1e71d701
2019-04-03 15:18:29 +02:00
3df4c08782
Visual Console Refactor: error fixes
...
Former-commit-id: 01d70e83426c5eb21b2184190d6c2a39111a1c75
2019-04-03 14:46:49 +02:00
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
3afe6f8d3a
Visual Console Refactor: added the status image to the static graph item
...
Former-commit-id: 26560bf06dd8a88e8b24beed3244b030a94268b9
2019-04-03 13:19:50 +02:00
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
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
bd90bbd922
Visual Console Refactor: WIP percentile item
...
Former-commit-id: 1d852fb5dff28411aeda60431d8032e77159ea5d
2019-04-03 12:12:05 +02:00
32ba3aa1d4
Visual Console Refactor: error fix
...
Former-commit-id: f627143575317076eb9998f7e09029c3063870ca
2019-04-03 12:11:13 +02:00
24d8964fd9
Visual Console Refactor: added a system to abstract the html validation, extraction and encoding
...
Former-commit-id: d53b9fba38b1a57f2c00c627b30d6a3f2d8e64ef
2019-04-03 12:07:48 +02:00
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
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
ca4997fd7f
Visual Console Refactor: fixed the events history model
...
Former-commit-id: 9228339af7213996fb969ee631a93a3e972e102a
2019-04-03 11:40:40 +02:00
eb6757e91c
Visual Console Refactor: fixes
...
Former-commit-id: c9ae864cba26c6085e4e7390db26e32204ec7397
2019-04-03 11:25:35 +02:00
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
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
fbsanchez
Alejandro Fraguas
Daniel Maya
artica
Daniel Rodriguez
Alejandro Gallardo Escobar
fermin831
Daniel Barbero Martin
manuel
Ramon Novoa