Daniel Barbero
|
4808e4ae97
|
fixed errors map ipam
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
|
2019-04-05 16:43:36 +02:00 |
Daniel Maya
|
61343313d3
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: de65f005e7afad749058961558702fb98e41bbd6
|
2019-04-05 14:51:47 +02:00 |
|
Daniel Maya
|
633ccc5f10
|
Update visual console view
Former-commit-id: f9d78c01055c88b2e2de62e5b14f3c17e116b155
|
2019-04-05 14:51:28 +02:00 |
Alejandro Gallardo Escobar
|
992209f5bb
|
Visual Console Refactor: added the module and custom graph model
Former-commit-id: 6756f9f4b9fb9803b7a91acb8e388d19d39a0b6f
|
2019-04-05 14:16:50 +02:00 |
|
Alejandro Gallardo Escobar
|
55b9c07d63
|
Visual Console Refactor: error fixes
Former-commit-id: 758cd06bfd322a0c409ddf512230fdc1473d54c9
|
2019-04-05 14:16:18 +02:00 |
Tatiana Llorente
|
3da2f267a2
|
New design for the tables - #3707
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
|
2019-04-05 13:51:35 +02:00 |
|
Tatiana Llorente
|
aa640efc44
|
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
|
2019-04-05 13:19:42 +02:00 |
|
Tatiana Llorente
|
d91631e0e1
|
New design for the tables - #3707
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
|
2019-04-05 13:18:38 +02:00 |
Daniel Rodriguez
|
a480e4c73f
|
Merge branch 'ent-3740-Buguillo-en-configuracion-de-ACLs' into 'develop'
ent 3740 buguillo en configuracion de ac ls
See merge request artica/pandorafms!2281
Former-commit-id: 92349a3f4e6b9820606395d06964e64cdecbba9f
|
2019-04-05 13:17:30 +02:00 |
fermin831
|
ae3c461da6
|
Fixed problems with inverse cron intervals in Windows agent
Former-commit-id: 0573c83dd346ef9076504688071d4678e554a6d5
|
2019-04-05 13:09:12 +02:00 |
|
Daniel Rodriguez
|
781a6702ad
|
Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop'
Custom fields in availability report type
See merge request artica/pandorafms!2324
Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
|
2019-04-05 13:01:09 +02:00 |
|
fermin831
|
873525726e
|
Avoid infinite loops when the day of the week in cron is out of limits
Former-commit-id: 6c0a87a29818219364fb9c08c44b48cb79dd74a8
|
2019-04-05 12:32:43 +02:00 |
|
fermin831
|
e50fb4c585
|
Fixed cron day of the week on linux agents
Former-commit-id: 2e920e1a3387d0a42dcd67eec1fbd0e0a08d998d
|
2019-04-05 12:00:43 +02:00 |
fbsanchez
|
970a10ba50
|
fixes in non agent per database
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
|
2019-04-05 10:41:37 +02:00 |
|
fbsanchez
|
db9068e25a
|
fixes in non agent per database
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
|
2019-04-05 10:41:09 +02:00 |
|
Daniel Barbero
|
447655409d
|
fixed minor error keep counters local and network components
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
|
2019-04-05 09:27:46 +02:00 |
Manuel Montes
|
6bd38c6d4c
|
Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs'
Conflicts:
pandora_console/include/functions_menu.php
Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
|
2019-04-05 08:15:48 +02:00 |
artica
|
8d0e53924d
|
Auto-updated build strings.
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
|
2019-04-05 00:01:32 +02:00 |
Alejandro Gallardo Escobar
|
4a3eaca1cd
|
Visual Console Refactor: added the ability to connect to the metaconsole's node to a pair of models
Former-commit-id: b798747314a3ce92a2428114cda19ffa6063e3cf
|
2019-04-04 19:26:10 +02:00 |
|
Alejandro Gallardo Escobar
|
0f8c275ed1
|
Visual Console Refactor: added the status image to the group model
Former-commit-id: 80da05ae95ed87d4c7323594ada9e70c62f27501
|
2019-04-04 19:25:27 +02:00 |
|
Alejandro Gallardo Escobar
|
6e15117e11
|
Visual Console Refactor: removed unused code
Former-commit-id: a1c38a8b8b3f55b2959f94aa5c1404a63c5fff67
|
2019-04-04 18:48:55 +02:00 |
|
Alejandro Gallardo Escobar
|
d94ed7e4f3
|
Visual Studio Refactor: fixed the items which use their label as content
Former-commit-id: 48d50e90bd581312b39a90b12c5fe50e03c8730a
|
2019-04-04 18:47:02 +02:00 |
|
Alejandro Gallardo Escobar
|
92428f3731
|
Visual Console Refactor: huge improvements into the percentile item
Former-commit-id: 4ec68e2966b1fa97456c78807391e9cc68c6355b
|
2019-04-04 18:24:39 +02:00 |
|
fbsanchez
|
e76a5af441
|
minor fix parent link
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
|
2019-04-04 18:20:26 +02:00 |
Luis Calvo
|
33db6d2f0c
|
If is metaconsole, param meta is setted to true
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
|
2019-04-04 18:13:29 +02:00 |
|
Daniel Rodriguez
|
c52b30fd7e
|
Merge branch 'ent-3784-error-creating-alert-actions-api' into 'develop'
Insert zero into fires_min an fires_max when null
See merge request artica/pandorafms!2318
Former-commit-id: b7d8c6738530e1d842be34ad7f81c31a898d1c76
|
2019-04-04 18:03:53 +02:00 |
|
fermin831
|
14ea1a4714
|
Fixed inverses intervals on server
Former-commit-id: 20f9e139bb3f40700e3081e4ce9ec134b70786a6
|
2019-04-04 17:47:40 +02:00 |
|
fbsanchez
|
5e91e3fa50
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
rhel dependencies
See merge request artica/pandorafms!2339
Former-commit-id: b75a756a70434f1a25f4a4f0a129681b3f01f19f
|
2019-04-04 17:42:56 +02:00 |
|
fbsanchez
|
fdb13c1d1f
|
rhel dependencies
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
|
2019-04-04 17:35:27 +02:00 |
|
manuel
|
49c913c6de
|
Added custom fields to report templates
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
|
2019-04-04 17:31:11 +02:00 |
|
fbsanchez
|
79074a274e
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
forced dependencies 7.2 spec pandora_console rhel
See merge request artica/pandorafms!2338
Former-commit-id: 8f7adb7f4a8ad922a7d27eb44f2a449235b6c405
|
2019-04-04 17:26:10 +02:00 |
|
fbsanchez
|
21294807f4
|
forced dependencies 7.2 spec pandora_console rhel
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
|
2019-04-04 17:12:08 +02:00 |
|
Alejandro Gallardo Escobar
|
0d46d0a1a0
|
Visual Console Refactor: added a new util function
Former-commit-id: 4ff4042bdefe87236f7109b27b736a8b21a60e97
|
2019-04-04 17:08:32 +02:00 |
|
fbsanchez
|
143c501a6e
|
minor fixes
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
|
2019-04-04 17:08:31 +02:00 |
|
Alejandro Gallardo Escobar
|
eb1e505a79
|
Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor
Former-commit-id: cae1d1fbf8efb664d5042877d63584c4699801ab
|
2019-04-04 17:07:15 +02:00 |
|
Alejandro Gallardo Escobar
|
5fb1ae0f44
|
Visual Console Refactor: great improvements into the Percentile model
Former-commit-id: 0988ae35202834d0dfc91bcd4870dff478a5d73e
|
2019-04-04 17:04:54 +02:00 |
|
Alejandro Gallardo Escobar
|
418d73b003
|
Visual Console Refactor: error fixes
Former-commit-id: 5cfe645c4b02e84b9b2e9056747419bf144b0594
|
2019-04-04 17:03:56 +02:00 |
|
Alejandro Gallardo Escobar
|
ead487b24b
|
Visual Console Refactor: add a new util function
Former-commit-id: 8b6266651ac81fcdd18a12b71f3f316eb246277a
|
2019-04-04 17:02:48 +02:00 |
|
Daniel Maya
|
a033149a2f
|
fixed problems with test
Former-commit-id: 7897203e3ba020fdda8b06fd82a53d18bd91aaa1
|
2019-04-04 16:08:50 +02:00 |
|
fbsanchez
|
1274380270
|
minor fix
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
|
2019-04-04 16:07:50 +02:00 |
|
fbsanchez
|
56f2acbbf1
|
discovery.app.mysql rc1
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
|
2019-04-04 16:05:16 +02:00 |
|
fbsanchez
|
ce9f9eab4e
|
rc1 mysql recon
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
|
2019-04-04 16:00:08 +02:00 |
|
fermin831
|
43b296c49c
|
Added docs to cron functions
Former-commit-id: 7f20d7abe989adcfc841e0ce20afbe007b660038
|
2019-04-04 15:30:30 +02:00 |
|
fermin831
|
c5a49916cb
|
Fixed cron day of the week
Former-commit-id: eb6b7974d7304c430068375f19ef60db1a2bb442
|
2019-04-04 15:04:23 +02:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
a1a4ae51e2
|
added +x permissions to build_rpm_rhel7
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
|
2019-04-04 12:30:50 +02:00 |
|
fbsanchez
|
fcafe76943
|
wip discovery f34
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
|
2019-04-04 12:28:17 +02:00 |
Alejandro Fraguas
|
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 |
|
Daniel Maya
|
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 |
|
Daniel Maya
|
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 |